diff options
19 files changed, 33 insertions, 32 deletions
diff --git a/dev-util/scons/Manifest b/dev-build/scons/Manifest index a9cedad46767..a9cedad46767 100644 --- a/dev-util/scons/Manifest +++ b/dev-build/scons/Manifest diff --git a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch b/dev-build/scons/files/scons-4.1.0-env-passthrough.patch index 06ec2f217611..06ec2f217611 100644 --- a/dev-util/scons/files/scons-4.1.0-env-passthrough.patch +++ b/dev-build/scons/files/scons-4.1.0-env-passthrough.patch diff --git a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch b/dev-build/scons/files/scons-4.2.0-respect-cc-etc.patch index a075fec91d22..a075fec91d22 100644 --- a/dev-util/scons/files/scons-4.2.0-respect-cc-etc.patch +++ b/dev-build/scons/files/scons-4.2.0-respect-cc-etc.patch diff --git a/dev-util/scons/metadata.xml b/dev-build/scons/metadata.xml index aacbf74f7fb9..aacbf74f7fb9 100644 --- a/dev-util/scons/metadata.xml +++ b/dev-build/scons/metadata.xml diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-build/scons/scons-4.5.2.ebuild index 7ae8f38f6d5b..e62d6e75bd0b 100644 --- a/dev-util/scons/scons-4.5.2.ebuild +++ b/dev-build/scons/scons-4.5.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 diff --git a/dev-util/scons/scons-4.6.0-r1.ebuild b/dev-build/scons/scons-4.6.0-r1.ebuild index acf4b5429a1a..acf4b5429a1a 100644 --- a/dev-util/scons/scons-4.6.0-r1.ebuild +++ b/dev-build/scons/scons-4.6.0-r1.ebuild diff --git a/dev-db/mongodb/mongodb-4.4.20.ebuild b/dev-db/mongodb/mongodb-4.4.20.ebuild index 7f93a7071d36..12cef7fbaaa0 100644 --- a/dev-db/mongodb/mongodb-4.4.20.ebuild +++ b/dev-db/mongodb/mongodb-4.4.20.ebuild @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} BDEPEND=" $(python_gen_any_dep ' test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] ) - >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] + >=dev-build/scons-3.1.1[${PYTHON_USEDEP}] dev-python/cheetah3[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -73,7 +73,7 @@ python_check_deps() { python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1 fi - python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" && python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" diff --git a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild index dec850cff791..239cdc96c99c 100644 --- a/dev-db/mongodb/mongodb-5.0.16-r1.ebuild +++ b/dev-db/mongodb/mongodb-5.0.16-r1.ebuild @@ -49,7 +49,7 @@ DEPEND="${RDEPEND} debug? ( dev-debug/valgrind )" BDEPEND=" $(python_gen_any_dep ' - >=dev-util/scons-3.1.1[${PYTHON_USEDEP}] + >=dev-build/scons-3.1.1[${PYTHON_USEDEP}] dev-python/cheetah3[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] @@ -78,7 +78,7 @@ PATCHES=( S="${WORKDIR}/${MY_P}" python_check_deps() { - python_has_version ">=dev-util/scons-3.1.1[${PYTHON_USEDEP}]" && + python_has_version ">=dev-build/scons-3.1.1[${PYTHON_USEDEP}]" && python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" && python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" && python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" diff --git a/dev-python/Nuitka/Nuitka-1.9.5.ebuild b/dev-python/Nuitka/Nuitka-1.9.5.ebuild index f511685d5ce1..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.5.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.5.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 @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/Nuitka/Nuitka-1.9.6.ebuild b/dev-python/Nuitka/Nuitka-1.9.6.ebuild index f511685d5ce1..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.6.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.6.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 @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/dev-python/Nuitka/Nuitka-1.9.7.ebuild b/dev-python/Nuitka/Nuitka-1.9.7.ebuild index 55247b1bdeb0..d7f62560068e 100644 --- a/dev-python/Nuitka/Nuitka-1.9.7.ebuild +++ b/dev-python/Nuitka/Nuitka-1.9.7.ebuild @@ -23,7 +23,7 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-util/scons[${PYTHON_USEDEP}] + dev-build/scons[${PYTHON_USEDEP}] " BDEPEND=" ${RDEPEND} diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 8d0076de97ec..b8663d34b1a2 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: scons-utils.eclass @@ -8,9 +8,9 @@ # @BLURB: helper functions to deal with SCons buildsystem # @DESCRIPTION: # This eclass provides a set of function to help developers sanely call -# dev-util/scons and pass parameters to it. +# dev-build/scons and pass parameters to it. # -# As of dev-util/scons-3.0.1-r100, SCons supports Python 3. Since +# As of dev-build/scons-3.0.1-r100, SCons supports Python 3. Since # SCons* files in build systems are written as Python, all packages # need to explicitly verify which versions of Python are supported # and use appropriate Python suite eclass to select the implementation. @@ -93,7 +93,7 @@ inherit multiprocessing # -- ebuild variables setup -- -SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}" +SCONS_DEPEND=">=dev-build/scons-${SCONS_MIN_VERSION}" if [[ ${_PYTHON_ANY_R1_ECLASS} ]]; then # when using python-any-r1, use any-of dep API diff --git a/net-im/swift/swift-4.0.3-r1.ebuild b/net-im/swift/swift-4.0.3-r1.ebuild index 68610ca1aa45..ba59f4d41977 100644 --- a/net-im/swift/swift-4.0.3-r1.ebuild +++ b/net-im/swift/swift-4.0.3-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 LUA_COMPAT=( lua5-{1..2} luajit ) -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit lua-single python-any-r1 scons-utils toolchain-funcs @@ -41,7 +41,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} - >=dev-util/scons-3.0.1-r3 + >=dev-build/scons-3.0.1-r3 test? ( net-dns/avahi ) " diff --git a/net-libs/serf/serf-1.3.9-r4.ebuild b/net-libs/serf/serf-1.3.9-r4.ebuild index 9e3909b7879d..0d7c80cd62a3 100644 --- a/net-libs/serf/serf-1.3.9-r4.ebuild +++ b/net-libs/serf/serf-1.3.9-r4.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="7" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -24,7 +24,7 @@ RDEPEND="dev-libs/apr:1= sys-libs/zlib:0= kerberos? ( virtual/krb5 )" DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/scons-2.3.0" +BDEPEND=">=dev-build/scons-2.3.0" PATCHES=( "${FILESDIR}"/${PN}-1.3.8-static-lib.patch diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index 738b271a8e88..6ae2105e8f47 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -46,3 +46,4 @@ move dev-util/gyp dev-build/gyp move dev-util/netsurf-buildsystem dev-build/netsurf-buildsystem move dev-util/tup dev-build/tup move sys-devel/cons dev-build/cons +move dev-util/scons dev-build/scons diff --git a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild index b27d658a8811..e2deae1550a1 100644 --- a/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.23.1-r2.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_10 ) SCONS_MIN_VERSION="2.3.0" inherit udev distutils-r1 scons-utils systemd toolchain-funcs @@ -66,7 +66,7 @@ RDEPEND=" X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') test? ( app-alternatives/bc )" # asciidoctor package is for man page generation @@ -75,7 +75,7 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1 + has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { diff --git a/sci-geosciences/gpsd/gpsd-3.24.ebuild b/sci-geosciences/gpsd/gpsd-3.24.ebuild index ed42e9440986..ea6badcf72b1 100644 --- a/sci-geosciences/gpsd/gpsd-3.24.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.24.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9,10} ) +PYTHON_COMPAT=( python3_10 ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev @@ -65,7 +65,7 @@ RDEPEND=" X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') test? ( app-alternatives/bc )" # asciidoctor package is for man page generation @@ -74,7 +74,7 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1 + has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild index 6f1915f25cb3..c617497e8672 100644 --- a/sci-geosciences/gpsd/gpsd-3.25.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.25.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev @@ -67,7 +67,7 @@ RDEPEND=" X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') test? ( app-alternatives/bc )" RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" @@ -77,7 +77,7 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1 + has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index 68f8c0cfc864..5e2024d52363 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) SCONS_MIN_VERSION="2.3.0" inherit distutils-r1 scons-utils systemd toolchain-funcs udev @@ -67,7 +67,7 @@ RDEPEND=" X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]') + $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') test? ( app-alternatives/bc )" RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" @@ -77,7 +77,7 @@ if [[ ${PV} == *9999* ]] ; then fi python_check_deps() { - has_version -b "dev-util/scons[${PYTHON_USEDEP}]" || return 1 + has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 } src_prepare() { |