diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 3419f1dfa7..315c15e923 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -154,10 +154,18 @@ app-text/xmlto app-vim/gentoo-syntax +dev-build/cmake +dev-build/make +dev-build/meson +dev-build/meson-format-array +dev-build/ninja + dev-cpp/gtest dev-db/sqlite +dev-debug/gdb + dev-lang/duktape dev-lang/go-bootstrap dev-lang/lua @@ -264,16 +272,12 @@ dev-python/wheel dev-util/bpftool dev-util/catalyst dev-util/checkbashisms -dev-util/cmake dev-util/cmocka dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf dev-util/gtk-doc-am -dev-util/meson -dev-util/meson-format-array -dev-util/ninja dev-util/pahole dev-util/patchelf dev-util/patchutils @@ -501,7 +505,6 @@ sys-devel/crossdev sys-devel/flex sys-devel/gcc sys-devel/gcc-config -sys-devel/gdb sys-devel/gettext sys-devel/gnuconfig sys-devel/libtool diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.5-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.26.5-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.26.5-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.7.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.7.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.7.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.27.9.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.27.9.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.28.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-3.28.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-3.28.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/cmake-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/cmake-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/50cmake-gentoo.el b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/50cmake-gentoo.el similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/50cmake-gentoo.el rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/50cmake-gentoo.el diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.18.0-filter_distcc_warning.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.19.1-darwin-gcc.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.28.0-c99.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.28.0-c99.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.28.0-c99.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.28.0-c99.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.5.2-FindQt4.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.5.2-FindQt4.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake-3.9.0_rc2-FindPythonInterp.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake.vim b/sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake.vim similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/files/cmake.vim rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/files/cmake.vim diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmake/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/cmake/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/cmake/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/cmake/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/make/Manifest similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/make/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md b/sdk_container/src/third_party/portage-stable/dev-build/make/README.md similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/README.md rename to sdk_container/src/third_party/portage-stable/dev-build/make/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-3.82-darwin-library_search-dylib.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-3.82-darwin-library_search-dylib.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.2-default-cxx.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.2-default-cxx.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.2-default-cxx.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.2-default-cxx.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch b/sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/files/make-4.3-handle-tmpfile-fail.patch rename to sdk_container/src/third_party/portage-stable/dev-build/make/files/make-4.3-handle-tmpfile-fail.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/make-4.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/make/make-4.3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-devel/make/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-devel/make/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/make/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/files/meson-format-array b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/files/meson-format-array similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/files/meson-format-array rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/files/meson-format-array diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/meson-format-array-0.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/meson-format-array-0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson-format-array/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/meson-format-array/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/meson/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.63-xtools-support.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-0.63-xtools-support.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.63-xtools-support.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-0.63-xtools-support.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-llvm-17.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-llvm-17.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-llvm-17.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-llvm-17.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-python-path.patch b/sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-python-path.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-1.2.1-python-path.patch rename to sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.2.1-python-path.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.1.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.1-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.2.3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.0-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-1.3.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/meson/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/meson/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest b/sdk_container/src/third_party/portage-stable/dev-build/ninja/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/Manifest rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/Manifest diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch b/sdk_container/src/third_party/portage-stable/dev-build/ninja/files/ninja-cflags.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/files/ninja-cflags.patch rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/files/ninja-cflags.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-build/ninja/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-1.11.1-r3.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-1.11.1-r3.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/dev-util/ninja/ninja-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-build/ninja/ninja-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/Manifest rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/Manifest diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-13.2-fix-sparc-debugging.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-13.2-fix-sparc-debugging.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-13.2-fix-sparc-debugging.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-13.2-fix-sparc-debugging.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-8.3.1-verbose-build.patch similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/files/gdb-8.3.1-verbose-build.patch rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/files/gdb-8.3.1-verbose-build.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-13.2-r2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-13.2-r2.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-14.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-14.1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-14.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/gdb-9999.ebuild rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/gdb-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gdb/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-debug/gdb/metadata.xml similarity index 100% rename from sdk_container/src/third_party/portage-stable/sys-devel/gdb/metadata.xml rename to sdk_container/src/third_party/portage-stable/dev-debug/gdb/metadata.xml