gentoo auto-resync : 18:03:2024 - 06:49:50

3 files changed, 162 insertions, 0 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 45bf0496944c..ee47d6e02e7b 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/scons/Manifest b/dev-build/scons/Manifest
index 851dbef9f1a7..fb0036bf41e4 100644
--- a/dev-build/scons/Manifest
+++ b/dev-build/scons/Manifest
@@ -1,8 +1,13 @@
 AUX scons-4.1.0-env-passthrough.patch 1498 BLAKE2B 9aaae51779053518d983c9f028fff58a68a8c3e1213c8a746aad2e6dc6cebf139939dd3fb41a643c5db7e6079e09ad9850e552192e35bc4c8bf75818334b9e0d SHA512 4c5c3364575d95f4922b7c5b3c8f536a34b58136e7a604bc06760d94a8b20c7e8cdfd3100ab8c56e08b885e2e9521f036f4009512b1f1b10aec2785a74119683
 AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750afc14650fef564997d250ed63f0d9b1c91361872a8816cab9ba1f0ecae46711414ccac921ded954eff7c51e4161532030e5f SHA512 ce8690a126255047c8efbcad4e75b91fca07b0afac55d818d4f5467a41795394cae8f5d47484519c482bccfdae9c3df1b040689a656098f349629f1f609adbce
 DIST SCons-4.6.0.tar.gz 3230138 BLAKE2B adef2ad5394404ae48d85e8c2a91b5af29e4f9bfa7455504ac1cb8d22d9a05c9ace823e02c8e7a32b34dee281635987487ad43ca94c6adea8e287b086a0732f0 SHA512 c7dc952117c23ac30b8cf1f70ef0c4ad1c0a86c9865fd255fde1a29ea2fbf9e26573b73430f6adc8c545dab753077f380d29d77ac4eede7fce959c86576d2354
+DIST SCons-4.7.0.tar.gz 3220744 BLAKE2B 0fe8cdbaef46ca6571de35fb6544afe992e8a509cf52a8078133584e3af63919d2e0fb83ad646e042290fc47ca5a8932435946df9d40a099ccb2105b54bfd5cd SHA512 d08fba3e7f058eb2eeee4a129d10b55affada6b192932f069271fcbc28fd8216b2bf7e94285d9c448235a3965a789d3a91db9ebae1945aa73306788009dd2e77
 DIST scons-4.6.0-user.html 1670870 BLAKE2B 0c84248791bdce093cce4d45b525357aeb3ae69835337000d753b007dc77053d63e70363b3d73c3e7c8157b24d50f0a0216ea9993d90bb298ba2591d6fce4cb4 SHA512 5b8a2626bca361dbce1b0b40f6009752b2dbde7e1f5886b449b9015514951b2e998ede0582876411e7cde56b4ea05546e2db8a8fdcada349c39a126c2e50be1a
 DIST scons-4.6.0-user.pdf 3058220 BLAKE2B 3a04e1c0fab47f2a1327f20d3ee500d7861599dc31b0007dd196173af5b880d9737ff528b419896e905cae5a5744c74ef38c2b29bc7945ef4157a79c1c6dabe9 SHA512 6a5ca9cdede81ec9536bb32d7df157fd1efd4b3e3f5afa386b7ecaa45d1fc212015673ccec5ab3283475ab0ee6ef001c111f51b7d3bb64dda664e61d11cbaec0
 DIST scons-4.6.0.gh.tar.gz 5891032 BLAKE2B 9aeda2ef899dcaf5bc7ca3bc77c0615544f2308f56ef095ad835d5cc748355b467a905ec737eef61a4afd183ff0f041dc244bdd58858ba3abc4f3a4efd9f8dc7 SHA512 d7dd30bbc94ec014b12b37a106aa536dd5c8b16e9f1605b68cad6721cf6e3959add1f75a42693fd8499734ca19eb76f648800d7cc8081fe334282841cd406954
+DIST scons-4.7.0-user.html 1683569 BLAKE2B 6c68f34af85fbfaf70f77758321bd0bb86b4f549c5fa05f721df94af0627d030a15db89565910ee6674b514d6b4fac9e624ac0aa6e849bd1224833c0473ed4c6 SHA512 8b0320794775890d898854767cd12bc4da725f6a33ae4496dc41a7b37a6dcb5f812c23083093d17685db9799b230552e19cc5550a108c2cf6787ffd963e649d6
+DIST scons-4.7.0-user.pdf 3069908 BLAKE2B 7196a5b247802c9f42914c4de5968862c4a183e5c3ff7e5172ec7bbf58f049362f0b85fdaba47c66fc09dbed79c22ddac8195a78bff2e564eff879b0e6a4f482 SHA512 6d62def8a68c8bf3b6cc269a93272c815e82b46bd6a223d0f7f3848daf9c7212e5f9de8dcdac41d2a6f2d7d70053b97f92e0b99c11f4f5b2b3a69951d474fe3a
+DIST scons-4.7.0.gh.tar.gz 5896790 BLAKE2B 1ce9041ad1e2891da92a9bd50e07e29a5e23c7c9432adb120d6610956a2ea4a5125fb6bfa1f8b944797d589cfdbe036a1b9b1eae271ae51abb826c6ee5a3ee1c SHA512 8be4d611c375c13467a1a437e0d47873f973584d9a1be0d1cbbd345685a8f477fc19fa59ab01bca1ab7be8af0034d5cfda360090ee4b347c41f7bfea363bfe6c
 EBUILD scons-4.6.0-r1.ebuild 4607 BLAKE2B 67925db3e63eab871f2bf7018b123b7e42cb3d274e167f33ad5e07611dc3eba2e5967985a9041ab515d4696cd402db154c35a9f6e58d7e5bb316dbb140d05b45 SHA512 b4cb3afd45c08edf004eadae5d94da62bc6335e0831faac1cb95967a1583aa311b3f5cf4fe08dffa24a1046bdc24a329191897036e4e4631010cabc7e9113dc1
+EBUILD scons-4.7.0.ebuild 4541 BLAKE2B 1b4a9dcafabf397f307d6adcd11284b72340bb555b49aa473f15478cfb148a5862447ea3dee386498cca5a367c3f80b65dab04a3a7fce0bca8dc02101d1d797e SHA512 1ce472cafb6d5d1f1be589ebd64680e2ee18897a65c519b1f03daced50668dfdba9f8c3182a846a65f6cb8fdcb9dd7ea46ebe86124236c695304283995f51329
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-build/scons/scons-4.7.0.ebuild b/dev-build/scons/scons-4.7.0.ebuild
new file mode 100644
index 000000000000..adc721c8bdcb
--- /dev/null
+++ b/dev-build/scons/scons-4.7.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 multiprocessing
+
+MY_P="SCons-${PV}"
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="
+	https://www.scons.org/
+	https://github.com/SCons/scons/
+	https://pypi.org/project/SCons/
+"
+SRC_URI="
+	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+	doc? (
+		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
+			-> ${P}-user.pdf
+		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
+			-> ${P}-user.html
+	)
+	test? (
+		https://github.com/SCons/scons/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	# use the git directory structure, then unpack the pypi tarball
+	# on top of it to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}" || die
+	fi
+
+	tar -C "${P}" --strip-components=1 --no-same-owner \
+		-xzf "${DISTDIR}/${MY_P}.tar.gz" || die
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# TODO: rebase the patches <4.5.1-r2 is gone
+	# support env passthrough for Gentoo ebuilds
+	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+
+	if use test; then
+		local remove_tests=(
+			# TODO: does not respect PATH?
+			test/Clang
+			# broken
+			test/DVIPDF/DVIPDFFLAGS.py
+			test/Java/swig-dependencies.py
+			test/Java/multi-step.py
+			test/TEX/newglossary.py
+			test/TEX/variant_dir_newglossary.py
+			test/Configure/option--config.py
+			# broken by commas in date, sic!
+			test/option/option-v.py
+			test/Interactive/version.py
+			# warnings from new binutils?
+			test/AS/as-live.py
+			test/AS/nasm.py
+			# hangs
+			test/KeyboardInterrupt.py
+			# requires f77 executable
+			test/Fortran/F77PATH.py
+			test/Fortran/FORTRANPATH.py
+			test/Fortran/gfortran.py
+			# TODO, these seem to be caused by our patches
+			test/Repository/include.py
+			test/Repository/multi-dir.py
+			test/Repository/variants.py
+			test/virtualenv/activated/option/ignore-virtualenv.py
+			# broken by CC being set? *facepalm*
+			test/LINK/applelink.py
+			test/ToolSurrogate.py
+			# no clue but why would we care about rpm?
+			test/packaging/option--package-type.py
+			test/packaging/rpm/cleanup.py
+			test/packaging/rpm/internationalization.py
+			test/packaging/rpm/multipackage.py
+			test/packaging/rpm/package.py
+			test/packaging/rpm/tagging.py
+			# apparently fragile to... limits?
+			# https://bugs.gentoo.org/908347#c7
+			test/builderrors.py
+		)
+
+		if ! use amd64 && ! use x86 ; then
+			# These tests are currently broken on arm and other non-amd64/x86 platforms
+			# Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to
+			# better plumb up the MSVC tests for alternative arches.
+			# Try again after 4.2.0.
+			# See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html
+			# bug #757534
+			remove_tests+=(
+				test/MSVS/vs-7.0-scc-files.py
+				test/MSVS/vs-7.0-scc-legacy-files.py
+				test/MSVS/vs-7.1-scc-files.py
+				test/MSVS/vs-7.1-scc-legacy-files.py
+				test/MSVS/vs-scc-files.py
+				test/MSVS/vs-scc-legacy-files.py
+			)
+		fi
+
+		rm -r "${remove_tests[@]}" || die
+	fi
+}
+
+python_test() {
+	local -x COLUMNS=80
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+
+	# sigh
+	rm "${BUILD_DIR}/install/usr/bin/.sconsign" || die
+}
+
+python_install_all() {
+	rm "${ED}"/usr/*.1 || die
+	distutils-r1_python_install_all
+
+	doman *.1
+	use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html}
+}