gentoo resync : 15.01.2020

7 files changed, 18 insertions, 218 deletions

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index e4c54f110f32..fa97e4feb49e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,21 +1,13 @@
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
-AUX scons-3.0.5-jdk-include-path.patch 878 BLAKE2B 7fb21bac419af3a74c6323d02082fedd80221102f87d87781bf2eafac1b877a96e11b992016b97556e24245faee85b67bfd75dcd4f5aab9b9fbdacc4c37788a1 SHA512 9cf4b31387c6630f7a6574913966cfdf355885d6f1e0c5d74951a5e69c187a768931db097e8178db0ec73201b0062a5a9c8c497cec30e9cdd6170c49610c35ff
-AUX scons-3.0.5-jni.h-include-path.patch 875 BLAKE2B ff8e4fc290dd3afc2593fa56d737f3fa1867ae02e7f128fc6316cb2c272db9e90bb345b243a29462dcdfff60f03c75f7e4106713367c988df5f406989b4005f2 SHA512 443297e374f053c0dbc66df50a53556bb3bf68ae372bd8f2150bd4ad21ee1cae22afd24fca62ce528e1d82ca13b8856dc20685711685e89aae144a14315a9ae3
-DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda738246ddf5631ee3f0f49c3c44a53916a8cd5bd075bcffa350e1b5c99f53f81f229d4f74bcc871572a02a0dfafefada SHA512 1b9c965fac6b792e049ad1975e104d40ff6b99fe4bd247aa375955daaebb46e2ed42afb8484dad652df71b695b7db2ee92df34dc0f1d3372d55fad0d27c4b78d
-DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
-DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
-DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
-DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197801a63ff392b086e0dbf1baa9c19d8208a6d9718aa7869e320d85cf3fcd5f24c5fe41dfded9f4a8d21d4bbb9b63 SHA512 731308886a660770aeb7b17020e99cbeb736a0bad8e138ff2363ea5297866445325daa4802ee051e0c01720aa73856163fb9da2fe5fb11077b9a2197e0c24323
-DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
-DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
-DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
 DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
 DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
 DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
 DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
-EBUILD scons-3.0.5-r1.ebuild 2912 BLAKE2B 701e8e7f2a19608f170b03c09f50253c74c154da95580f127dc6d28c434770227f7fa6a154fede155eda571eaf7f0a006330833c78addc5fcd297b3374218458 SHA512 a5b05f16954ae98c5eb1e749480bec23851741e29adf357a560317e58d7e16e40e64ff4d2b92a0f15ee7b2e241d940dd80dcd1f61b0e43acf312d04ae686b890
-EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 1453fd6a734ce773bbfd643fbf896e56e7e514fc1787a54f169f957ffc71614c772116bc545d83ab426b05e0e6464d4fd85e2b2f983cd75a152c5f246218ae16 SHA512 1aa81365b512652a1bce0e009b0549bda333a8d692d1701f196addb5b1e69994af307ccb2aa112dbdfc96b9bd031ac965f188d22500de9dce3d0c463e529a646
-EBUILD scons-3.1.0.ebuild 2643 BLAKE2B 7e4ca6a988170c68eccf2815ac92edf56eecdab56d8e2871271fc81139a72dafc70382a578941d1ac3efae29ca166ba37242d40cd78df5e8b2032997ef08a455 SHA512 0a29ed83e313087921ba30bb7b2d9a2c183ce84891614fa0b0f429fdcafeee30092fac6517aaa1a5eba085e171660ca9e5c329af686ab961012da2d3312622b9
-EBUILD scons-3.1.1.ebuild 2634 BLAKE2B 6b3a2283772fe1e261641725da4bbd0efe962631d3444af10d6e854310dd26c71c9d978fc11571577a5761060b5d6d30383cacbff652a6fa81d7054bc36e0c6d SHA512 feabad95d2bdf583959100f69bca5d3873fbf902c679a4201e5187c7a36f2259588b4fed03ce149c7c0f901ceedf85963cdb26288eca61e7cc1b6b515aa8997c
+DIST scons-3.1.2-user.html 1126908 BLAKE2B 38e7695b6ef1e79b3eed4455fbe84ec1587be3f21c1c90cfa6602b344c52c704f021ed8e611abaf2e24ca06c5116e79fb78ca724c9920186cce35feccbac899d SHA512 a13ed1157f6aad25acbad6e1e3d2c0a16a14dd1d5fa369ba27777ca30eeb31ce37c735c1870c80f7343f0f98a4305fe1ef7c2b679cf2cb9c0d6670f34a3aeba8
+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
+EBUILD scons-3.1.1.ebuild 2631 BLAKE2B be8064d70cc66ca5365f35ff219a2ae9cfa19b1388bcd7acfdf1960e8174fde42bcd616f763722304fb1ebbb865fc438a901e5b687391cb212033095a6a4fbf5 SHA512 bfb40c1a8b05ef701e8898426a6997bf1b5b7e8a83913dedcba1215b58868e02fb64855221706115a56afbd374a0fb2f6bec7536bab9e1c4fbdf1a0d80410a83
+EBUILD scons-3.1.2.ebuild 2710 BLAKE2B 4d12988ec715903909614b9159b7d10d249bd88cf10667349ce3b77afbb1aff78aab272f2077786fb5cd5c8960d6790cc195bcb420b4ee5fabaac576bf5a6d00 SHA512 8644c357e42df186a2709c0c90a550fd2c678cc7508e81c3380d8c2effae7f2a05e3284a1ba6a03caec0afef7b01c8eb667f15477040438207d92a39a42b2629
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch b/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
deleted file mode 100644
index 708447592fa8..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jdk-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py new/scons-3.0.5/src/engine/SCons/Tool/JavaCommon.py
---- old/src/engine/SCons/Tool/JavaCommon.py	2019-03-27 02:16:32.000000000 +0300
-+++ new/src/engine/SCons/Tool/JavaCommon.py	2019-06-04 10:44:01.000000000 +0300
-@@ -403,7 +403,8 @@
- java_macos_version_include_dir = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/'
- 
--java_linux_include_dirs = ['/usr/lib/jvm/default-java/include',
--                        '/usr/lib/jvm/java-*/include']
-+java_linux_include_dirs = ['/usr/lib/jvm/*/include',
-+                        '/opt/*jdk-bin-*/include',
-+                        '/usr/lib*/openjdk-*/include']
- # Need to match path like below (from Centos 7)
- # /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.191.b12-0.el7_5.x86_64/include/
- java_linux_version_include_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include',
diff --git a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch b/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
deleted file mode 100644
index 818db02279af..000000000000
--- a/dev-util/scons/files/scons-3.0.5-jni.h-include-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur old/testing/framework/TestSCons.py new/testing/framework/TestSCons.py
---- old/testing/framework/TestSCons.py	2019-03-27 02:15:48.000000000 +0300
-+++ new/testing/framework/TestSCons.py	2019-06-07 16:13:48.000000000 +0300
-@@ -742,7 +742,8 @@
-             version=''
-             jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h',
--                        '/usr/lib/jvm/default-java/include/jni.h',
--                        '/usr/lib/jvm/java-*-oracle/include/jni.h']
-+                        '/usr/lib/jvm/*/include/jni.h',
-+                        '/opt/*jdk-bin-*/include/jni.h',
-+                        '/usr/lib*/openjdk-*/include/jni.h']
-         else:
-             jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version]
-         jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version,
diff --git a/dev-util/scons/scons-3.0.5-r1.ebuild b/dev-util/scons/scons-3.0.5-r1.ebuild
deleted file mode 100644
index b8f27f5dfd17..000000000000
--- a/dev-util/scons/scons-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://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 ~sh ~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-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
-	# add Gentoo JDK include installation paths
-	"${FILESDIR}"/scons-3.0.5-jdk-include-path.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
-	if use test; then
-		# addtional fix for Gentoo JDK installation paths to find include directory with jni.h
-		eapply "${FILESDIR}"/scons-3.0.5-jni.h-include-path.patch
-	fi
-}
-
-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() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
deleted file mode 100644
index 7f7185c37050..000000000000
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://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 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-# unresolved & unpredictable test failures
-RESTRICT="test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.3-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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index d27486f19793..e98a6472fbb1 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 ~sh 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 )"
 
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 363c4a06dd55..4ba4081a60b3 100644
--- a/dev-util/scons/scons-3.1.0.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
 
 DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+HOMEPAGE="https://www.scons.org/"
+SRC_URI="
+	https://downloads.sourceforge.net/project/scons/scons/${PV}/${P}.tar.gz
 	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+		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 )"