gentoo auto-resync : 20:11:2023 - 11:14:01

2 files changed, 159 insertions, 0 deletions

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 980dca2beb7f..6b5455e99eb8 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -3,6 +3,7 @@ AUX scons-4.2.0-respect-cc-etc.patch 3493 BLAKE2B 3a36a9cced15ef81e671d8a90750af
 DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7ee7495036d73c46e8ae445b87c88dde23a537d6647709778a33e6f1ac529f7ac7f862648e3019bbe437bb451c SHA512 d4e630214a9221f00d668b6524803efa83b41534fa6e0acca689d926cbc8546e5cf79c1c7a4b5627afbcd5033564343b408790bf4c29067d053cfbb39408a8ed
 DIST SCons-4.5.1.tar.gz 3194371 BLAKE2B 830e3365be99e38aec0f3b99d406bb7547d3d8b7c7fb752db1199df5545879dafc52f449b001c3ef10290b1bdbcb52cd7c4befc7dee4b2f3be1234cca2d4fcec SHA512 aa676021694b1020a21a517a4d3df03f442a28e78b2d32d4316b7d7ee7271f8025f2b50d0ce8fe5d5a8be282b5ecaaebd9aa85be1e15e6a0bbad1567a394014d
 DIST SCons-4.5.2.tar.gz 3194724 BLAKE2B c27d00e4bc319e3b8d5d35d50d5f03df15e2b72256e26000299ac95c5bdaffbe850942df9e3c23a6b0dbf55ea000f768a7938cfedc451cc7bd3e2a521292d49e SHA512 a9675f4b4dbedf8c7375d4d099216cd935c38944d57b0a08de2b9c133bb53184de0d5803edf5cb9f800f205b1252ceca3aaf33a10bf5d8b48eacd58866cf776c
+DIST SCons-4.6.0.tar.gz 3230138 BLAKE2B adef2ad5394404ae48d85e8c2a91b5af29e4f9bfa7455504ac1cb8d22d9a05c9ace823e02c8e7a32b34dee281635987487ad43ca94c6adea8e287b086a0732f0 SHA512 c7dc952117c23ac30b8cf1f70ef0c4ad1c0a86c9865fd255fde1a29ea2fbf9e26573b73430f6adc8c545dab753077f380d29d77ac4eede7fce959c86576d2354
 DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
 DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
@@ -13,8 +14,12 @@ DIST scons-4.5.1.gh.tar.gz 5844118 BLAKE2B 88a82e12a034f6d0748555d0d33716e5af6ff
 DIST scons-4.5.2-user.html 1655168 BLAKE2B dab0b29ae7bdadc96b9081d1d9e1d8b29cc62afb39f3161e4b7694b3e58a31e82446319f3efc560fdbe2c3a37b902c79c74d15a790c865ec3c6d27811f0443fe SHA512 6f2c74d15dca903d500bebe33f0af6b90ca1458c3796048077d411b2c269013696036c7e9ae8b1f300f37c05dd6246f8b12d35b503f9018f002b9d01fea22ba9
 DIST scons-4.5.2-user.pdf 3023818 BLAKE2B b67e2ca3326b5e9ec2cdb530b22d347072e9c906678509a21aae1622487054d4aa3446beb599dd52cd93ad769a5b325dd101356ea88baedba907c931e0acc792 SHA512 172f494fd5e73f654adf9c137bd09f74f57bd2ef17dbd0f02c66aea49798a3fb136f176ee85fc7432378af49e28cbb498e830e519df74652533ecb9f3e52ecf9
 DIST scons-4.5.2.gh.tar.gz 5844800 BLAKE2B c0f42994a178bb0fb329cfa05328bdae89b374a33a7806276e7529a81b37a4ea9f52d07fb2afc55adbe3c1e00661ea3c3d53e981be4a8a095079fc35403328f1 SHA512 aa788d9365a8b5119fef404869562f61cb854be7ceadb5f5d47523e262c07f93ea7476166b577edec25339a64dc6a1f4a6f391fa5aeeab3f086a6659fc72e1ce
+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
 EBUILD scons-4.4.0-r1.ebuild 3729 BLAKE2B b687486ff4e25fd5f5921576d9fc4e0e248ce891cac569a8c63d0475b2f83dfff92624c561db79b28bedb3861bbb7331c04721e66d2593df613cf92ddb56a91d SHA512 072a26e39a50759810be5f36a0003185a06c474bc534e9a3835c3894b78eac84b215d38cd5e8fdfe6832c1b82c528a954c61dd2f1421032d8fc80344d9b8887a
 EBUILD scons-4.4.0.ebuild 3640 BLAKE2B 92569e54bb39afa9ac1d5943f7d4b76ee8da2e97af18326322443a41f24ebb75c921c712c356061f415da7ceb6cce3c2631ef946b3279a308716cdff922476d4 SHA512 8c26be4dc73dbad15bedb4349daba06e752425c5f93b71be5bd8f67796150545daf20582a5fa01f128d920eebc1e9480e931af14b2a968a96a9088a2433fbd83
 EBUILD scons-4.5.1-r2.ebuild 4080 BLAKE2B 38c4d44acd8e45ed44e00a7c814879be5ce927641f89894e3be3c45d5fe0a51ce3ca6010c87008dbe71287eb650d288246d4df99e9f3d0d6b267636cb44b0c05 SHA512 4832a754854d47d10a60f59347a778f9e1da234158074376a495492e5811dd892efad0f522d22cd131a1eee2d7e4a798758484287bb9f56014822abf4bda3492
 EBUILD scons-4.5.2.ebuild 4436 BLAKE2B cc1105b0910776399207de769e2c34d87ba7292331f5d59ba45a538bb6945b85f1ddc7a4a7a07e36d73c51a40e2555cce3da44f43df42649bd14ef51f29c9264 SHA512 d87feba2cc649b7ae62e2ac8417a2d9713b68a07fcc4ec2fcde0fb6b20b0b760f2f20e0b8a1f916d54e558049b1fe2a82ce8ce2fd1477356231f7a4ea975cfcf
+EBUILD scons-4.6.0.ebuild 4441 BLAKE2B 093a5cc9cb33fbfd81eb1d6f24d444c62d7025e08b033b236f46061216246c766c42e0d0b2ca824b110c211d3ae58a48686b7b6579d172a226e051a8ed327424 SHA512 cc472792271f2f118ccb28cd05024155c9f886baeee427f21150b2b9d2922d86a0a094a559ffb4f3962debdf18c8e07479df84c1c48ae515eb20fbabcf0853c2
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-util/scons/scons-4.6.0.ebuild b/dev-util/scons/scons-4.6.0.ebuild
new file mode 100644
index 000000000000..59f9c12737d1
--- /dev/null
+++ b/dev-util/scons/scons-4.6.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+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
+		)
+
+		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}
+}