gentoo resync : 23.09.2020

3 files changed, 15 insertions, 94 deletions

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index de16c6f19f9e..008e3ad2cbf5 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -10,16 +10,11 @@ DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be
 DIST scons-3.1.2-user.pdf 2557502 BLAKE2B 1c89d845d23c4e434c9db11d8730121f0b8dc6f2fca21dabe3e7204373cdf743d831a1835731332e39ccd7f3f49da068ba34a33a2937e9dd205e38d9c8b2b321 SHA512 9da887c157cb95f7802cb4b96080b0e56f2ad7663021b8be0839e71d473422fe9dd0dadf0ad1b067160c39511e91c6b3d9aaff8e238bb46b10a03ae89b12e169
 DIST scons-3.1.2.gh.tar.gz 5534888 BLAKE2B 63e8b069cfddfed6a2ce8bcb7816b51b1881ca7a1a3e552f2eec5ecd1deae80720b0acfb711ab17067efdc9d0e4aea696e9f4eee6b374071bfc60e7bb79cc58a SHA512 b096501ea37e62f596f16b46b4022ad7979f359b10849d4c5fa17731a6c3ec34e0890374de175a8aa7539ae677777142ccf5dfae39a74696efcdbcc00e89bccf
 DIST scons-3.1.2.tar.gz 668298 BLAKE2B 14251e2bab425dfc31d1d6d9325a67725dae42576d2a5c204f0ff7948aa2da5aadd3fdf03bbbccd615757520fedee5e18ca2ba13aaf07a4ddfec330db4221203 SHA512 bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33
-DIST scons-4.0.0-user.html 1414886 BLAKE2B 1005a79040a4e035fa667a7c2f6231300c5fcade558d373eb6af36f4a8fdfcdb9c48ca0e5ecc36add72548f4ce6b904a745cbd6275649e1a1ce0e9172843259d SHA512 d4ce7b528ae714617a20adf49c66beb478d432f33f095ffb05f30038b2295cfe658c1dab421563dfae674bd0d4c343b98058cb8decc5393883675f4c9a7cf5a6
-DIST scons-4.0.0-user.pdf 2468838 BLAKE2B 6541fbc9d8f409ccde07746cb2a6e046fe4a4b868c2b6b80401c30c9d99a27acb2a4aedba9f47ba9e4cf8ac62510bec43a9aac33cba6912b837e13baeb996353 SHA512 cc62fd88dc0dda77515328b434492f8dbc0b4f615a2f3bb4841391ded7fbc738050b2ca7308c820d55efa59c28540391bd546ecec909b1fa7df66a944bdaa8aa
-DIST scons-4.0.0.gh.tar.gz 5584060 BLAKE2B 316be6af0cf52181391ba3251315a0d7da6024a3c650c3de927ff9db041aba096a95f09a7a13f64f78e20473490eb08fb2b0da191c9c3957fad9113e2d3dab14 SHA512 8277c8ceeba5e9612e8c757b3ab736cf116f66e707f4127b1e09f21d3a71ca7fd13dde0453f73b97c168cd05d8ba97084c010f3dcc1e29bb26ebbbeae9ea8338
-DIST scons-4.0.0.tar.gz 2874600 BLAKE2B 439b4e32cb62f5b9546af771eb292a5ff36eddb23fbd169fe065d2dbc3c3916d0551a2807bf765952384e46e036fe4b6142b739b5cfe385217539e1a22daf5ff SHA512 38c8f6600bc5f4b5385eb65ff1e98e8464dcea2a1128173f883a06822eca2e250998c666418a9cbbe2c30ff26da4de3c5fdd68381e68708d93e59bea8680337c
 DIST scons-4.0.1-user.html 1415152 BLAKE2B 1a94b2ef5e076d883f2960825f055c7cc39cfd1848be797a9519bf94834cd4174d3da3274ef77f64106c1cc182c3f8cef363e3982f5c227d3a6dcbeadbc847c2 SHA512 f1165836ad80c90caa4d936ffc86c0ed20ea4c5e7854c36fee3a2c575b1c05c731d4ece9554e43292e6da30176ad9f31f31cf12f84264307c1494f79b06f43c7
 DIST scons-4.0.1-user.pdf 2468804 BLAKE2B f0af6bc6b41d972b98e955ee3ccec908aa366eabe31bd01022abe1f6d3a94dd6d7da26f71de23a6dfbcbc7bb4e439463f69bb7e8a5780c1300e3ba508b9eb314 SHA512 0d2733e2f1391083522a64117bfd35a2160d1366382f6f630b26eba36fc12ce797467d5e16efeb3b7f58aa9d853f96ae0d50fe78f59e78d24642b146bc7e565d
 DIST scons-4.0.1.gh.tar.gz 5578800 BLAKE2B f9ece5eaf1b133219f975e484beb5df726560a38969b8e8ad829781b960b438458bfcd7971333da87560c957675b2a4f8675e757fb0a4268cc4ecf72bb60d45f SHA512 f23c5dfd3c236e9f9f85b986ca64a36dbd85e9f3383cb3577e082a7dea4b83283020fbf064c2d919ab116195c6708fc11f906fcf3b0bc0533a4bc49a4f7371c6
 DIST scons-4.0.1.tar.gz 2874481 BLAKE2B 98377e62ae31d32758a93c4e04c578b88ea541cc292af63c6ca43e2948745e416ee6d757d98129ee30d0e0bbab90664889441a5bb86d4c9dfc649ca1dbef7536 SHA512 400b11323d48f04395b519dfafb6fce15a6dea92013f599dc4895b112629c0a06c7d2806755c74047d001d60087b94f39a118f512b7ee8de6214a4ffc7310468
 EBUILD scons-3.1.1.ebuild 2629 BLAKE2B 9b6dd42a2a625ae6110b2ead2754e0c5d1d69128c32058913d102d545c820ef9e2ca25e2cdedc69a01a777633c32fd7aa3ec598e4d8760ec349ecb1ce9b1bae7 SHA512 309b84180a14cf7233f4879832489da56dad5236f30f9c402037b9dd2737b3983fda32c233e966ce755a75c3db6392f44a385dedeee8d21c3880f9cfb364cd57
 EBUILD scons-3.1.2.ebuild 2753 BLAKE2B 5f7115fbf7d3947bd90d1d147688110e13965bbcdcfd869eb7ac7222d942bd3fefc21f90d77bc0c9bfca58afc4ff593267635d8abed69cb0ad3fcc33ee62bd36 SHA512 2e479ac016b7dbb7f7a80652121f228621e9f85780cb0a3895b0a9b610fbcd376b7482897a993abe03ebddd176a66a83dbc2d5ad4e46a7b71f83e1c9cff39165
-EBUILD scons-4.0.0.ebuild 2623 BLAKE2B 664c157b4c0f9dc13fffd17caba6db18f3e6f0440a2a584fca5695e2d2788034ae3630f3c534ae605ec001e79751ad072425e973035cef52195198e05aa8c25f SHA512 b836e5e27e1a9cfe8fa8e42d69ea9f2154ddeabca65668bf47befaff72ae46ebd0925fae55f8ae8b73a72b4397ee45b7e3677e6834caa7ed0de49f58f5b0eefa
-EBUILD scons-4.0.1.ebuild 2622 BLAKE2B e452a9c8b103ed5e93e948cc833bd41b4e782cc664c9e90139ce2813ca97fa2ebf31be8a7cdbba17ab42ba0d471a07dfef8e8f648578f79a566cbfc0a3e7fe8f SHA512 3d7eca7dc0c1598d667d6d036611da36aeaa0950e4691c82379f1d7ac9c299c8a7eec82dd7e0844c2ea4404f1efa60fec6d53dcde3c6ee9441a0c0866e422333
+EBUILD scons-4.0.1.ebuild 2878 BLAKE2B 857c90f6de1a879042a221e8a357648e3e19e580c77c1edaeac690cc2437ad0c956b94c860f51d368a0f69164e3d32c0d3ae135da1f03b3369b32d6a474b5507 SHA512 c426aa0fb9ed89c968d411d67045c94684110c1aa1e677ee656e5c780119c1c0fd07041cc8c6692ddbb660bf4963842cbb117e411ffebb88a06b25440544e50b
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-4.0.0.ebuild b/dev-util/scons/scons-4.0.0.ebuild
deleted file mode 100644
index 3325adc75936..000000000000
--- a/dev-util/scons/scons-4.0.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="https://www.scons.org/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/scons/scons/${PV}/${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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-4.0.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.0.0-respect-cc-etc-r1.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/},$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	# 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)")" \
-		--builddir "${BUILD_DIR}/lib"
-
-	# 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}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index 191cd21327a9..eaf9eb29e710 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
@@ -62,9 +62,22 @@ src_prepare() {
 	# and fix manpage install location
 	sed -i -e '/cmdclass/,/},$/d' \
 		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+
+	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
+		)
+		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