diff options
author | Michał Górny <mgorny@gentoo.org> | 2024-01-13 19:05:12 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2024-01-13 21:12:24 +0100 |
commit | 21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4 (patch) | |
tree | ffe2d2e7edbb3685eb4523fe77c702d905e60568 | |
parent | Move {dev-util → dev-build}/meson-format-array (diff) | |
download | gentoo-21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4.tar.gz gentoo-21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4.tar.bz2 gentoo-21b3f9ceef131258a721b1b29e52d0f9c4fd2ea4.zip |
Move {dev-util → dev-build}/meson
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34790
Signed-off-by: Michał Górny <mgorny@gentoo.org>
102 files changed, 117 insertions, 117 deletions
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild index d9a079e97a24..fdf6d7e33058 100644 --- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild +++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig virtual/wine[${MULTILIB_USEDEP}] - >=dev-util/meson-0.50.1 + >=dev-build/meson-0.50.1 " PATCHES=( diff --git a/app-emulation/qemu/qemu-7.2.4.ebuild b/app-emulation/qemu/qemu-7.2.4.ebuild index 099544396b1b..c8c13d8938d4 100644 --- a/app-emulation/qemu/qemu-7.2.4.ebuild +++ b/app-emulation/qemu/qemu-7.2.4.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-7.2.6.ebuild b/app-emulation/qemu/qemu-7.2.6.ebuild index b7e36c6b1149..09c62e4b7133 100644 --- a/app-emulation/qemu/qemu-7.2.6.ebuild +++ b/app-emulation/qemu/qemu-7.2.6.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-7.2.7.ebuild b/app-emulation/qemu/qemu-7.2.7.ebuild index 56dc849ff9c7..7b45ca3fd823 100644 --- a/app-emulation/qemu/qemu-7.2.7.ebuild +++ b/app-emulation/qemu/qemu-7.2.7.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-7.2.8.ebuild b/app-emulation/qemu/qemu-7.2.8.ebuild index 56dc849ff9c7..7b45ca3fd823 100644 --- a/app-emulation/qemu/qemu-7.2.8.ebuild +++ b/app-emulation/qemu/qemu-7.2.8.ebuild @@ -13,7 +13,7 @@ QEMU_DOCS_VERSION="7.2.0" # bug #830088 QEMU_DOC_USEFLAG="+doc" -PYTHON_COMPAT=( python3_{9,10,11} ) +PYTHON_COMPAT=( python3_{10,11} ) PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="7.2.0" @@ -272,7 +272,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.0.4.ebuild b/app-emulation/qemu/qemu-8.0.4.ebuild index cb9694a7e0d7..c061e812821e 100644 --- a/app-emulation/qemu/qemu-8.0.4.ebuild +++ b/app-emulation/qemu/qemu-8.0.4.ebuild @@ -273,7 +273,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild b/app-emulation/qemu/qemu-8.0.5.ebuild index 4725900b4832..bd9bb2ea2316 100644 --- a/app-emulation/qemu/qemu-8.0.5.ebuild +++ b/app-emulation/qemu/qemu-8.0.5.ebuild @@ -273,7 +273,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - dev-util/meson + dev-build/meson sys-apps/texinfo virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.1.2.ebuild b/app-emulation/qemu/qemu-8.1.2.ebuild index 9bac6a701412..19515604bcb2 100644 --- a/app-emulation/qemu/qemu-8.1.2.ebuild +++ b/app-emulation/qemu/qemu-8.1.2.ebuild @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.1.3.ebuild b/app-emulation/qemu/qemu-8.1.3.ebuild index 9bac6a701412..19515604bcb2 100644 --- a/app-emulation/qemu/qemu-8.1.3.ebuild +++ b/app-emulation/qemu/qemu-8.1.3.ebuild @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.1.4.ebuild b/app-emulation/qemu/qemu-8.1.4.ebuild index 9bac6a701412..19515604bcb2 100644 --- a/app-emulation/qemu/qemu-8.1.4.ebuild +++ b/app-emulation/qemu/qemu-8.1.4.ebuild @@ -274,7 +274,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-8.2.0.ebuild b/app-emulation/qemu/qemu-8.2.0.ebuild index 5bd2c3d154f5..5b9071fc36e9 100644 --- a/app-emulation/qemu/qemu-8.2.0.ebuild +++ b/app-emulation/qemu/qemu-8.2.0.ebuild @@ -279,7 +279,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 362c7f597776..5cd95eee6b36 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -279,7 +279,7 @@ PPC_FIRMWARE_DEPEND=" BDEPEND=" $(python_gen_impl_dep) dev-lang/perl - >=dev-util/meson-0.63.0 + >=dev-build/meson-0.63.0 dev-python/pip[${PYTHON_USEDEP}] virtual/pkgconfig doc? ( diff --git a/app-emulation/xen-tools/xen-tools-4.16.6_pre1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.6_pre1-r1.ebuild index 04b7cde2edba..91c6b780c701 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.6_pre1-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.6_pre1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-emulation/xen-tools/xen-tools-4.16.6_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.16.6_pre1.ebuild index 882c97a57981..57a548e015b7 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.6_pre1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.6_pre1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-emulation/xen-tools/xen-tools-4.16.6_pre2.ebuild b/app-emulation/xen-tools/xen-tools-4.16.6_pre2.ebuild index a3931c7d1006..a9e949602709 100644 --- a/app-emulation/xen-tools/xen-tools-4.16.6_pre2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.16.6_pre2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-emulation/xen-tools/xen-tools-4.17.3.ebuild b/app-emulation/xen-tools/xen-tools-4.17.3.ebuild index 28a9d84ccd64..e91552b8c15f 100644 --- a/app-emulation/xen-tools/xen-tools-4.17.3.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.17.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-emulation/xen-tools/xen-tools-4.17.3_pre1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.3_pre1-r1.ebuild index ae9b458c7573..4da473ff8968 100644 --- a/app-emulation/xen-tools/xen-tools-4.17.3_pre1-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.17.3_pre1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-emulation/xen-tools/xen-tools-4.17.3_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.3_pre1.ebuild index c63d1a6d5f24..8bd7aee22216 100644 --- a/app-emulation/xen-tools/xen-tools-4.17.3_pre1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.17.3_pre1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE='ncurses,xml(+),threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs @@ -150,7 +150,7 @@ DEPEND="${COMMON_DEPEND} hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= - dev-util/meson + dev-build/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] diff --git a/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild index ef31ef884f35..36bae9f8dac2 100644 --- a/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -40,7 +40,7 @@ RDEPEND=" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild index 42a5a95fdd99..a4e22666a537 100644 --- a/app-portage/gentoolkit/gentoolkit-9999.ebuild +++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild @@ -40,7 +40,7 @@ RDEPEND=" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] ' python3_12) diff --git a/dev-util/meson/Manifest b/dev-build/meson/Manifest index 67d0986b387c..67d0986b387c 100644 --- a/dev-util/meson/Manifest +++ b/dev-build/meson/Manifest diff --git a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch index 394b1bbb7c1b..394b1bbb7c1b 100644 --- a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch +++ b/dev-build/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch diff --git a/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch b/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch index 3d40616fec1f..3d40616fec1f 100644 --- a/dev-util/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch +++ b/dev-build/meson/files/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch diff --git a/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch b/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch index 652ffd25228b..652ffd25228b 100644 --- a/dev-util/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch +++ b/dev-build/meson/files/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch diff --git a/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch b/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch index c552831cfd6b..c552831cfd6b 100644 --- a/dev-util/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch +++ b/dev-build/meson/files/1.2.2/0001-python-dependency-ensure-that-setuptools-doesn-t-inj.patch diff --git a/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch b/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch index 51c13d6926ff..51c13d6926ff 100644 --- a/dev-util/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch +++ b/dev-build/meson/files/1.2.2/0002-python-module-stop-using-distutils-schemes-on-suffic.patch diff --git a/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch b/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch index 484e967c8328..484e967c8328 100644 --- a/dev-util/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch +++ b/dev-build/meson/files/1.2.2/0003-python-module-refactor-pypy-detection-into-a-consist.patch diff --git a/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch b/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch index 2ebdbcc2b30f..2ebdbcc2b30f 100644 --- a/dev-util/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch +++ b/dev-build/meson/files/1.2.2/0004-python-module-stop-using-distutils-link-to-libpython.patch diff --git a/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch b/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch index 078e9035e228..078e9035e228 100644 --- a/dev-util/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch +++ b/dev-build/meson/files/1.2.2/0005-tests-fix-test-case-to-not-import-distutils-on-pytho.patch diff --git a/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch b/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch index 0e1f167b32fb..0e1f167b32fb 100644 --- a/dev-util/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch +++ b/dev-build/meson/files/1.2.2/0006-mark-the-PyPI-metadata-as-supporting-python-3.12.patch diff --git a/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch b/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch index 4ada76ae909b..4ada76ae909b 100644 --- a/dev-util/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch +++ b/dev-build/meson/files/1.2.2/0007-Revert-rust-apply-global-project-and-environment-C-a.patch diff --git a/dev-util/meson/files/meson-0.63-xtools-support.patch b/dev-build/meson/files/meson-0.63-xtools-support.patch index ea1e8597b00a..ea1e8597b00a 100644 --- a/dev-util/meson/files/meson-0.63-xtools-support.patch +++ b/dev-build/meson/files/meson-0.63-xtools-support.patch diff --git a/dev-util/meson/files/meson-1.2.1-llvm-17.patch b/dev-build/meson/files/meson-1.2.1-llvm-17.patch index ceee1dcd292b..ceee1dcd292b 100644 --- a/dev-util/meson/files/meson-1.2.1-llvm-17.patch +++ b/dev-build/meson/files/meson-1.2.1-llvm-17.patch diff --git a/dev-util/meson/files/meson-1.2.1-python-path.patch b/dev-build/meson/files/meson-1.2.1-python-path.patch index d6151881f83f..d6151881f83f 100644 --- a/dev-util/meson/files/meson-1.2.1-python-path.patch +++ b/dev-build/meson/files/meson-1.2.1-python-path.patch diff --git a/dev-util/meson/files/meson-1.3.1-xtools-support.patch b/dev-build/meson/files/meson-1.3.1-xtools-support.patch index 6e9e670ba8da..6e9e670ba8da 100644 --- a/dev-util/meson/files/meson-1.3.1-xtools-support.patch +++ b/dev-build/meson/files/meson-1.3.1-xtools-support.patch diff --git a/dev-util/meson/meson-1.1.1.ebuild b/dev-build/meson/meson-1.1.1.ebuild index e7cc67555212..e7cc67555212 100644 --- a/dev-util/meson/meson-1.1.1.ebuild +++ b/dev-build/meson/meson-1.1.1.ebuild diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild b/dev-build/meson/meson-1.2.1-r1.ebuild index 5443030fc815..5443030fc815 100644 --- a/dev-util/meson/meson-1.2.1-r1.ebuild +++ b/dev-build/meson/meson-1.2.1-r1.ebuild diff --git a/dev-util/meson/meson-1.2.1-r2.ebuild b/dev-build/meson/meson-1.2.1-r2.ebuild index 8394dad75715..8394dad75715 100644 --- a/dev-util/meson/meson-1.2.1-r2.ebuild +++ b/dev-build/meson/meson-1.2.1-r2.ebuild diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild b/dev-build/meson/meson-1.2.2-r1.ebuild index f19775d1fd3d..f19775d1fd3d 100644 --- a/dev-util/meson/meson-1.2.2-r1.ebuild +++ b/dev-build/meson/meson-1.2.2-r1.ebuild diff --git a/dev-util/meson/meson-1.2.2.ebuild b/dev-build/meson/meson-1.2.2.ebuild index 2562b7ab025f..2562b7ab025f 100644 --- a/dev-util/meson/meson-1.2.2.ebuild +++ b/dev-build/meson/meson-1.2.2.ebuild diff --git a/dev-util/meson/meson-1.2.3.ebuild b/dev-build/meson/meson-1.2.3.ebuild index 9c472cdd34c0..9c472cdd34c0 100644 --- a/dev-util/meson/meson-1.2.3.ebuild +++ b/dev-build/meson/meson-1.2.3.ebuild diff --git a/dev-util/meson/meson-1.3.0-r1.ebuild b/dev-build/meson/meson-1.3.0-r1.ebuild index 63d6c0a17684..63d6c0a17684 100644 --- a/dev-util/meson/meson-1.3.0-r1.ebuild +++ b/dev-build/meson/meson-1.3.0-r1.ebuild diff --git a/dev-util/meson/meson-1.3.0-r2.ebuild b/dev-build/meson/meson-1.3.0-r2.ebuild index c663b7fe3456..c663b7fe3456 100644 --- a/dev-util/meson/meson-1.3.0-r2.ebuild +++ b/dev-build/meson/meson-1.3.0-r2.ebuild diff --git a/dev-util/meson/meson-1.3.1.ebuild b/dev-build/meson/meson-1.3.1.ebuild index 0f026f75c31e..0f026f75c31e 100644 --- a/dev-util/meson/meson-1.3.1.ebuild +++ b/dev-build/meson/meson-1.3.1.ebuild diff --git a/dev-util/meson/meson-9999.ebuild b/dev-build/meson/meson-9999.ebuild index 4e7497b5c819..4e7497b5c819 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-build/meson/meson-9999.ebuild diff --git a/dev-util/meson/metadata.xml b/dev-build/meson/metadata.xml index f4b485f0bec2..f4b485f0bec2 100644 --- a/dev-util/meson/metadata.xml +++ b/dev-build/meson/metadata.xml diff --git a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild index 9919327246a8..e1b879ab6776 100644 --- a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild +++ b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ RDEPEND=" DEPEND="${RDEPEND}" # libxml2 required for glib-compile-resources; glib-utils for glib-mkenums BDEPEND=" - >=dev-util/meson-0.49.0 + >=dev-build/meson-0.49.0 vala? ( $(vala_depend) ) dev-libs/libxml2:2 dev-util/glib-utils diff --git a/dev-libs/libxmlb/libxmlb-0.3.14.ebuild b/dev-libs/libxmlb/libxmlb-0.3.14.ebuild index 8983828d370a..0a8efe9bcc4e 100644 --- a/dev-libs/libxmlb/libxmlb-0.3.14.ebuild +++ b/dev-libs/libxmlb/libxmlb-0.3.14.ebuild @@ -34,7 +34,7 @@ DEPEND=" BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-0.47.0 + >=dev-build/meson-0.47.0 virtual/pkgconfig introspection? ( $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') diff --git a/dev-python/meson-python/meson-python-0.15.0.ebuild b/dev-python/meson-python/meson-python-0.15.0.ebuild index 1fe63ab1279f..33ca89bcd897 100644 --- a/dev-python/meson-python/meson-python-0.15.0.ebuild +++ b/dev-python/meson-python/meson-python-0.15.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 RDEPEND=" >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}] - >=dev-util/meson-0.63.0[${PYTHON_USEDEP}] + >=dev-build/meson-0.63.0[${PYTHON_USEDEP}] !kernel_Darwin? ( dev-util/patchelf ) $(python_gen_cond_dep ' >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] diff --git a/dev-python/numpy/numpy-1.26.1.ebuild b/dev-python/numpy/numpy-1.26.1.ebuild index f31fdfc7dce1..3165b7cbfc9c 100644 --- a/dev-python/numpy/numpy-1.26.1.ebuild +++ b/dev-python/numpy/numpy-1.26.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,7 @@ RDEPEND=" " BDEPEND=" ${RDEPEND} - >=dev-util/meson-1.1.0 + >=dev-build/meson-1.1.0 >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] lapack? ( virtual/pkgconfig diff --git a/dev-python/numpy/numpy-1.26.2.ebuild b/dev-python/numpy/numpy-1.26.2.ebuild index 170bc41b4cf8..6a6e3b2205a2 100644 --- a/dev-python/numpy/numpy-1.26.2.ebuild +++ b/dev-python/numpy/numpy-1.26.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,7 +35,7 @@ RDEPEND=" " BDEPEND=" ${RDEPEND} - >=dev-util/meson-1.1.0 + >=dev-build/meson-1.1.0 >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] lapack? ( virtual/pkgconfig diff --git a/dev-python/numpy/numpy-1.26.3.ebuild b/dev-python/numpy/numpy-1.26.3.ebuild index d8b21ae0f7e8..bbbaaf36e411 100644 --- a/dev-python/numpy/numpy-1.26.3.ebuild +++ b/dev-python/numpy/numpy-1.26.3.ebuild @@ -35,7 +35,7 @@ RDEPEND=" " BDEPEND=" ${RDEPEND} - >=dev-util/meson-1.1.0 + >=dev-build/meson-1.1.0 >=dev-python/cython-3.0.0[${PYTHON_USEDEP}] lapack? ( virtual/pkgconfig diff --git a/dev-python/pandas/pandas-2.1.1.ebuild b/dev-python/pandas/pandas-2.1.1.ebuild index d7bca31569c4..9aa03ee403fb 100644 --- a/dev-python/pandas/pandas-2.1.1.ebuild +++ b/dev-python/pandas/pandas-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,7 +73,7 @@ COMMON_DEPEND=" " BDEPEND=" ${COMMON_DEPEND} - >=dev-util/meson-1.2.1 + >=dev-build/meson-1.2.1 >=dev-python/cython-0.29.33[${PYTHON_USEDEP}] >=dev-python/versioneer-0.28[${PYTHON_USEDEP}] test? ( diff --git a/dev-python/pandas/pandas-2.1.3.ebuild b/dev-python/pandas/pandas-2.1.3.ebuild index d7b3cb652abe..78033e5ecaf0 100644 --- a/dev-python/pandas/pandas-2.1.3.ebuild +++ b/dev-python/pandas/pandas-2.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,7 +73,7 @@ COMMON_DEPEND=" " BDEPEND=" ${COMMON_DEPEND} - >=dev-util/meson-1.2.1 + >=dev-build/meson-1.2.1 >=dev-python/cython-0.29.33[${PYTHON_USEDEP}] >=dev-python/versioneer-0.28[${PYTHON_USEDEP}] test? ( diff --git a/dev-python/pandas/pandas-2.1.4.ebuild b/dev-python/pandas/pandas-2.1.4.ebuild index 49b238b2273f..3197c46d8656 100644 --- a/dev-python/pandas/pandas-2.1.4.ebuild +++ b/dev-python/pandas/pandas-2.1.4.ebuild @@ -73,7 +73,7 @@ COMMON_DEPEND=" " BDEPEND=" ${COMMON_DEPEND} - >=dev-util/meson-1.2.1 + >=dev-build/meson-1.2.1 >=dev-python/cython-0.29.33[${PYTHON_USEDEP}] >=dev-python/versioneer-0.28[${PYTHON_USEDEP}] test? ( diff --git a/dev-python/scipy/scipy-1.11.3-r1.ebuild b/dev-python/scipy/scipy-1.11.3-r1.ebuild index 1d3764815407..9f68cd59364e 100644 --- a/dev-python/scipy/scipy-1.11.3-r1.ebuild +++ b/dev-python/scipy/scipy-1.11.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,7 +63,7 @@ BDEPEND=" >=dev-python/cython-0.29.35[${PYTHON_USEDEP}] >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] - >=dev-util/meson-1.1.0 + >=dev-build/meson-1.1.0 !kernel_Darwin? ( dev-util/patchelf ) virtual/pkgconfig doc? ( app-arch/unzip ) diff --git a/dev-python/scipy/scipy-1.11.4.ebuild b/dev-python/scipy/scipy-1.11.4.ebuild index 9bb9987e297e..eb69b66541e5 100644 --- a/dev-python/scipy/scipy-1.11.4.ebuild +++ b/dev-python/scipy/scipy-1.11.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,7 +63,7 @@ BDEPEND=" >=dev-python/cython-0.29.35[${PYTHON_USEDEP}] >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] - >=dev-util/meson-1.1.0 + >=dev-build/meson-1.1.0 !kernel_Darwin? ( dev-util/patchelf ) virtual/pkgconfig doc? ( app-arch/unzip ) diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild index 1389b08110c3..da9e91badcb9 100644 --- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild @@ -196,7 +196,7 @@ else the example tab will be empty alongside missing documentation. Build Systems: - CMakeProjectManager (dev-util/cmake) -- MesonProjectManager (dev-util/meson) +- MesonProjectManager (dev-build/meson) - QbsProjectManager (dev-util/qbs) C++: diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 4522f76caea0..c487c38bfaac 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -196,7 +196,7 @@ else the example tab will be empty alongside missing documentation. Build Systems: - CMakeProjectManager (dev-util/cmake) -- MesonProjectManager (dev-util/meson) +- MesonProjectManager (dev-build/meson) - QbsProjectManager (dev-util/qbs) C++: diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild index 8ba7549bcf34..aa54cb1857d8 100644 --- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild +++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild @@ -111,7 +111,7 @@ that are currently available with packages include: * dev-python/python-lsp-server for more accurate Python autocompletion support. * dev-debug/valgrind for integration with valgrind. -* dev-util/meson for integration with the Meson build system. +* dev-build/meson for integration with the Meson build system. * virtual/rust for integration with the Rust Cargo build system. * dev-util/cmake for integration with the CMake build system. * net-libs/nodejs[npm] for integration with the NPM package system. @@ -269,7 +269,7 @@ pkg_postinst() { optfeature "Rust's Cargo build system" virtual/rust optfeature "CMake" dev-util/cmake optfeature "Java Maven build system" dev-java/maven-bin - optfeature "Meson Build system" dev-util/meson + optfeature "Meson Build system" dev-build/meson } pkg_postrm() { diff --git a/dev-util/kdevelop/kdevelop-23.08.4.ebuild b/dev-util/kdevelop/kdevelop-23.08.4.ebuild index 20035999f3e2..0109f2c6712b 100644 --- a/dev-util/kdevelop/kdevelop-23.08.4.ebuild +++ b/dev-util/kdevelop/kdevelop-23.08.4.ebuild @@ -126,7 +126,7 @@ pkg_postinst() { optfeature "static C++ Qt code analysis" dev-util/clazy optfeature "static C/C++ code analysis" dev-util/cppcheck optfeature "heap memory profiling" "dev-util/heaptrack[gui]" - optfeature "meson project manager plugin" dev-util/meson + optfeature "meson project manager plugin" dev-build/meson optfeature "formatting configurations via customscript plugin" dev-util/indent optfeature "formatting configurations via customscript plugin" dev-util/uncrustify fi diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 19b83a880a37..d8bd93082ea5 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -43,7 +43,7 @@ _MESON_ECLASS=1 inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs -BDEPEND=">=dev-util/meson-1.2.1 +BDEPEND=">=dev-build/meson-1.2.1 ${NINJA_DEPEND} dev-build/meson-format-array " diff --git a/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild index fd974c5504f4..fff86149dd69 100644 --- a/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild +++ b/gui-libs/wlroots/wlroots-0.14.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,7 @@ RDEPEND=" " BDEPEND=" >=dev-libs/wayland-protocols-1.17 - >=dev-util/meson-0.56.0 + >=dev-build/meson-0.56.0 virtual/pkgconfig " diff --git a/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild b/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild index b95b11bd48f8..3741f6891b7d 100644 --- a/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild +++ b/gui-libs/wlroots/wlroots-0.15.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -49,7 +49,7 @@ RDEPEND=" " BDEPEND=" >=dev-libs/wayland-protocols-1.24 - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 dev-util/wayland-scanner virtual/pkgconfig " diff --git a/gui-wm/hyprland/hyprland-0.34.0.ebuild b/gui-wm/hyprland/hyprland-0.34.0.ebuild index 41092188263d..48241d2e6d23 100644 --- a/gui-wm/hyprland/hyprland-0.34.0.ebuild +++ b/gui-wm/hyprland/hyprland-0.34.0.ebuild @@ -27,7 +27,7 @@ IUSE="X legacy-renderer systemd" HYPRPM_RDEPEND=" app-alternatives/ninja dev-util/cmake - dev-util/meson + dev-build/meson dev-vcs/git sys-auth/polkit virtual/pkgconfig diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index 83200a73a6b5..db7f709d65b6 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -27,7 +27,7 @@ IUSE="X legacy-renderer systemd" HYPRPM_RDEPEND=" app-alternatives/ninja dev-util/cmake - dev-util/meson + dev-build/meson dev-vcs/git sys-auth/polkit virtual/pkgconfig diff --git a/gui-wm/sway/sway-1.8.1-r2.ebuild b/gui-wm/sway/sway-1.8.1-r2.ebuild index 9fbae12bce5d..30ae18247f62 100644 --- a/gui-wm/sway/sway-1.8.1-r2.ebuild +++ b/gui-wm/sway/sway-1.8.1-r2.ebuild @@ -67,7 +67,7 @@ RDEPEND=" " BDEPEND=" >=dev-libs/wayland-protocols-1.24 - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 virtual/pkgconfig " if [[ ${PV} == 9999 ]]; then diff --git a/gui-wm/sway/sway-1.8.1.ebuild b/gui-wm/sway/sway-1.8.1.ebuild index 4a65197f1e7b..c60250eff3b8 100644 --- a/gui-wm/sway/sway-1.8.1.ebuild +++ b/gui-wm/sway/sway-1.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -67,7 +67,7 @@ RDEPEND=" " BDEPEND=" >=dev-libs/wayland-protocols-1.24 - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 virtual/pkgconfig " if [[ ${PV} == 9999 ]]; then diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild index d5465651ab99..cc93fa47b729 100644 --- a/gui-wm/sway/sway-9999.ebuild +++ b/gui-wm/sway/sway-9999.ebuild @@ -60,7 +60,7 @@ RDEPEND=" " BDEPEND=" >=dev-libs/wayland-protocols-1.24 - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 virtual/pkgconfig " if [[ ${PV} == 9999 ]]; then diff --git a/media-libs/mesa/mesa-23.1.8.ebuild b/media-libs/mesa/mesa-23.1.8.ebuild index b4f29767b82e..560736a0b1ec 100644 --- a/media-libs/mesa/mesa-23.1.8.ebuild +++ b/media-libs/mesa/mesa-23.1.8.ebuild @@ -159,7 +159,7 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - >=dev-util/meson-1.0.0 + >=dev-build/meson-1.0.0 ${PYTHON_DEPS} opencl? ( >=virtual/rust-1.62.0 diff --git a/media-libs/mesa/mesa-23.1.9.ebuild b/media-libs/mesa/mesa-23.1.9.ebuild index 6ebfcf5c9cf3..62c41be4b4a7 100644 --- a/media-libs/mesa/mesa-23.1.9.ebuild +++ b/media-libs/mesa/mesa-23.1.9.ebuild @@ -166,7 +166,7 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - >=dev-util/meson-1.0.0 + >=dev-build/meson-1.0.0 ${PYTHON_DEPS} opencl? ( >=virtual/rust-1.62.0 diff --git a/media-libs/mesa/mesa-23.2.1.ebuild b/media-libs/mesa/mesa-23.2.1.ebuild index 6e5a249feb02..870f9c7bb797 100644 --- a/media-libs/mesa/mesa-23.2.1.ebuild +++ b/media-libs/mesa/mesa-23.2.1.ebuild @@ -167,7 +167,7 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - >=dev-util/meson-1.0.0 + >=dev-build/meson-1.0.0 ${PYTHON_DEPS} opencl? ( >=virtual/rust-1.62.0 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 7344ff56cf1a..9a9098583628 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -155,7 +155,7 @@ BDEPEND=" opencl? ( >=virtual/rust-1.62.0 >=dev-util/bindgen-0.58.0 - >=dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0 ) app-alternatives/yacc app-alternatives/lex diff --git a/media-video/pipewire/pipewire-0.3.80.ebuild b/media-video/pipewire/pipewire-0.3.80.ebuild index 896680ec0d23..0715bcdb6aba 100644 --- a/media-video/pipewire/pipewire-0.3.80.ebuild +++ b/media-video/pipewire/pipewire-0.3.80.ebuild @@ -66,7 +66,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/meson-0.59 + >=dev-build/meson-0.59 virtual/pkgconfig ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') diff --git a/media-video/pipewire/pipewire-1.0.0-r1.ebuild b/media-video/pipewire/pipewire-1.0.0-r1.ebuild index fb8b64c4397d..e8f8f8ce1736 100644 --- a/media-video/pipewire/pipewire-1.0.0-r1.ebuild +++ b/media-video/pipewire/pipewire-1.0.0-r1.ebuild @@ -84,7 +84,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/meson-0.59 + >=dev-build/meson-0.59 virtual/pkgconfig dbus? ( dev-util/gdbus-codegen ) doc? ( diff --git a/media-video/pipewire/pipewire-1.0.1.ebuild b/media-video/pipewire/pipewire-1.0.1.ebuild index 4db92dd55c55..c814988096fe 100644 --- a/media-video/pipewire/pipewire-1.0.1.ebuild +++ b/media-video/pipewire/pipewire-1.0.1.ebuild @@ -84,7 +84,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/meson-0.59 + >=dev-build/meson-0.59 virtual/pkgconfig dbus? ( dev-util/gdbus-codegen ) doc? ( diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index f226d64e7742..5caf125df36d 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -84,7 +84,7 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" BDEPEND=" - >=dev-util/meson-0.59 + >=dev-build/meson-0.59 virtual/pkgconfig dbus? ( dev-util/gdbus-codegen ) doc? ( diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index bccd61a79503..10099ae25cfe 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -595,7 +595,7 @@ net-fs/samba test # Mike Gilbert <floppym@gentoo.org> (2020-04-23) # Tests are very sensitive to the host environment. -dev-util/meson test +dev-build/meson test # Alfredo Tupone <tupone@gentoo.org> (2020-04-04) # Ada support is not yet ready for sys-devel/gcc diff --git a/profiles/info_pkgs b/profiles/info_pkgs index 4ddd85d40c70..4fdd47b2093c 100644 --- a/profiles/info_pkgs +++ b/profiles/info_pkgs @@ -29,7 +29,7 @@ sys-devel/gcc sys-devel/gcc-config dev-java/java-config dev-util/cmake -dev-util/meson +dev-build/meson # NOTE: portage no longer list /etc/gentoo-release, # so this is not redundant sys-apps/baselayout diff --git a/profiles/package.mask b/profiles/package.mask index c17edbb52623..573b63500362 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -502,7 +502,7 @@ virtual/python-greenlet # Eli Schwartz <eschwartz93@gmail.com> (2023-12-02) # Has a bug that breaks sys-apps/portage. Upgrade to 1.3.0-r1 instead. # Bug #919072. -=dev-util/meson-1.3.0 +=dev-build/meson-1.3.0 # Michał Górny <mgorny@gentoo.org> (2023-11-30) # Last commit in 2020. It was used exclusively by dev-python/ipython, diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index a4a782a4949c..8a5339dc36b9 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -17,4 +17,4 @@ move sys-devel/bmake dev-build/bmake move sys-devel/pmake dev-build/pmake move sys-devel/remake dev-build/remake move dev-util/valgrind dev-debug/valgrind -move dev-util/meson-format-array dev-build/meson-format-array +move dev-util/meson dev-build/meson diff --git a/sys-apps/fwupd/fwupd-1.9.10-r1.ebuild b/sys-apps/fwupd/fwupd-1.9.10-r1.ebuild index 6c1a42111f40..800a75b349ba 100644 --- a/sys-apps/fwupd/fwupd-1.9.10-r1.ebuild +++ b/sys-apps/fwupd/fwupd-1.9.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -33,7 +33,7 @@ BDEPEND="$(vala_depend) $(python_gen_cond_dep ' dev-python/jinja[${PYTHON_USEDEP}] ') - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 virtual/pkgconfig gtk-doc? ( $(python_gen_cond_dep ' diff --git a/sys-apps/fwupd/fwupd-1.9.6.ebuild b/sys-apps/fwupd/fwupd-1.9.6.ebuild index 8c1179ebaaea..76c999756943 100644 --- a/sys-apps/fwupd/fwupd-1.9.6.ebuild +++ b/sys-apps/fwupd/fwupd-1.9.6.ebuild @@ -33,7 +33,7 @@ BDEPEND="$(vala_depend) $(python_gen_cond_dep ' dev-python/jinja[${PYTHON_USEDEP}] ') - >=dev-util/meson-0.60.0 + >=dev-build/meson-0.60.0 virtual/pkgconfig gtk-doc? ( $(python_gen_cond_dep ' diff --git a/sys-apps/portage/portage-3.0.57-r1.ebuild b/sys-apps/portage/portage-3.0.57-r1.ebuild index 57f781d85350..e4c9e2d9dbcf 100644 --- a/sys-apps/portage/portage-3.0.57-r1.ebuild +++ b/sys-apps/portage/portage-3.0.57-r1.ebuild @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - <dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0-r1 + <dev-build/meson-1.3.0 ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sys-apps/portage/portage-3.0.59-r1.ebuild b/sys-apps/portage/portage-3.0.59-r1.ebuild index 2dd0b1031597..4cf41d63b8e0 100644 --- a/sys-apps/portage/portage-3.0.59-r1.ebuild +++ b/sys-apps/portage/portage-3.0.59-r1.ebuild @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - <dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0-r1 + <dev-build/meson-1.3.0 ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sys-apps/portage/portage-3.0.60-r1.ebuild b/sys-apps/portage/portage-3.0.60-r1.ebuild index 36c0d5fdf384..834b9af7a549 100644 --- a/sys-apps/portage/portage-3.0.60-r1.ebuild +++ b/sys-apps/portage/portage-3.0.60-r1.ebuild @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - <dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0-r1 + <dev-build/meson-1.3.0 ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild b/sys-apps/portage/portage-3.0.61-r1.ebuild index 0c038c06e9d7..5007fdd1dd17 100644 --- a/sys-apps/portage/portage-3.0.61-r1.ebuild +++ b/sys-apps/portage/portage-3.0.61-r1.ebuild @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - <dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0-r1 + <dev-build/meson-1.3.0 ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 36c0d5fdf384..834b9af7a549 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -35,10 +35,10 @@ RESTRICT="!test? ( test )" # >=meson-1.2.1-r1 for bug #912051 BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-1.2.1-r1 + >=dev-build/meson-1.2.1-r1 || ( - >=dev-util/meson-1.3.0-r1 - <dev-util/meson-1.3.0 + >=dev-build/meson-1.3.0-r1 + <dev-build/meson-1.3.0 ) $(python_gen_cond_dep ' dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/sys-apps/systemd/systemd-254.5-r2.ebuild b/sys-apps/systemd/systemd-254.5-r2.ebuild index 16b52e5e6df0..5c099abdbcd5 100644 --- a/sys-apps/systemd/systemd-254.5-r2.ebuild +++ b/sys-apps/systemd/systemd-254.5-r2.ebuild @@ -155,7 +155,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sys-apps/systemd/systemd-254.7-r1.ebuild b/sys-apps/systemd/systemd-254.7-r1.ebuild index e25d093cecfa..89798cf92eff 100644 --- a/sys-apps/systemd/systemd-254.7-r1.ebuild +++ b/sys-apps/systemd/systemd-254.7-r1.ebuild @@ -155,7 +155,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sys-apps/systemd/systemd-254.8-r1.ebuild b/sys-apps/systemd/systemd-254.8-r1.ebuild index b6768d8268e6..19e88bf10ecd 100644 --- a/sys-apps/systemd/systemd-254.8-r1.ebuild +++ b/sys-apps/systemd/systemd-254.8-r1.ebuild @@ -155,7 +155,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sys-apps/systemd/systemd-255.2-r2.ebuild b/sys-apps/systemd/systemd-255.2-r2.ebuild index 6cfbfe0e4aba..058e82af1331 100644 --- a/sys-apps/systemd/systemd-255.2-r2.ebuild +++ b/sys-apps/systemd/systemd-255.2-r2.ebuild @@ -158,7 +158,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 6cfbfe0e4aba..058e82af1331 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -158,7 +158,7 @@ PDEPEND=">=sys-apps/dbus-1.9.8[systemd] BDEPEND=" app-arch/xz-utils:0 dev-util/gperf - >=dev-util/meson-0.46 + >=dev-build/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild index c517e6d517b6..943dbb3f1893 100644 --- a/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild +++ b/sys-devel/crosstool-ng/crosstool-ng-1.24.0-r3.ebuild @@ -44,7 +44,7 @@ BDEPEND=" dtc? ( sys-apps/dtc ) git? ( dev-vcs/git ) lzip? ( app-arch/lzip ) - meson? ( dev-util/meson ) + meson? ( dev-build/meson ) python? ( ${PYTHON_DEPS} ) ninja? ( app-alternatives/ninja ) rsync? ( net-misc/rsync ) diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild index c517e6d517b6..943dbb3f1893 100644 --- a/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild +++ b/sys-devel/crosstool-ng/crosstool-ng-1.25.0-r1.ebuild @@ -44,7 +44,7 @@ BDEPEND=" dtc? ( sys-apps/dtc ) git? ( dev-vcs/git ) lzip? ( app-arch/lzip ) - meson? ( dev-util/meson ) + meson? ( dev-build/meson ) python? ( ${PYTHON_DEPS} ) ninja? ( app-alternatives/ninja ) rsync? ( net-misc/rsync ) diff --git a/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild b/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild index c517e6d517b6..943dbb3f1893 100644 --- a/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild +++ b/sys-devel/crosstool-ng/crosstool-ng-1.26.0.ebuild @@ -44,7 +44,7 @@ BDEPEND=" dtc? ( sys-apps/dtc ) git? ( dev-vcs/git ) lzip? ( app-arch/lzip ) - meson? ( dev-util/meson ) + meson? ( dev-build/meson ) python? ( ${PYTHON_DEPS} ) ninja? ( app-alternatives/ninja ) rsync? ( net-misc/rsync ) diff --git a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild index c517e6d517b6..943dbb3f1893 100644 --- a/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild +++ b/sys-devel/crosstool-ng/crosstool-ng-9999.ebuild @@ -44,7 +44,7 @@ BDEPEND=" dtc? ( sys-apps/dtc ) git? ( dev-vcs/git ) lzip? ( app-arch/lzip ) - meson? ( dev-util/meson ) + meson? ( dev-build/meson ) python? ( ${PYTHON_DEPS} ) ninja? ( app-alternatives/ninja ) rsync? ( net-misc/rsync ) diff --git a/sys-devel/crosstool-ng/metadata.xml b/sys-devel/crosstool-ng/metadata.xml index 59a236975f01..69260a3c3c18 100644 --- a/sys-devel/crosstool-ng/metadata.xml +++ b/sys-devel/crosstool-ng/metadata.xml @@ -17,7 +17,7 @@ <use> <flag name="dtc">Require <pkg>sys-apps/dtc</pkg></flag> <flag name="lzip">Require <pkg>app-arch/lzip</pkg></flag> - <flag name="meson">Require <pkg>dev-util/meson</pkg></flag> + <flag name="meson">Require <pkg>dev-build/meson</pkg></flag> <flag name="ninja">Require <pkg>app-alternatives/ninja</pkg></flag> <flag name="rsync">Require <pkg>net-misc/rsync</pkg></flag> <flag name="wget">Require <pkg>net-misc/wget</pkg></flag> diff --git a/x11-themes/arc-theme/arc-theme-20210412.ebuild b/x11-themes/arc-theme/arc-theme-20210412.ebuild index 606c5e1ed687..b3cd55452014 100644 --- a/x11-themes/arc-theme/arc-theme-20210412.ebuild +++ b/x11-themes/arc-theme/arc-theme-20210412.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -34,7 +34,7 @@ SVG_DEPEND=" # therefore break existing installs but there's no way around this. At # least GTK+3 is unlikely to see a release beyond 3.24. BDEPEND=" - >=dev-util/meson-0.56.0 + >=dev-build/meson-0.56.0 cinnamon? ( ${SASSC_DEPEND} gnome-extra/cinnamon diff --git a/x11-themes/arc-theme/arc-theme-20220223.ebuild b/x11-themes/arc-theme/arc-theme-20220223.ebuild index 316ebdbf0171..e022022946b8 100644 --- a/x11-themes/arc-theme/arc-theme-20220223.ebuild +++ b/x11-themes/arc-theme/arc-theme-20220223.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) inherit meson python-any-r1 @@ -24,7 +24,7 @@ SASSC_DEPEND="dev-lang/sassc" # Updates will therefore break existing installs but there's no way around this. BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-0.56.0 + >=dev-build/meson-0.56.0 cinnamon? ( ${SASSC_DEPEND} gnome-extra/cinnamon diff --git a/x11-themes/arc-theme/arc-theme-20220405.ebuild b/x11-themes/arc-theme/arc-theme-20220405.ebuild index 316ebdbf0171..e022022946b8 100644 --- a/x11-themes/arc-theme/arc-theme-20220405.ebuild +++ b/x11-themes/arc-theme/arc-theme-20220405.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) inherit meson python-any-r1 @@ -24,7 +24,7 @@ SASSC_DEPEND="dev-lang/sassc" # Updates will therefore break existing installs but there's no way around this. BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-0.56.0 + >=dev-build/meson-0.56.0 cinnamon? ( ${SASSC_DEPEND} gnome-extra/cinnamon diff --git a/x11-themes/arc-theme/arc-theme-20221218.ebuild b/x11-themes/arc-theme/arc-theme-20221218.ebuild index 41abdf23bb14..7e5834eaec0f 100644 --- a/x11-themes/arc-theme/arc-theme-20221218.ebuild +++ b/x11-themes/arc-theme/arc-theme-20221218.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -24,7 +24,7 @@ SASSC_DEPEND="dev-lang/sassc" # Updates will therefore break existing installs but there's no way around this. BDEPEND=" ${PYTHON_DEPS} - >=dev-util/meson-0.56.0 + >=dev-build/meson-0.56.0 cinnamon? ( ${SASSC_DEPEND} gnome-extra/cinnamon |