gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-devel
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
33 files changed, 676 insertions, 129 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8e3763015574..020b4dbea35a 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 994d31a93929..7cc8bc287a8e 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -8,7 +8,7 @@ AUX automake-1.14-gzip-fix.patch 2689 BLAKE2B 589f5261936f1d54f1345dccc284381373
 AUX automake-1.14-install-sh-avoid-low-risk-race-in-tmp.patch 3015 BLAKE2B a0a7afb76c8cd8a5dce60bcb0a7a59a7957bcfe2b70f541889d5677005f4c9a295cf0459eaf4626314ce75031716028fe0a91db00f416e2aef8d17d8e31009d0 SHA512 34a061b72993290ac9fbf7957da89d0ed0ded70f304db0983ffff557887434dba01f5ca40cfd13dccfc648af7ade9b94d45895bac33dd560d550e3f1b24b6a55
 AUX automake-1.15-install-sh-avoid-low-risk-race-in-tmp.patch 3672 BLAKE2B e967579e81e3da85c9a5026a829be9dae93fd7d452c67bf94383787a7e7b46b62ba605112f3aaa5b4ee38d06727320ab8df017fc0b3a957e8fe0ba8e91883d52 SHA512 cfb9a11d82641b4f5b8e43d6a97fc20d012ce9ba6c4ab5fa3bae8c33da980867e3bad35229fbd5f2d811cfd849b275e83ecd0b80d25cff78695f700ebfc92cdc
 AUX automake-1.15-perl-escape-curly-bracket.patch 1129 BLAKE2B deb9f842d4d0fd8735e7da0a8344a8c48521097db06cf8c37705046dfdeedc913fcc8fe9c462a7f0dc9089f2548fdfb86a26e19edeb966d3d769a396faca3fae SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164
-AUX automake-1.16-fix-AM_PATH_PYTHON.patch 1694 BLAKE2B d96f3840da73ecaee54751f246ff194c9be15b8fbc7302fd1c2b4cdd3694696762778b6b8f4dc25958741c7cd67c0a73ad2a0cadafed2e87fa4f6ad3ce9fd98a SHA512 2a7d9106ddc51fcae85f720b81d8a6d266b97e48bddcb2f979ef11bb3dacfa277f0a7123adda1b17fc340aada54a06b5b0aff5f49d015ec3645a386ad47d0768
+AUX automake-1.16.1-py3-compile.patch 2043 BLAKE2B a7bee250f6dfb9281ca6b448b2f9774db724f7bb4eaa24dfac1950ba26cc0ed9ca9fa596fc64fa90b6cabd71ff16d131ebaf0a5c1b622edc10de623bd28485c6 SHA512 52fee603a6c825f7deb1d0759d2ce5a8e45d8d9c73de74beca84e10fb3af6873e4e66670831ed13cfe1c202e7bbe7154d00777e3582bab47cfb22acd6f26145e
 AUX automake-1.4-CVE-2009-4029.patch 2186 BLAKE2B 6a33684f950b1e932418e2b7d8d6676fc27792e354f3b72502d5149e9ec9db6fb984e5bb168a465ad97e13d0f1d84b6b8acc0ca04ef51612577196f67441cad3 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31
 AUX automake-1.4-ansi2knr-stdlib.patch 249 BLAKE2B bbf77d9aba954d03cfdb896c88bf9fb98695951011f885936b9df29c522d5ea5d46ee1441d37c7e367cd2c7429a2f017edbf4645470f55c55a7c50b0a7b2ae50 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c
 AUX automake-1.4-libtoolize.patch 542 BLAKE2B 25dad3cbd948d1a6825ba800756e1a6f67ce0be86d2e33d345eaecd5e7c6a7a6e6aee213eb89cb9ce83ee6abf550c96f2ab2d17f32bddc62b95abd4003d93417 SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846
@@ -41,7 +41,6 @@ DIST automake-1.13.4.tar.xz 1449608 BLAKE2B 03dee42d65362a6f36e81c83d516c85faba1
 DIST automake-1.14.1.tar.xz 1488984 BLAKE2B a4c9b1f2c5ca35fba62e57423be2b6c060c63df8198d06a904a236745053072cb14ca4b333fb6cf370ef73378ee8771f4c10bcc111dcbd69e40f75abc16475fa SHA512 5de971159dfca2ec74c3c9a2f1368331efc437b146d675740c8735fcb0d32a30d0560fd29df64c3279efdf9278152c82a9ff09040b3e64d84743aaf25b26ce69
 DIST automake-1.15.1.tar.xz 1509496 BLAKE2B e6ade31089f969140472004cd9854318470228c64e4f8e829d48c5379f62d2c5f8ef9509131c577653e81868d94544ecf6520f86b5d582ebb6ed65c832039f30 SHA512 02f661b2676f1d44334ce1c7188f9913a6874bf46ba487708ad8090ad57905f14aead80fefed815e21effacfbb925e23b944ea7dd32563dca39c1a4174eda688
 DIST automake-1.16.1.tar.xz 1534936 BLAKE2B 0a3b42375361ff3c07e861eb2974fa094f8e76e4c6fcad02d6413402d201506b1cd660a187ffa1d2b29d8955ef60088f7b07d96405d803895b593b35b78f443a SHA512 4013bd31f4903b10875caa7d6ac16a14623a4eb91aa758924dee5b990e234fb50848d131e2dbdbbbc32f89c41a14f9c52a0064c37aa6760c524d607b354b13c3
-DIST automake-1.16.tar.xz 1534632 BLAKE2B e107c71c7c9675a85642396e8905331776193ecba6b92cff01ea83decb822cdafe6be515faf736f32be1264230845a46a2113d590e712b2d82d10728394c6fd8 SHA512 5ed8bed7cf823b1a1ea9090c81d2ec8affa516697ba109929ffca8724d25f13228fcaa3b5490f275c34fb4b523df423e32f900795bd6c51964703c91d1fe1ac9
 DIST automake-1.4-p6.tar.gz 375060 BLAKE2B 681c70a2932ae1697d0b9907c8a8d12ed0d506be4a2812dff93af7c3b659ee1ed24a97f0a653f9a49c0d4a78a70965482b39f1297e9f6d6099d3857a2d451f69 SHA512 3f3235e68ab6703668deac015926124c7eeeea6925e830c6820cb156f15f8ee3febd0fd0cc2ab4f4b5c405b528e4ce12b2459347f62ed6a1a862bc9969163d9e
 DIST automake-1.5.tar.gz 526934 BLAKE2B 4b613c81f933d550cc9e5e40dd9ce1160f49c388f4e9292b1a8843b0f4cfc57d72a3dc10bce03260cffa61ab8d67a5b27d781bd7a4c2d842764135158dc2b54f SHA512 b9dbece18935b6c08f7d17c456b0359a17362dc030692629cf5d66db675e46a5f24d60dfd20a50780e4096163454f1922d4281c4bb7af336d61e527b579e3bfc
 DIST automake-1.6.3.tar.bz2 476275 BLAKE2B 5d0b7f69cbf9fda3b1f1426548fae45c631375898568b442cc5d3561a618ad3f15b6103f55539487dcbf4088a6f75887dce5d00851bc4c09c5db45012d6bc2f1 SHA512 8407ea7d51a238622326d89c22777050c2a49d456e3e33c53985f40e4108094ef149693568d926cd1e9b2ddbdb5693c0d0ec6220e0f7bbae4341b6be9f0d060f
@@ -54,13 +53,13 @@ EBUILD automake-1.12.6-r2.ebuild 2431 BLAKE2B 422f23bcc8ad86604d31a2b2e438b6908b
 EBUILD automake-1.13.4-r2.ebuild 2684 BLAKE2B 74f549fc4fb0e067d7bc1df646682717eea32cdfe591986a8a87b3c7a12805ca6c30e2cdaf7bfc706321f6b7e58f98e25d208cad7532f385e6edb2f148d64c48 SHA512 9017fff85ccd8cd73503c711285743ebc785156920fda2eec1921bd518f384a5618fdcca378dad5a596573e8a09f35136e5e1505b080e60f90710f6100f87145
 EBUILD automake-1.14.1-r2.ebuild 3103 BLAKE2B ca2d0d49d7711bb4756e16a6cafb846fd8e8d1d2b86867b23082ccf94bb0be349c79c693d7f4c776d87bb6d7b939bf3e7137617f6156468131d36cd18197008f SHA512 b0cf20f4d2903c746927157547706c572f959d873c23a1d51714abaab22296ea5d9ac2e7542003c52045779e1d2bbe230db64585b12faa594bae5f1d5733e640
 EBUILD automake-1.15.1-r2.ebuild 3208 BLAKE2B 72b916c78b223383f839fd4b11ed3af06102aaa9a0d1faee48d7cc2a7c710a6f256e06fa44e31e73e74e60d183a8c1304f1e6aab3392a5b8e737ed90b34a1379 SHA512 e422e9c7ffd50b0c441b5d6166b222a7d675bb1280f3ab0964584276c2d96d98159c6809b6d96e2c4ca955def55b5da4b84706f5a3f124d65b2c19dca7d9620e
-EBUILD automake-1.16-r2.ebuild 3273 BLAKE2B 682be1f463073bba82c8136aed554f61cddd54cd5a7e0fa904adeaceec11d3f23a40799a02746ac3e7df48db74d169d03638821cb736aff2dedfa5ced10c3d42 SHA512 63e9091fefb70b46316a8c238606f136f44ce983e641daa61a7cc30fc7df99f70be021f05cd3f443d2c936c72fd6a9ffb6f51de352568d864353f804b0bf18f7
 EBUILD automake-1.16.1-r1.ebuild 3133 BLAKE2B 3a722c5a3a8cf286bf1e20eef5625cec14ce4f1b68618fe9915ce898ecf240d7cc305907982a210c0a9768f79d9a6fa892918cd2cb2bfbf6394bf3cbc08d5dfa SHA512 b26f988fac779d2877ad05d4659c4302bff8f7683954fe86c6a1df08b12f411fe4722e3833dd3111c39aa298bae0fecd46960d64f743f532562171f152dbeccd
+EBUILD automake-1.16.1-r2.ebuild 3372 BLAKE2B 06993c3331b79bdd9ae1bc26fd461021a14acebcea82481e7324a81b8188475cffd508e0372794b71eaa8e42ce8048692a2382e0329eef591259f535b0cafcc1 SHA512 72f09ea55a3422c736d380ae4f27e318b911a60bfc5dc3c01350fcd2f92991ab6ddf92464daffb6bb8f06ac4673c82639518fef637b9dbc61be7c9f14633da65
 EBUILD automake-1.4_p6-r2.ebuild 2471 BLAKE2B b950f7e76b9a2243f70da8089466fd181c8307f693568103b6a79452c70ebbc6b50110157f2915c29f3e6b9ef7b7ab2a016181784ebcaffb70602ba5cedf73ac SHA512 2a7b657da16fe2e04bf50e8114049b7df2ef4936e36cf79a5155a4e93d7a8d2225b0afdec1b5595ce9df1c1c6a15635d07e314911228a115bb8b0f60b6be775f
 EBUILD automake-1.5-r2.ebuild 2289 BLAKE2B 8c79660b2fb3d9d7fb3bd8cfe6c6adf8111af88f67e024e8d335d0fc13b091749ebca114ef56121a2dd7f2c71608dd8bad4cf56b1ddfb42380c3abb034557def SHA512 c443ac4458dc16c07208f3a93806b90da67338e7229016ae35a5696a7d6f56102c874ddfb990550b5cfbed78b1b567c164851b22c5c9718853c23d97d6a7e591
 EBUILD automake-1.6.3-r2.ebuild 2037 BLAKE2B ce129f375c762152271961ed31a7ce65256c897c90d5c7eee3d7ed2e91cc66f6bcd65e455dbe7b4c597683450f5e62df18ed791a593df6087c27e6e3a0ba140d SHA512 65f8216b4f73f4ef8a21b0908f68cc8ddc41164f9e53a1816f608d2af3d58edc0816bb8e81d46f7d248d911f911cbbba9db66a11b8f7256d54766d88fe08a472
 EBUILD automake-1.7.9-r3.ebuild 2192 BLAKE2B 0bb0d987c675660bd1d5eb69dd6c81cc8d82532380f330df4e7a1c49780a5ebf6cb7cb299cb30dc0b8f368e25d6f5902b32d3099fa115d46668e7fc939139c7a SHA512 bd650f892c870f7be1e406fe37b6e3b2fd503fe18380457529f27cca63bc7b7cd1b8ccdd2745b1ab42039a73166079ce0a2927517649da8d77dc925299478495
 EBUILD automake-1.8.5-r5.ebuild 2219 BLAKE2B f0dfc9668219d32a28b49bc755eadc2c19ab203477ae97bf768d74c406672356e8668806550e0deb62c4585b3f14ca8115678e25f31b49c76bc47ba75b1ba038 SHA512 1f4b3276146848ebebdda9e62bf4d7b365e29832da30736a92cce156b5831e594689d5a5396bf89aacfbf7fb13a0975dd568f654932720f18d3054bc4d1d26a7
 EBUILD automake-1.9.6-r5.ebuild 2567 BLAKE2B cd6c2db1c38a16206399d687bce1ed407496d1374431508a8c99c7be38d590c4e844e168660b01faf951c6bfd4acb8cb3b0418def0797f381969c1fb9cba4cc4 SHA512 42ab8ca19a382aae897c2cb09aad647aa4976b02d31a2a87db67cd575ca1429aa148103769b7371cba2312da3883e69859e530814ed4c9fdcfabba7fec39cff6
-EBUILD automake-9999.ebuild 3139 BLAKE2B 2b8ea5bcc254a874184b24b9839b42a9ee8b54089ed1083884f14d236ca4089b0b6fd06e0cfb6497bb8673fb37488f0ae76648b5205e7203d1ae2dab4968d92a SHA512 0b4c34e329bf1b407d5d420eac3f17be6ee12fe2a5baba30827a603b2d1eea9a0f051c3a6ff49c66cc52b17135e2444328623b7fba2198bc167fadd7b0f505e3
+EBUILD automake-9999.ebuild 3310 BLAKE2B 8a3eb55af28d35cf3121460f701b02248be05cfbf8ee7849fa14996f86084210582507412b27cadff105577c275f6487672d604716507de6af2fde8b66933994 SHA512 b497e612373a09b7c478174ce5a95504f5c76b3b609e58971ada998aa7d86a9d66c17aff638a167cee884239a10aba874b8c9a9e017300dd04fdca21eec15f9d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/automake/automake-1.16-r2.ebuild b/sys-devel/automake/automake-1.16.1-r2.ebuild
index d0738fdbefda..70e1fed3e379 100644
--- a/sys-devel/automake/automake-1.16-r2.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r2.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator
+inherit python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
+		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	else
-		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
 
 		# Alpha/beta releases are not distributed on the usual mirrors.
@@ -39,13 +39,15 @@ RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/gzip
 	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	test? ( ${PYTHON_DEPS} )
+"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch
-	"${FILESDIR}"/${PN}-1.16-fix-AM_PATH_PYTHON.patch
+	"${FILESDIR}"/automake-1.16.1-py3-compile.patch
 )
 
 pkg_setup() {
@@ -69,8 +71,8 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
-	rm -f dir || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -99,16 +101,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile=""${ED}"/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index 6932450d2cc3..9490f85d527a 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator
+inherit python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
 
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	if [[ ${PV/_beta} == ${PV} ]]; then
-		MY_P=${P}
+		MY_P="${P}"
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	else
-		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
 
 		# Alpha/beta releases are not distributed on the usual mirrors.
@@ -39,9 +39,12 @@ RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-11
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/gzip
 	sys-apps/help2man
-	test? ( ${PYTHON_DEPS} )"
+	test? ( ${PYTHON_DEPS} )
+"
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -64,8 +67,8 @@ src_prepare() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED%/}"/usr/share/info >/dev/null || die
-	rm -f dir || die
+	pushd "${ED}"/usr/share/info >/dev/null || die
+	rm dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -94,16 +97,23 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED%/}"/usr/share/aclocal/README || die
-	rmdir "${ED%/}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
-		"${ED%/}"/usr/bin/{aclocal,automake} \
-		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version
 	local x
 	for x in guess sub ; do
-		dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
 	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile=""${ED}"/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
 }
diff --git a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch b/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch
deleted file mode 100644
index 146496d6dfd3..000000000000
--- a/sys-devel/automake/files/automake-1.16-fix-AM_PATH_PYTHON.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-bug#30616: automake-1.16: aclocal is unable to process AM_PATH_PYTHON with variable as value
-
-http://lists.gnu.org/archive/html/bug-automake/2018-02/msg00012.html
-
---- a/m4/python.m4
-+++ b/m4/python.m4
-@@ -36,24 +36,12 @@ AC_DEFUN([AM_PATH_PYTHON],
-  [
-   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
-   dnl supported. (2.0 was released on October 16, 2000).
--  m4_define_default([am_py_min_ver], m4_ifval([$1], [$1], [2.0]))
--  dnl The arbitrary default maximum version.
--  m4_define_default([am_py_max_ver], [4.0])
--
-+  dnl FIXME: Remove the need to hard-code Python versions here.
-   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
--    [[python] \
--     dnl If we want some Python 2 versions (min version <= 2.7),
--     dnl also search for "python2".
--     m4_if(m4_version_compare(am_py_min_ver, [2.8]), [-1], [python2], []) \
--     [python3] \
--     dnl Construct a comma-separated list of interpreter names (python2.6,
--     dnl python2.7, etc). We only care about the first 3 characters of the
--     dnl version strings (major-dot-minor; not
--     dnl major-dot-minor-dot-bugfix[-dot-whatever])
--     m4_foreach([py_ver],
--       m4_esyscmd_s(seq -s[[", "]] -f["[[%.1f]]"] m4_substr(am_py_max_ver, [0], [3]) -0.1 m4_substr(am_py_min_ver, [0], [3])),
--       dnl Remove python2.8 and python2.9 since they will never exist
--       [m4_bmatch(py_ver, [2.[89]], [], [python]py_ver)])])
-+[python python2 python3 python3.9 python3.8 python3.7 python3.6 dnl
-+ python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 dnl
-+ python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
-+ python2.1 python2.0])
- 
-   AC_ARG_VAR([PYTHON], [the Python interpreter])
- 
diff --git a/sys-devel/automake/files/automake-1.16.1-py3-compile.patch b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
new file mode 100644
index 000000000000..bbb08454763e
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.1-py3-compile.patch
@@ -0,0 +1,61 @@
+From d3edb7e0f3a5553b1ed919e566ec8c41022251a2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 3 Nov 2019 11:51:19 +0100
+Subject: [PATCH] py-compile: Support -OO for py3.5+, and -O&-OO for pypy3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Michał Górny <mgorny@gentoo.org>
+---
+ lib/py-compile | 27 +++++++++++++++++++++++++--
+ 1 file changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/lib/py-compile b/lib/py-compile
+index 1a3f4d644..44be97fc4 100755
+--- a/lib/py-compile
++++ b/lib/py-compile
+@@ -140,7 +140,7 @@ $PYTHON -O -c "
+ import sys, os, py_compile, imp
+ 
+ # pypy does not use .pyo optimization
+-if hasattr(sys, 'pypy_translation_info'):
++if hasattr(sys, 'pypy_translation_info') and sys.hexversion < 0x03050000:
+     sys.exit(0)
+ 
+ files = '''$files'''
+@@ -154,7 +154,30 @@ for file in files.split():
+     sys.stdout.write(file)
+     sys.stdout.flush()
+     if hasattr(imp, 'get_tag'):
+-        py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
++        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
++    else:
++        py_compile.compile(filepath, filepath + 'o', path)
++sys.stdout.write('\n')" 2>/dev/null || :
++
++$PYTHON -OO -c "
++import sys, os, py_compile, imp
++
++# python<3.5 does not have split files for -O and -OO
++if sys.hexversion < 0x03050000:
++    sys.exit(0)
++
++files = '''$files'''
++sys.stdout.write('Byte-compiling python modules (-OO versions) ...\n')
++for file in files.split():
++    $pathtrans
++    $filetrans
++    if not os.path.exists(filepath) or not (len(filepath) >= 3
++                                            and filepath[-3:] == '.py'):
++	    continue
++    sys.stdout.write(file)
++    sys.stdout.flush()
++    if hasattr(imp, 'get_tag'):
++        py_compile.compile(filepath, imp.cache_from_source(filepath), path)
+     else:
+         py_compile.compile(filepath, filepath + 'o', path)
+ sys.stdout.write('\n')" 2>/dev/null || :
+-- 
+2.23.0
+
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index c1890f09c889..2e61f4935391 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -16,13 +16,16 @@ DIST binutils-2.31.1-patches-7.tar.xz 76828 BLAKE2B 354e7c3aa76c0cfe8fc6bb419a5b
 DIST binutils-2.31.1.tar.xz 20467996 BLAKE2B 6b914df1fbb7cf54f2159f71b2c2b09f3f6a569b7a3cb4cf9790d0a3733a7548bc0ea32334a178ed3b56e8b97656ae99c7abaf212601beeaeae9a0884c0f6051 SHA512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30
 DIST binutils-2.32-patches-2.tar.xz 145672 BLAKE2B 8218e621f99cb4bcd1638c3011449b94480d207eaeb79cf75c0072e0f1a86bfd1603fc4515bc40d3ac1921a18b9a211b20568f59b11b13eb44e6cff1329c5af9 SHA512 55c25a603f6175af3ade6848e5c1faba06a147d72e9a4f53d44502d97db76499485a67b278a654d18884714a7bf7b360c77c9e42dba3cdc188f805bfe461f09f
 DIST binutils-2.32.tar.xz 20774880 BLAKE2B d1bdbd9c8487c091665c197974ce4bdf520b7a67ed6997a81b87e6a0af9514a091458244f583acec5ae580ac2ee5e908f67f483b8e5263cd18ced794cb235da6 SHA512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a
+DIST binutils-2.33.1-patches-1.tar.xz 17944 BLAKE2B 811ad416fe9c059f645856a3123ed32303afe1d0f166a15cb6de0673b5494fdcc4c165da4a68eb7ab73f007618e3a97a5578c4b47de21e57fe501d6a21b6d595 SHA512 63b439637206d21e46d2b79383b38da2b28365a0fdea1f5ac3b665cd05e0b55cd1d7763c05567a5f7ae2c645d2ae639a27e465d535b928d9f8f0e6b94f31e1f7
+DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 EBUILD binutils-hppa64-2.26.1.ebuild 649 BLAKE2B 7634f79d45f03490a2c5f336fec707880792966bafc8ee07ebc0bf5102d2ba1be51a1a4123b415d6e5e28fee784fbb2fdb86d7cd68a873f941c67286f7edf779 SHA512 8174c2a92d336ecd685eab3a2680bcadd30d7d15205b441d179ade7d3f2e87862062115a45d7ab1e7ab8fe811530f47584ca34d2a2157c09be7468386bfa5d16
 EBUILD binutils-hppa64-2.27.ebuild 650 BLAKE2B 29e8b49ece3105c38b4ac8b12addfa8d157022d306fc014d12f07bf82fc126d8e3fb8655e5b6c74d273a497a203120e00bbd9374df03d06fd0524719aae0978e SHA512 bb28312060d697c45df0deba91c207c57a3ff88134fbfb7a666c3e41370b57004d1e48aca42f7df15e9c2c1f745f7a699b39e0e2a134690be9e24c29e0c9d724
 EBUILD binutils-hppa64-2.28.1.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa
 EBUILD binutils-hppa64-2.28.ebuild 650 BLAKE2B 6b0cf836068c33cbcb5a14a1e03e43cc834e6841c8284be1bfed50ad39d511782c619baea523eff58e10ca795183b7614da686b47e173e38fda5d6bba905d920 SHA512 b34d1385f1c9e1d607774ef073dcef0e0ee617e5f740459eb03fd2c007c7a168a690f763cd5332865a2b0aba22de59fad8950fffcdef2c6a79ab9ffdadf1b653
 EBUILD binutils-hppa64-2.29.1-r1.ebuild 647 BLAKE2B c17820e537f67c2a26af197ee7ebb75176b82db1aeab7d4f43325cee6a535760953ed365d11e30dec733c6364e035c96f07620e5aa8ab980be043473db759ba8 SHA512 7076225bc7f9dcd90b69459acd42d06b592225bceb967e9f1a9058cc35080ecf3201116520fdac8a4a063aff6c4eb42bd0185ccbdcbc3c6017e1e34af51da993
 EBUILD binutils-hppa64-2.29.ebuild 650 BLAKE2B d5fe2e9a8c5fc3d906838e6c0621329e0082d4705d222a2c4d513bcbaf4e5e6cc64582ea8a8e41ae1deda4d8651bc299892990dcf15670eb8fb5248ea9b8333f SHA512 7786209f9e2c4e1fa40ec08b8a4ff1c89d1471a2f438a7b750cb4067b19520a1a9b9be0c46396b2e0d0b9ad4c0f2d82cbacf4e77397661b04d49da45ebac70fa
-EBUILD binutils-hppa64-2.30-r4.ebuild 10860 BLAKE2B ad84a88ebe8268f180c1aaedae6f9bf14bffe1b1ae699e05f294c7602eb84731cb450c38918b5a5d1f0f5a6c980a39f2f54d2de6a26eb1340a014c3a874c3b13 SHA512 53edc88591545db03c95d7f308987fe6c4f139a8dbcf62e5c8563037682199593c6298267835a8611ed77dfd491e25fd586ecd31057f095e0adf03a7185f0341
-EBUILD binutils-hppa64-2.31.1-r6.ebuild 12531 BLAKE2B 35083cf1f8af275bc55ac9cdba798f2f89d9bc193ad28e21b0f37ec5fb692a8742f812597f29ae6929440ec9886da4850bf4578bb210e1c73457f8320fc033be SHA512 12daf4e9afdf2bac960bf8683e14e59e81481519c0f52f69dd8d7334d3d6d1a15098595652ad06d8d4ae30e80db6d93dbe762cff87a5617b2d4cf1c9ae5921f4
-EBUILD binutils-hppa64-2.32-r1.ebuild 12611 BLAKE2B 6adad759ab00657800b7a7f8d788815cb73dc2bae65af8d12936d7581d9727f41c4a5dc8384c56897caab873c3e53ad718ac4c12c6fbaba249c828379fa735e5 SHA512 fb422a650bf3ae7063eb5ff54c15e65ca0c33a6e7071a5eb7186e0ffe8f8edb59084032706d29847f11a18bdbddbb8d46b3dc0acf76ca8140d5926b86defb968
+EBUILD binutils-hppa64-2.30-r4.ebuild 10889 BLAKE2B 26363a034306faa1ef805ba80972f69d1eb847f0659cc3d1147f307ef5c28c9f4f9190a70897ae986b2fd1aceeb5bd0d1f9725244e648564723c41590912c74d SHA512 0436812017f5f6aed949cc9d127750d479fc56cf7092269195ba76e6dbbce694d4a94c8e9d84cd2d57a56e7bc2d05735e44517d3dd811c5204e9ae9472636dbe
+EBUILD binutils-hppa64-2.31.1-r6.ebuild 12559 BLAKE2B 4275ca5ecd87d37b3b9964e478fa2c64ca0bb6b462eb48eed366e573d39f686f600f4c2eb973e29ab9257ab99e81273e3c812258e513322b5cd71fdec9fbcb49 SHA512 9e07525616ffede0c496737c92d27f1f53858f5c140ace559add33048af1e2fdcbb92f2633db4ef5f70c2976d12db0d6bbfaabef01880c454af0bd8d7ace709d
+EBUILD binutils-hppa64-2.32-r1.ebuild 12639 BLAKE2B 018935093b8700fad374ed5b2c484d4563a6b01e1564dd0958806f81e5e85c63512eb7dd3baeb05185369f3f067b931cfe0afaf3af10e987a5bf4cde873e8d25 SHA512 27c755b55435db7ffac4cc79734ac92d4f9b6ae32d0f3adc6d082221a76f0e896dbae1ed90727a024183f9e838a9acee6888c5f354196afdb772a29ad1dc0282
+EBUILD binutils-hppa64-2.33.1.ebuild 12294 BLAKE2B 69482d483f56b43c63570bb69adb0d31222c30844abcbe20e29a7e89109ee87448fddca5bda920fc706963d965bc92cc68f66c2756f4fe3cafc60622d8d0f7d6 SHA512 a4fd81b00ab6b3a71df68bb85d206a4ba3654b99d92059891a5d84e492dd973771dd6fa30d82216d4a9698702eaa18a9b2a24a4a48ad4c6bc6cdf9c6bd11422b
 MISC metadata.xml 766 BLAKE2B e03336034fccf22a9cd0559a1a78bcc99f7cec05b7e526798e739a48589d50732d1664c6d9fcffe6defcd18840e612cba1a158e557785423d4834c2c54183579 SHA512 ea6c1bc005fecf24c4673f623b6d21ded664e5999720c6b74ad2a3654c40a274c9003a2a44dd402de3317a1d3d4450bc1d3c74683b3a98557363d62e21043e04
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild
index d4e225fa71d0..400a9dd6eaad 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,6 +73,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
+
+RESTRICT="!test? ( test )"
+
 if is_cross ; then
 	# The build assumes the host has libiberty and such when cross-compiling
 	# its build tools.  We should probably make binutils itself build a local
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild
index 79a2e1f7bd4a..0d7844e47004 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 S=${WORKDIR}/${P/-hppa64/}
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
index e2366d3c123f..9cea689fb6a9 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
@@ -86,6 +86,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 S=${WORKDIR}/${P/-hppa64/}
 
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
new file mode 100644
index 000000000000..9c1e764963b4
--- /dev/null
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
@@ -0,0 +1,438 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CTARGET=hppa64-${CHOST#*-}
+
+inherit eutils libtool flag-o-matic gnuconfig multilib
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="GPL-3+"
+IUSE="default-gold doc +gold multitarget +nls +plugins static-libs test"
+REQUIRED_USE="default-gold? ( gold )"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+
+PATCH_VER=1
+PATCH_DEV=dilfridge
+
+case ${PV} in
+	9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		SLOT=${PV}
+		;;
+	*.9999)
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		EGIT_BRANCH=$(ver_cut 1-2)
+		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
+		SLOT=$(ver_cut 1-2)
+		;;
+	*)
+		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="-* ~hppa"
+		;;
+esac
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
+PATCH_DEV=${PATCH_DEV:-slyfox}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	doc? ( sys-apps/texinfo )
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+
+RESTRICT="!test? ( test )"
+
+MY_BUILDDIR=${WORKDIR}/build
+S=${WORKDIR}/${P/-hppa64/}
+
+src_unpack() {
+	case ${PV} in
+		*9999)
+			git-r3_src_unpack
+			;;
+		*)
+			;;
+	esac
+	default
+	mkdir -p "${MY_BUILDDIR}"
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		einfo "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${PV}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
+	if is_cross ; then
+		TOOLPATH=/usr/${CHOST}/${CTARGET}
+	else
+		TOOLPATH=/usr/${CTARGET}
+	fi
+	BINPATH=${TOOLPATH}/binutils-bin/${PV}
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	if use plugins ; then
+		myconf+=( --enable-plugins )
+	fi
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use gold ; then
+		myconf+=( --enable-gold )
+		if use default-gold; then
+			myconf+=( --enable-gold=default )
+		fi
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	# mips can't do hash-style=gnu ...
+	if [[ $(tc-arch) != mips ]] ; then
+		myconf+=( --enable-default-hash-style=gnu )
+	fi
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--datarootdir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+		# Change SONAME to avoid conflict across
+		# {native,cross}/binutils, binutils-libs. #666100
+		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running if doc is unset.
+	if ! use doc ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake tooldir="${EPREFIX}${TOOLPATH}" all
+
+	# only build info pages if the user wants them
+	if use doc ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+	# bug 637066
+	filter-flags -Wall -Wreturn-type
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	# see Note [tooldir hack for ldscripts]
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${PV} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}" || die
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${PV}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${PV}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# the hppa64 hack; this should go into 9999 as a PN-conditional
+	# tweak the default fake list a little bit
+	cd "${D}"/etc/env.d/binutils
+	sed -i '/FAKE_TARGETS=/s:"$: hppa64-linux":' ${CTARGET}-${PV} || die
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${PV}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+		binutils-config ${CTARGET}-${PV}
+	fi
+}
+# Note [slotting support]
+# -----------------------
+# Gentoo's layout for binutils files is non-standard as Gentoo
+# supports slotted installation for binutils. Many tools
+# still expect binutils to reside in known locations.
+# binutils-config package restores symlinks into known locations,
+# like:
+#    /usr/bin/${CTARGET}-<tool>
+#    /usr/bin/${CHOST}/${CTARGET}/lib/ldscrips
+#    /usr/include/
+#
+# Note [tooldir hack for ldscripts]
+# ---------------------------------
+# Build system does not allow ./configure to tweak every location
+# we need for slotting binutils hence all the shuffling in
+# src_install(). This note is about SCRIPTDIR define handling.
+#
+# SCRIPTDIR defines 'ldscripts/' directory location. SCRIPTDIR value
+# is set at build-time in ld/Makefile.am as: 'scriptdir = $(tooldir)/lib'
+# and hardcoded as -DSCRIPTDIR='"$(scriptdir)"' at compile time.
+# Thus we can't just move files around after compilation finished.
+#
+# Our goal is the following:
+# - at build-time set scriptdir to point to symlinked location:
+#   ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
+# - at install-time set scriptdir to point to slotted location:
+#   ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index c03912bd2256..44e1de1243fa 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -21,9 +21,9 @@ EBUILD binutils-2.26.1.ebuild 258 BLAKE2B 404f3410d09218c9601956568f3b47006782b4
 EBUILD binutils-2.27-r1.ebuild 271 BLAKE2B aced51a4a2c90f0272943d96f18b0119b98942c052f3f85897a4dce966473b5fa0204fae934f74f161086678cb5e2bc7e97421f7f9c9522a9db32c86abddbc06 SHA512 7b810f0ad3d51ae264d3a6887c6ec48c782c722c44c599c4928345cca793e4760aca8b30657c502540e81027eda9dbd5ed754d29cac4ebd33023684ade2f42df
 EBUILD binutils-2.28.1.ebuild 258 BLAKE2B 404f3410d09218c9601956568f3b47006782b4a7c6381277b43f7567822a9ad8f3be057f05e158fd8eced075e518b9d3f6f6db0af714990dd0d95bbc413ff9f9 SHA512 20ac1a4f721ebf8505096522a9c5d7115c8299942e9ded9efb0dc5c00664d2a7fc1fc90a9daf28555334de504a5a642c9080911bca00f83c819ba37d2bd3ab33
 EBUILD binutils-2.29.1-r1.ebuild 306 BLAKE2B 580c086c26214234bdd84dc8d8d6d3931a5dc735dbd9354a6e0e5cf733fd9a0d32040d45e5209905fbb6956976aa8a94c82d5a22b9feb7ed05876af9c9b1fd36 SHA512 509208007e7facd16a240059487ff1e6ae90cda97c3c7e19eecdb98ea275a6b6ded091e653d3b59e3eb46206ff52402f31e20f047a21f065e8a764ede4b10d60
-EBUILD binutils-2.30-r4.ebuild 12001 BLAKE2B 60ea7cddfbc33a0d6273d7593ad44bd10ed2ffe9ff6a5308e381cc39bc2c81c3f25bbdeebe43f76e298f9088a915a653d0473ede73db8beb4cb8d5d6c6d6cbb9 SHA512 4a518fe12d78e6a68efe0907b53f183fc9bcd6f511a9b6cf93da6f767a49e83f45e9b1d27ec576e7204a886be4e62b9920863db0c903a824b5f38a39b6dab39a
-EBUILD binutils-2.31.1-r6.ebuild 12396 BLAKE2B 587d923630e1916f016c0d8b4bf57bf3d937cffdfd017f1846bd6590b0438258b874fd52e07b77362ee19615a6e73086436349a891ebbae3dc2a14b1e483d65a SHA512 259c76d7e4f5a518cf69cb0e2b2ed6f928cb84f6e8dffcf7782f9822c803caf2afafcc906c2558232330a1f478c9a66ef02e80338fae2c8033afc749d67d2632
-EBUILD binutils-2.32-r1.ebuild 12601 BLAKE2B 3a74a49c0e7ac48238f32dcefa371fbae58f8ca1f91fe7a155be4831d92709fe9ffeb648e736058159009ad998dcaa5bf05790e12964693f19c9e5d7764c32f1 SHA512 3d97253e2610adcec100b241376695f610b7667e3064fd87bbad14a6348c5d705bb9455fd0d2066f97ad95dd8c9dc795bcc0694221b5db112931d246d92aad2d
-EBUILD binutils-2.33.1.ebuild 12150 BLAKE2B e065676b99e6fdbba69ea35570d7aaead43c770cc8313bae4ac79c66d5175715d898084e29c2ef81871dd076c8541a8bd173d625b812ac5caf9075239e91718e SHA512 62ceb5bda8c47f13118770dac79f7ab10710a69ed47b68dba9fcd6cd6ab66cdbcfac896034a5a509e22bfbc868f9208f901f5853af6042603ea861d2a6387549
-EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
+EBUILD binutils-2.30-r4.ebuild 12030 BLAKE2B 30e8eb885e513a4b40e4f0fec25a1c49f06783771c6fe74cc72a1919888a37ec2a685ff33e977d907cdb0994412c59da9c2fb2f3d59179956b420df3e8770758 SHA512 4d6a5866cb16ee507941952d359389cca20a48be11170c64317d95465bca266de668c21affeb1efaa324b078ab87ecbbffe985a5000bd5aab5c8c37f93507596
+EBUILD binutils-2.31.1-r6.ebuild 12424 BLAKE2B 2fa38709c37a29a7707ad91dddcbc3d93731cd8264e3d535b1b59f703909c25e7ff9d35cb00ea5293a95b96778b923a0177be390cb832f37f792ead5ca43005f SHA512 92ec10bcad598a658fa5ede285eb783d9ee319e8ac7f3747ac56d419da8811837aa9c3d0bcde6d062eb1f6750b978060374932781951bc39d1269ade6289c6db
+EBUILD binutils-2.32-r1.ebuild 12629 BLAKE2B 4a96079b725ca559c3fdc60bb93676bc77f2249a7d13f3712cd42508f164ec3ca3b9bf4044e3407132d8c3724d1cc378f92eaaa22d5041ca68bb6b0829fb2c93 SHA512 43abd93ed7c10ffbd69789e8f7bc2c30fa8d7ccfe3d838f9dfb00a09c523df8eedeafd2b379c64bd00415facfea9a9c30e3a993b5b31030dafbfa5d8656711da
+EBUILD binutils-2.33.1.ebuild 12107 BLAKE2B d822330a66a8db0c3c3ef00b349893c210132d5062f7999784e838337b815f88776b8f7225a0f6c4f0404b0be258ab79746d51af9b79b61aee6b7d18a18d2679 SHA512 b9326503a0ceaec24d020c31f9273ec0c2d9f390efc71d1ee719ac03565003b688d00c589869477a5b1b1b46cf387d427f7e0d83e49d8648182b05bfde51d99f
+EBUILD binutils-9999.ebuild 12128 BLAKE2B 63ad9c9609f0a9c56cb6c30e05dac531ddaa1eafbe3b50361d581d8096266b12b47fe92e5b5fff75423bb45bfc2f93136e852ffff851e47b7fa9fbf959f6e80d SHA512 05e170f9d5b298542ab2882df22e8847a2ea5ddbb6c3218e1636c5e0ce5bdc2d6c670651222645f32a7e5248c44796a0068093dc3efe8b0432afdd2eb2cc8586
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild
index a64424ccd022..e57b8ed86e04 100644
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -71,6 +71,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/yacc
 "
+
+RESTRICT="!test? ( test )"
+
 if is_cross ; then
 	# The build assumes the host has libiberty and such when cross-compiling
 	# its build tools.  We should probably make binutils itself build a local
diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
index 511d497ac38e..537b7b8ea786 100644
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index ac19c27ce3ed..682714c5e9d1 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
diff --git a/sys-devel/binutils/binutils-2.33.1.ebuild b/sys-devel/binutils/binutils-2.33.1.ebuild
index e4e5fd60e822..9a1640aa4078 100644
--- a/sys-devel/binutils/binutils-2.33.1.ebuild
+++ b/sys-devel/binutils/binutils-2.33.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+inherit eutils libtool flag-o-matic gnuconfig multilib
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
@@ -21,7 +21,6 @@ REQUIRED_USE="default-gold? ( gold )"
 
 PATCH_VER=1
 PATCH_DEV=dilfridge
-PATCH_BINUTILS_VER=2.33.1
 
 case ${PV} in
 	9999)
@@ -36,13 +35,14 @@ case ${PV} in
 		inherit git-r3
 		S=${WORKDIR}/binutils
 		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
+		EGIT_BRANCH=$(ver_cut 1-2)
 		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
+		SLOT=$(ver_cut 1-2)
 		;;
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
+		SLOT=$(ver_cut 1-2)
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 		;;
 esac
 
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
@@ -285,8 +287,7 @@ src_test() {
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
-	# enable verbose test run and result logging
-	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
+	emake -k check
 }
 
 src_install() {
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index ac40bd24d645..ffc9ebbec142 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+inherit eutils libtool flag-o-matic gnuconfig multilib
 
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
@@ -35,13 +35,15 @@ case ${PV} in
 		inherit git-r3
 		S=${WORKDIR}/binutils
 		EGIT_CHECKOUT_DIR=${S}
-		EGIT_BRANCH=$(get_version_component_range 1-2)
+		EGIT_BRANCH=$(ver_cut 1-2)
 		EGIT_BRANCH="binutils-${EGIT_BRANCH/./_}-branch"
-		SLOT=$(get_version_component_range 1-2)
+		SLOT=$(ver_cut 1-2)
 		;;
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
-		SLOT=$(get_version_component_range 1-2)
+		SLOT=$(ver_cut 1-2)
+		# live ebuild
+		#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 		;;
 esac
 
@@ -80,6 +82,8 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 "
 
+RESTRICT="!test? ( test )"
+
 MY_BUILDDIR=${WORKDIR}/build
 
 src_unpack() {
@@ -284,8 +288,7 @@ src_test() {
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
-	# enable verbose test run and result logging
-	emake -k check RUNTESTFLAGS='-a -v' VERBOSE=1
+	emake -k check
 }
 
 src_install() {
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index d2914a5d8733..ac45e3324250 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -13,4 +13,4 @@ DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7
 DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
 EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13232 BLAKE2B ab895bb980a39ea7a509f8f9dd189a08a019ebd75b1ac5f177ed0fd5ab0be364322e9e3b0b1a60d514198016bf77fc3ea932f6912bccdad72a6899a720541c83 SHA512 2058c8ed2e068e1002601db46f988a9b7a5ebaecf12fa76308978b68a99f91e5e8ec1290f44732ce505276a854e28c6dc6a7f6dae1f52a84c04443ac67ff8ae3
-MISC metadata.xml 645 BLAKE2B f9b6b59b24ac5dc62a64cd92be9270adc2112bb09a874c2be8a71bfb0c88089e17f34be149dd98bdd0c50b1fe49749e145290ab7ef116ee21105c70c6354683f SHA512 f83813ee85776c56c45cb6acc0d0c55cae9e63e4df48d5a44143e252ad23431f7d46d1c7074964096990e23f5b9651834a19a9576d4b11ada67b3d9ad2ba21a7
+MISC metadata.xml 538 BLAKE2B 4bde5ad30e15d0d273ed689cc6b703097c168c6494a1afa076450b1fd62a5fc80652092fe36758d6f4866c93ea5f4b6dd778bc8c8924cd082eadf298f909398d SHA512 7713b42bb9824ba9c99382cc403635e1e7ba65cd6ca3a6933ad360a19d27512a1e80cafd3fbd980a7b3bce1dcd7f018b32580b0f471155803792fb1e4f2edb69
diff --git a/sys-devel/gcc-apple/metadata.xml b/sys-devel/gcc-apple/metadata.xml
index e6297d1298f3..77e886c0ba4d 100644
--- a/sys-devel/gcc-apple/metadata.xml
+++ b/sys-devel/gcc-apple/metadata.xml
@@ -9,6 +9,5 @@
     <flag name="bootstrap">!DO NOT SET THIS FLAG YOURSELF! avoids need for autoconf during bootstrap stage2</flag>
     <flag name="objc">Build support for the Objective C code language</flag>
     <flag name="objc++">Build support for the Objective C++ language</flag>
-    <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index faf0ea9b5cc9..3b20f7fdab30 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -27,26 +27,26 @@ DIST gcc-3.3.6.tar.bz2 23972413 BLAKE2B e7b33edcdbbb13b0be41a41156bf6fb6dcfe4f5a
 DIST gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923 BLAKE2B 174eb5e437367a8e64a48f3764b4a3971afc7f5bffac583b7cf4e98a2ea2241ff896751137cc59d45a12b12333319efd52094925ba175073fe70dc143a5ea7fa SHA512 c0534a374e2e0416d0792373f9d11526226f9ce1a98e771469efa68388b709c72672b8db8fe77901144a96a23e4fd9f9a99f1d278f1e8fffda8a6b01e3b770fa
 DIST gcc-3.4.6-patches-3.tar.bz2 62100 BLAKE2B 9d3c2ba5095066ef0eda55e80f2ff62da13c41e7b38193439f29e127004c487de810b5975c585d5944888b5edde7fe24ed8adcfccfc8af24e4fe40799d4e8c8d SHA512 6f68e29ec86d5e3921348be2c5a9eb79e01a5169c20224a9b53fdec5e02a10cb687728677ba9440bf48219f1b9fbd92c0ce72e371f6b16828912e9f72cd8433d
 DIST gcc-3.4.6.tar.bz2 28193401 BLAKE2B b3e2d52269e59acbdb04248d8d95bee957da29722f998ef39731b8f4fe9ce29ab6b29020be440d7d5db2b56f93fa77bc7e56f979912d03ebb755a92ab14927c9 SHA512 d235e1223d5faf8f37f2d73db35edeff44c88974b09dfcf325f4b181b16d7124710d93b1b65b60206ce3525f062236ea0f338b3a5341d7ecbe196d8e90c3ff18
-DIST gcc-4.0.4-patches-1.5.tar.bz2 43777 BLAKE2B 9bd12a707b9721336fa2443d73898df4712a8b81ffc5b7e18b611663f642f6e815d6d6c4583791fee87d36e56dccfd5b364119bfa98bd80cb3e35f20f989c80d SHA512 dc9074fa7861c9efd4bb8a4118551377c88e27f2f2e7ea95fc3c75b3992ab55996afd8606570c795e85e73c9d1e2179f261b6c5d470ce778fec8fec3a74905ea
+DIST gcc-4.0.4-patches-2.tar.bz2 43785 BLAKE2B a2815fd8ff53332c93e14308e1b7d19010e74fac197998005d741bb9ddb646f7aa6b028e4f12c88c87df5eff2f540e96f06577c20c82b93a58015d4ba22f3713 SHA512 f2975fe419313158586157fd81ce35c3d599d1718578ec0e48460e6ddbc08870da78fd4c4bece0518b2f1aafe2f6738c87d74f4eba743490f3a4297d19318630
 DIST gcc-4.0.4-uclibc-patches-1.0.tar.bz2 20164 BLAKE2B d2d9626f03bcf0b06f316f22f2d4ea71ba0721d8369ff914bb27e20c4423a2a5b511bb23e74d2efc247ecc9c0554144a7ebd16d8baf432e289226ef610bef978 SHA512 67bdb8be3b7d173795ae3692f8f76fb6c236bfe3054112db30e3f0a56982685fe0b15e2c37f7d9e15e6198e4a41e47e1434a2befeee4e9e460e7bc9e0fa9d235
 DIST gcc-4.0.4.tar.bz2 32642939 BLAKE2B a152e6183bb288e587f1e6ad21401de5ce21f871aa4f82344bf76af4518d3286d281770754fd5744a9c0a86bd656be8bce88aa72380e42c438271e1f471c4d8e SHA512 194c12b5a1bc50c003f6fc849a4c0032388a960fb4b769bdb6e76cf330f04f880a0723661c991ec03742443c21ccba9af8599ae648a0777e0a5875c5fe7f6abd
 DIST gcc-4.1.2-patches-2.tar.bz2 56296 BLAKE2B 1b7660dc55ce36158f0715c0e277621deb2dbf45bdcb15a723e8c75038c1591cab64864d8a8cde62b443933b6212703996895a98619506437eb185b9f866e4a4 SHA512 c61b0251c8826be34a6688924f61a4318ffc20fe22a7aaee98db69aa84e29f90c2e1eb8c78961f8d6b4d610478c242d3fc1b74642e6e3661b102acea1f1f6e14
 DIST gcc-4.1.2-uclibc-patches-1.0.tar.bz2 20980 BLAKE2B cfc7dd4c7a0b1ed80c491d4ad56b05b05ff308fdbed2faa1b9f15b10c0f7834ee4ffcb0df1619f959f7a1a5f315305b550665c232404a8a3306e3e615539a0c8 SHA512 57789f4236a3085136afa83be3cef677bd813afd258d67bfdbecd2058f497cd459366d5515044c0208ab753946dc951dac6a3889752ca6dae836d837c22ce33b
 DIST gcc-4.1.2.tar.bz2 39707720 BLAKE2B 966b6a64c118456c7fb66eb2ad0dd84b1d53ad88dcbd146f446ef097a6975f5d6a7f1bcbbc4bfcd4e48b00eeb8054728e412db3d9818cff1f195e37859a4e510 SHA512 b97d3b72a3b0355611d5090b2c715b7a774f0e466a89326a0226c2809d12dfafb2d7c5a7af54bd5e00c135bbb6596f535e1a484740f7f1f691e8a57e6f0425cc
-DIST gcc-4.2.4-patches-1.6.tar.bz2 27554 BLAKE2B 1b6cf76ec6f0cd17d1078f6586124d6da5b3217f30300970bbcedc024d319fb5768b3a24ba6e366fbd9818f5c973916e7eb77858a6fc3609239f509cfab68196 SHA512 f4b1946429216dc381639e36197e6de8993cd19d3dfa47c52c5383980a3d7eee3613e3cf121609e5ed31dfb466fb97978e4c53240c6135d9babc9e2edb8aaff1
+DIST gcc-4.2.4-patches-2.tar.bz2 27511 BLAKE2B 9d4b84d2f0032d99264eb684f56dace3b354112f8265881e1c40707cfbc10c9488662048bcd515f45561118a91472369e2be17ca93cd0560a951739714fd9143 SHA512 26fc63ec19848b6e1ff776622d6066144315a6e0a051e84c38129f684002578b3590b4d8e3b84dd2f4d83209abc14db5b2dd56938b8c8b9e2f48152314ea0a6f
 DIST gcc-4.2.4-uclibc-patches-1.0.tar.bz2 19167 BLAKE2B bf2bcc9ece9096cf7fda9999c56073774072fa03e5dbf389a617888b2269bc79a7cfb68a6e26da66dedce9f954a1766ed21bbdd907b747e9fb5ea3a0fbbb6474 SHA512 5545cfe6bfa7ab9a69a474cc051cc8744380077dcc193afefeb455e959e408a5e4dfd1adde5357886c7f598835400273ef80ad5c14976c0552b44f5cd48704ed
 DIST gcc-4.2.4.tar.bz2 44025458 BLAKE2B 1d9645298dbbb1aba7b2957acf5b9839bd702a85120aa82d4cada0e4ea68a1d633422d8fcedc405504768e2f932e4b9d1a70a86da0b8efa5fc923b786ebc259f SHA512 c6e3e4fce1d27d0c56ab24f4809367d9329b620b7c124e88de190f2ea2ae57b5e06d0bda85c5a74237a4f94ddba53dc91faea0611fff7b19ad720edc312cb0d9
-DIST gcc-4.3.6-patches-1.4.tar.bz2 79026 BLAKE2B fd7597483095afa114ab4df18134d3f00882c1476ae30b7aa531dffdca111599e811a451466fa981d0f94eb29a04cd784a36aaab4bd365ad522eac44e5aa5c0c SHA512 4f19a6221c520d62a4ab8731afb76c20d9dcca7b0cf6e52011b30fef013fc21fdf30c619a4bf959a344e9a6849459e9bb25ee204dc1b7d757e87a647ddd1f3c5
+DIST gcc-4.3.6-patches-2.tar.bz2 78999 BLAKE2B d84440508462ae82f40fbe6bd8c44dbacd25ca32fe312e15611884d5de31bcb480c6c8894bea3ad909f4cd23fb86c64f4a1bcbc0483e3a1a3d17c6c13d40d46e SHA512 20d23132ed62dbdd8138a617b185d57e7209f4aa00f000e14f311c399db8345c43ae63fa9d3ac266fbd656c4d6f36a7242e1791046cb955398ede186285e238f
 DIST gcc-4.3.6-uclibc-patches-1.0.tar.bz2 3021 BLAKE2B c3b18a85253fc7b63e2f1fa541ce2c9bbe0c664fb5da8d494c89889d19aaebf513c40cabdf3271e3d074aace500bcde4f0ba4478c35ae0ae105b4a31d6e4e917 SHA512 6b85bf4caf5662ae114e472199c2f77d1fef63c485c073643968b6e0575c13bfa4ce9a32191908f34e70d41fd9fb5b9bc2b527542d82dac881a0462bfe89b120
 DIST gcc-4.3.6.tar.bz2 59756702 BLAKE2B 0bca01c8c2e7d8dc2f971c2b2bfb52d61285154c3fd14d6356a1cf083622aadadd9031bf0aead9a285eb1c4200c2d9515773c256acbdc901842aa16e06cc81e7 SHA512 0cb43f523135c6d54b3b5e26de7044fe096c16e7c3af8e400b2b48c5e52b4b5aa56615b1eca5e326b0202cf34870daa6ac44ec9633762acafa4425552b4029ee
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
-DIST gcc-4.4.7-patches-1.5.tar.bz2 27790 BLAKE2B 1598fc1eb320db2ddadff01b3bd8110cab2d838dec75ef1bbaa7465bfdbc69ce5c55cda2bce059f115418bd4506187b62e8eb020237710b1f61468892a43627f SHA512 8420aad5def3c58c75ed955b0d198c2b7d4f0ddeabbad0a83269a1d5078b9240d90a7a272cf0f23f1654cf1058a8e0c9cff29b22c74328b20b9a1e5c19f871a7
+DIST gcc-4.4.7-patches-2.tar.bz2 27816 BLAKE2B 59a1ebc7e4f4a8db0a8e3f123aa8f8c41c7b166311bf3a0208ddef46d0cefca041a68ec1987df9e001f676459da76e6a39486f2071541d1c6cb6cad176b76365 SHA512 8a9364b0e0a5b48f9cb11e749a9261f5fa29679af57a52eea3970201e1be926039967d889bde4244e09fd8c606f308ce247589fc98bbb714577159f4b887b18c
 DIST gcc-4.4.7-uclibc-patches-1.0.tar.bz2 3016 BLAKE2B cced59dc8f03a2f8bce7f95c5028164b41189b2272ae6a0d525241dd24df827292dda39b1bd9b4d6c0741be0ff0eb4df62d7c6aadf54d54c2bf64f268c68988f SHA512 46a69cb8e2e3b97116d012b95a515953b2629be04228a2ac90fe628705e6bc3bdf05ee22e3ed7d5fd0fe6e60aad8f1f96f36e8dd3b231bdfd048e61c6cc15beb
 DIST gcc-4.4.7.tar.bz2 63179340 BLAKE2B e01c90907228572c3d25bbb776c8232fa3f8e8f4112a27f69be2bad8eec50b68add39839f8d5726f5f82491f50e71fa1b44d98b60a3e0f145848a0e0e8760700 SHA512 5562a7319cfd8cc7c5261de9170f2cda86cbd3a231a444a5ec0ad3d8fd60af6f8bd86af8f201cebb7bddcd083d761834d1cbd652c68af0f5607d22a63439ed0e
-DIST gcc-4.5.4-patches-1.5.tar.bz2 22794 BLAKE2B 8a3a774c68ec37191199d4cc65f18bba55cfae8c5e715485a0950ce43ec6c96f705277460cb28ee8a70f73d9f30d9f06bab53d2e22d2b35bad009d785a0520b6 SHA512 d59857083c41456190adb350d563fe4bb649c4c50cc9a841bbf63ec03be53ee3de5ef3e6720206e7e51184d98453f3163cc267ba71e4fc06b22f44323ca87585
+DIST gcc-4.5.4-patches-2.tar.bz2 22782 BLAKE2B 8934812b03b4ad41674fc66f3e67d1d7582bb53ea480b57950b12b9a02653da01e919b069b9509d4502e86adbb510e446a13e44ebc118caa9d7448e5632e4793 SHA512 4d6b54c5a6747756e2cf2c8ddbcc295156de0e5229709b29638312b68f7da9e32e4d3a5840068faae821024759990313ba0aa491b31ef1dee9b60faf76e9ec77
 DIST gcc-4.5.4-uclibc-patches-1.0.tar.bz2 3019 BLAKE2B abf53f85a4af1336437963595b04d2c24284ebf7cc76d845bc3502cf54ef2dcfc21f76fda336f99165cc9939daa8b8c8dc9493c276879670a3cd0ac0efe526da SHA512 b6aa0a7d029a2a00b36fe8906d76b434fcdfc7191cbc8fffbcb8b89a66eba61ba6cd0cfdba94a79929487fbbad2163083b085476498f8be77ad473d078b0095a
 DIST gcc-4.5.4.tar.bz2 66426133 BLAKE2B 8725c7868e1fc9e72a28635f39aa014681aa502db4687e5d2d6ec7cf6d30b04902eca2ebbc1ef2b0e20b89908424d0053f0958e24ded5366fa1c38469913caa2 SHA512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115
-DIST gcc-4.6.4-patches-1.5.tar.bz2 19017 BLAKE2B e2e9642ef97b126df48b480b7a84d47597686932cd3447f3b210518d5eddfe4d90521a6249f174e4480315a924c48cf98c2a2bf0e383eeddc6d1d75770f2da2e SHA512 f609e71514db89d51fb5047ca12cd0d1dbe352a0047d7ca744115df3ae7c0c61ba8f72b2642080267a549b1c7fad65f728f49a50d00f6796042dafc655de10ea
+DIST gcc-4.6.4-patches-2.tar.bz2 19007 BLAKE2B 02e2de43d2ff52c16dc19bdb986b9938b188adc806b1cd540dc58747e9717d803c018649f1fe696d488cada7f44c498d754a6db19adab4ee06016fe70a7a8e4b SHA512 848e748bf679970d749e8e5b2a073cfb1b82ce49bbf7a24ffa9100ce93d357f4aadb8709cff3ba49827a1f31573dd212067b1fc841b3a078e3803e17ca03e207
 DIST gcc-4.6.4-uclibc-patches-1.0.tar.bz2 3010 BLAKE2B e841db5125638b0ec34323d0500786ab6577042a22af3b423433542164408199ac4ff1036d27999aa01aa96e9e50988df2e86835102142f74c3f8fb33096a47e SHA512 fd289089a30c768b0ec4e3459cf494bc5e9d4ecf87056dc183277c712f7d69ac4cf900950270d8eacfe686b4aa906e1ece87cae52f2cb00642e96c0b95dcf133
 DIST gcc-4.6.4.tar.bz2 72006076 BLAKE2B 321c14c097c18cf60c32d228720980717e25e22e26ce5e75c3a411c423f9657eb896974200664132e2fb10c3010c5136d2da7f3c916fffddf7e4afe4e8bfdc20 SHA512 b5a5395782e0b9e61cda052f6e00c8575d1aa0b7e8db9e34c06e4e45f12ff37b436018536b7fa69a04a4235b5b368895652e3ed8fab2fe11763f9782ed9161dc
 DIST gcc-4.7.4-patches-1.6.tar.bz2 20746 BLAKE2B 56687d1788b2a6484fd52dbfffef77f19f3182a38d90ccd24f8df6fbe5daeb3b27176cf01de7ce3723e79b427cd3cc77e06e690e13e8271a0a5067c20117c273 SHA512 4ad9a08f1c9b21b3d9f069346ca752bb9772b9826d3cc50abb9a1cc2b916c208d6a715efdfe3602d5a3f08b6c058e5bfb43f87248b7a09d8b0fc39e2403580bc
@@ -84,21 +84,23 @@ DIST gcc-8.2.0-patches-1.7.tar.bz2 18166 BLAKE2B 2aff918d253d76c9b7d76b2d82e85c4
 DIST gcc-8.2.0.tar.xz 63460876 BLAKE2B c5372b0bdfcd2729577dca287b294623b78c583491998404eb307768c573618bdaaedb7d9ae0e39ba41a62a14b9525dff0e3083285754b7f5bb9987ecf635185 SHA512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed
 DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
 DIST gcc-8.3.0-patches-2.tar.bz2 16741 BLAKE2B b3db1b94749cb8a04cce8637429e15eda369ec741f236d8322716dcfae6db1dc9479dd4d7715aeb357a0b3106c7f23fd33eba466a041b8e2e0e57b6cb858786f SHA512 13a85ddf76563241973e061ba157942c81391d0b867c66f88da1ad66a79d99ccdd6bc324caca31eb31057c2d27ece89f6546d723a420b3af319c6865337321f1
+DIST gcc-8.3.0-patches-3.tar.bz2 15944 BLAKE2B f1ae61be794123f34ca88c279bfe33abadd37eea0ca0267ac9c0c77707dc8305063a7ecc2e23511c281f7e903dff349fef016d3fbbf3237acf383fe1639d4b7b SHA512 f43d86a55c932df4a494c6b687101a2992b91b1a4e01677165ed0f04de6108150ef713762f71d0ef764dbd4bad97a99d15fcb42c23e4bb42d83a866ff2d0c614
 DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-9.1.0-patches-1.1.tar.bz2 13931 BLAKE2B 55e863514f41f1af11b1f6f618604edf7f173b4c4ef8df1301ccaf4577355ed03a34b04ab50a6cf4e50317b7f047f279e4212215b183d0642f138ee5163f655d SHA512 ab850bd38902c52586fc84dd1b2da31bab857412db08dce96642f17f213c95bae029bb1be5e0ac4bb12e55f863ecfc2ccda67635e8bc7b54383b2813642d991d
 DIST gcc-9.1.0.tar.xz 70546856 BLAKE2B 0f7e5575aebc24113d12a56eb3dbf4bcdba3c656a76513c44dbbcded9ee71629727f24949bf2e1424682a9e5eda7c51eed93317e6f80013f5a837aaf25b82805 SHA512 b6134df027e734cee5395afd739fcfa4ea319a6017d662e54e89df927dea19d3fff7a6e35d676685383034e3db01c9d0b653f63574c274eeb15a2cb0bc7a1f28
 DIST gcc-9.2.0-patches-2.tar.bz2 15479 BLAKE2B 14d0b0c903b3fe3d788fb4e41f5dc01949ca30fae03894699b859f02e383ba624dfce38784f3bec4f398395226abe0d4e6e39a265b29708bd86815d87c43da66 SHA512 ec39741a5ceb80d073a749be86985f7a0d5dc45246cf7e43721bc17691aac621cd9f1ad20cd9cbdeeed05d73adfa4fe9b6732b932350ea39e64a53dc2d18bad3
+DIST gcc-9.2.0-patches-3.tar.bz2 15452 BLAKE2B 8ebd8beef1a7d3b0e0e544a0967599e9a06662092e9f4626e071051c3dbbbfd9b74fcc1bcec6405960a50133d741906f77cbf2058fba140b5cd35f632e999a92 SHA512 ea1a400d6285c545d28b00258d8ed67f7deb3211c28db32e2c9a427c166481d80a36d0b2b89c532e84aea76ed705cdfddc51ccb2817cef7928398c092937a9ad
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gdc-0.24-src.tar.bz2 1012099 BLAKE2B 2c85058aad09af328719a702f69d655b9aa9655f2a83bb46bd21367cd442ed72c9b471ddaa764753f782dcb2f22fe51b052a965ed08290e0d9415b543481d144 SHA512 9aec7e4b102e602dfb61cd09ea4b4a96af637ceb3d726235261d09ebd35dbd416abcbfe0e46918e48474bd241fe9bb29abc145a65aa834669295aaee4fca0686
 EBUILD gcc-3.3.6-r5.ebuild 1242 BLAKE2B 9c316577e76d305f8eac6ba33ca97c26c207cade4da2f0d37c33be02fac6f9faa0eb487ddf9f68fb6db2cd128d6dabc3355eaef62c6775626af56eb96ba2f5b0 SHA512 3d11094be8ea52010d5128941db2dd23fae8e80460f2f03b03ee9111e5a32e3f6dfdf214d257de59de8cc02bdab9cdb563252a5b1a19ccb577d1e7ad8156cb81
 EBUILD gcc-3.4.6-r5.ebuild 1366 BLAKE2B 8049232e639cd5fd334a093b955969b8ee90361ab72cff7a457f332331fb1c336c70e2d5dcc58b6bf65a478b2a383a14297e86e1cbdba814c2f2a9dc509c943d SHA512 db12f820946cc3adf257a091631396c117969469d168bf281cf1eb55f262ef963dbf490dd90bd2160f86715d6ab0e52ea76f43e98f4194671e3519a8fe38dc7e
-EBUILD gcc-4.0.4-r2.ebuild 244 BLAKE2B dfdde3b2f9a0ce404c006be81c660911f6f8bf1ee0705b8675d371905bce310ef712bc898fec7ba02c53a45bbc6868334405a71029104449966ee3cf76e26841 SHA512 b9738da5703eda3e2c2e33bb456549be9ef68e4391cc880b5af8b2f173cdbdad874f609e90fa38547a3ef53657375c0bb8d377bd70bf3edb89a3e30264e7f180
+EBUILD gcc-4.0.4-r3.ebuild 242 BLAKE2B 269e476876f1ee62e288c7a3ee14a2261698bd12be875cd6bde54cb6d048bbcff11a82fec5b46d740fc4c607deed8cc6e1452cfcd4e5fa32b8a11708b86fca20 SHA512 8bb91642a9f12b48ac79011885bf416afdc501f080459b02a32efd2577ead6d6076f2a6637024eeb2364889de1a45191c0b3e47e7038871287b073072b420015
 EBUILD gcc-4.1.2-r2.ebuild 643 BLAKE2B 982428e246fa55bb4a9aeb7fd4fb59a9f9ac083f2d18720268fb052055682ad47891158cf473483084f89be2310d57669e997ba0c59b438953511bba74c4d5a8 SHA512 1f360765493b17fdfc28e84ae81580fe3f2a4915d52b279c3093e214d2c0eaeb9b23a854dd93b80ff50b358fee9bf961ee21e19de4d0437a6c94ba7da19c5952
-EBUILD gcc-4.2.4-r3.ebuild 382 BLAKE2B 1a4eaa374f6320d9d74d6838adfe15e75df48f772164ed2a29b307a2f5bb47043bf8a6ae615f684da09614be559e7d40182a86b43878867aaa40b8a9edfbc1a4 SHA512 714ce7583805a3ec20427ca3cb8674880ae6a3778eef072fa70195691e7559bfff4e5b58d670bff6ea54a0c9e0e59465c20d9a5c7e6f77894de2c8abb5bff954
-EBUILD gcc-4.3.6-r3.ebuild 625 BLAKE2B 05d5d5a9479619e2557469b8916bf4d97174d8a422b047b75450bae59a674540329dfc50064c9ec110a181e8dec0c37c4bdb1d7fb99fcf199fcaebcfa861a9d2 SHA512 d9b7b05da1b35aa0b32fb1cf018b5fa5e7b8cabe0227d17fd5c7d300b13e48e06bc6849de48ea79f911e8c61f8dcc474d93df2cbdce2b5ddf4cca0e7888e1248
-EBUILD gcc-4.4.7-r2.ebuild 670 BLAKE2B 26855169a9b2c3e030ab7d7726cfd49c868ddb9fa3a29b010901ad78a212a98da2d4fb6b5975dd8440670c6b8075df7898915eb07053febd8309fc307d75a495 SHA512 924332c285c4711d892ddf5cfb207768d338f49e15c98d82069f21e1359793b273fad658a660f98b06c65413ffd5fa823d42694443f2d507296289ffc964bab5
-EBUILD gcc-4.5.4-r2.ebuild 671 BLAKE2B d4c7b126e8425ea7243e7a0455a9d292d71e4400c5a1c2038924b3a82e6671a7aaae23ce25d278aeec1fc630f061cb33322a7a8252f1cc9a488594480e76b409 SHA512 9255d4766a9a7fdbcf461fd5858ce81815eee4e3360453aeefbb88d5edf1d25bf503719b4535f5dfed5c39d99eea02cd6a22f10f57ddfe05c9b4ea31b27f485e
-EBUILD gcc-4.6.4-r2.ebuild 752 BLAKE2B 2ad17521fda216cebbd81f09fac5a45ea923099caa5ec565aca8d735045a44ddc11c815a41a002e695425fecc15c7cfc17bbfb5b8bfd6a940f89e5a154fbf08a SHA512 783c5306f1272268f85a259ecda8d4c6f681e5b0e4a1d44b6bc2e928191f69225083236f31ce7fd421a4c8bb68fcd1bfa2c43785f70a71b24e6a974ce6991b8a
+EBUILD gcc-4.2.4-r4.ebuild 380 BLAKE2B 547b1c63e3f35852fd1731bd7c18b54aad03d3796fb6065f537029657fd96cca930aa3f59e3adff034b1b81e5f46348a771c04f116a5fa1eccf38323a9d51c78 SHA512 4d2fe882873b3083f966c7612486a47f349182cf726cd18dd973ee884d1dab14336c524734aece515957c632e63dcb6901a844aa8e0bdf0eb47f0973eaeb54ce
+EBUILD gcc-4.3.6-r4.ebuild 623 BLAKE2B 2b3a901399a250df0a8e1fe9035bcaabab5dfab6886439dcaf9192059ea0d6115007c148872841f69be411bd344004f4ac7e96ee79445ebad1080c8b18df9891 SHA512 3d238123072d7ba0222bfff9aefe4693e4a683f7ec593768b67578bd22c52fddaee67b8556dd7881477fce68b324c4b67749b2bfc0d6789e85c7922906da9255
+EBUILD gcc-4.4.7-r3.ebuild 668 BLAKE2B 0ac9a982a444a0a5cccb519e9523101a2b22968d35abdbd04beb8e6599dab19c7cd7dba7fa346e221e29985a87e8528c8834e245c62a5afe70ae319ddddc2cf4 SHA512 83199dea246e467f0da5dcaaa0ccfe45954b0688c484c90a0b9f96c60b6cb5d2f7d60d286248caaeebfb81aa5df6826c1d6b6d75fb82713d8cb3fa4d98790870
+EBUILD gcc-4.5.4-r3.ebuild 669 BLAKE2B 136c1ac3480b88d449985fbd0ecf383240985716a7d7efb18d387b9ab5c41f2143e5a0132d77175fa8ab319064a82df71aede929fc9da2cc389a186d2464ae7b SHA512 625a46dfbe66c46f39515c9b9d740a8e90a8cfeb1405b5a9afb7926f2b4821434789eb4937d0c76d986dcc70efe10d59ccd010b95fffdb9609253064564f9480
+EBUILD gcc-4.6.4-r3.ebuild 750 BLAKE2B 61a9acf56d1a04d88de3b65b6ce7bdf2d98eb5bf747d8f2cd388cb558dc64658f16a3bc5ac9baf757772423caf7b4dd251b35cac7fdd3eeb5a666d25dbc81c80 SHA512 a61bb4343af6dfd9401ef0f27cebd1bfb1334fc1a5888fabaae08bf9a15f8d97a72fd53e3a5d15706c37ebd920a827dc9f6e9472f58a58d637c2701ecdf6d1e0
 EBUILD gcc-4.7.4-r3.ebuild 1278 BLAKE2B 7bebadeeece4abbac0aadc45a86e3cd85ee2f3acbfaa943835dd051ee4d157356a9434800371936a78f33bf7082ba216b7e205737cf9110488c60683b02df690 SHA512 fcacc27b7406fa747e7be7bab432ab9aca59d51fd0ab23a1f922ff074f6c77293791473a5630731332e4bb225d3aab9ac12b860b538e56bc3eb4a7e9567ef61b
 EBUILD gcc-4.8.5-r3.ebuild 1389 BLAKE2B 37df6ef3df83f2e01b5bb925dd9c5a2325b8901ffb7345cf1ce76be696a1b8a6d84d8e70ca0a1aeba27ed850569d88c1cbe60fb697bcb81fdae9f2d8aa49a2f8 SHA512 e24737d4c52e501dd6b18d5f5a0b02077090394fd019d6828bb20a1466203d0bf84be071c20168fbe104c9ec975e27a1e9fb6902a0b1fb8b7507cfd06f8fcb51
 EBUILD gcc-4.9.4-r1.ebuild 1448 BLAKE2B dc46a837d0c7cbf779acb42d2f594c24e31784ee3e2de2f19f105bf06afd8a1c6dea7b1b741b402c9c59f717be9c6f9311664b916a50241a009954ce5fcf621e SHA512 aa8de516f9b193eb83532761d7cc37611e70bc4e9bdc007e88935933db8ee10ef1eb1b464d79169754f98f8ae50586ac6e209dd91b7372b561fd35e39ba2d519
@@ -114,6 +116,8 @@ EBUILD gcc-7.4.0-r2.ebuild 449 BLAKE2B 09efac22d94ab1860165ae73f94d84bc7b046146e
 EBUILD gcc-8.2.0-r6.ebuild 551 BLAKE2B ce07e5a5450b5c503b96e6000cf11cc8be10c80a7fdfb7928430cb9326470fc3ce6f86e85fe65931af282159c1d7eb075553e87d7d356c332bfcec0f6d154334 SHA512 8a773b462295156e8eda8eec0e173f667ca0bc528ed143f6da87c16628fcde56e96858cc8abe6cf72fb7226c088b95f998c8777d25f8a2f517240a3fed4a97f3
 EBUILD gcc-8.3.0-r1.ebuild 587 BLAKE2B 715429395b96a959d8ebd2a6ca0ca830bc8178b7865996951d081cfa7ff3deb309d40e8930221f726d1114557e8053874a849e23f39896c3bd448271a8b4b633 SHA512 3a7e946786d04176c6bb90ba5232e53a725502fbb1ac1a91465a10c3b52e17c0b72ef8bc35bdbc6162c4724e45758c4768092b5632f69d7ef773b05a30508e34
 EBUILD gcc-8.3.0-r2.ebuild 545 BLAKE2B 714a2df9755a80b710f86dbac1a4952a4c9d5cc8f4f02f8a72bbd51075f7ea4a3fc86f319a870262aabc968c4c8942f7f6ac1a3a42327c25e1fc8fae60839d97 SHA512 691189b20477748877e73e6e7084156fc64baa41057325cc1b2556745bf6509bda065e0867416b60e224e74be838615d1adea40fd0fd3ca067aa2d570eef92cf
+EBUILD gcc-8.3.0-r3.ebuild 545 BLAKE2B cca196e019ec3ee7ba29e90e0fd9f446c6b8b53fbfa287515645a53ada5a17d7a59cf7ef742a5c3593f6300afb8f1d3743e6d6f56ceee5c30194faba2c90088f SHA512 bb5448afa3dfc6eeec9329081ce83f82a1e919bc2a964134dadd285021d4f6dd100261bfcfa1875179bc66a42bb2ddd14141bf06911747256b11fb4989da050f
 EBUILD gcc-9.1.0-r1.ebuild 458 BLAKE2B 0e85fb6cd36c50c7158df2c1116f2a022dea82b6a03a0f8680de6fc6b9350e3b1dbdcc81dd001b1a9d2897cd474d7b81234c8397a4a77f8a04dc335ed4ad94de SHA512 1aba6bc02aacd1eea97515269fac9ead83631882a69a4c01026d111a7c87860292929d914cdfd5e5749319a0be775fea852e6631f320744e0c169a21e74a4495
 EBUILD gcc-9.2.0-r1.ebuild 456 BLAKE2B 1168d4b532a519290ef57b889bf26ed1ddb68f2c866a0255054fefb6032f033dbbc367169e5c1930901e6e340289428a8ae275db5aad05ee30c23e54f73189a3 SHA512 1855114a1e1a815d3e4ef2316d4ae00d60900b08d160a74fce7d375371e613e07e80ed644bd8aef2376472b62634b05ba8f3233b5b055b02fbc3ca52026d3f54
-MISC metadata.xml 3010 BLAKE2B 1a52f8672191d79b8797e777952e32728c88f7a54e05ff058129ac4281f46753beba81726e11991d3d06b3ff8f5d1613718b8e26c8897955d8438bca19a3fa60 SHA512 d6feda30c1d16d470fe5598ec28d2025f7b074899bb0a451e0b7e6dffdab2bc9c106b0cecd649e35d86b331fc220e8c4a9178acea510ebd23b08547c66089751
+EBUILD gcc-9.2.0-r2.ebuild 452 BLAKE2B 403bda7ad63d4dde18b39c0bf178748f46ee25c59d005059cc812ac5597cb216b3adcb4d8ee2165250e710cf8d5db59049e154a4c5bdcbf3f5da23d9e4228f80 SHA512 1cbd806184701794478d7258d93960db183706b47fd630764e2c17824e254c41fffd967b0813421ea60af13d684514930364106b2c7710d4689e03a599032dd4
+MISC metadata.xml 2903 BLAKE2B 1dab10dda72341050bf32178c4d55b8199a0ddabfb6001b8da5c3286e9389eef6bf3d88309bf9273221fdfd65b102d824aa2ce702437c523a10a32ff8bfb7deb SHA512 c4e79dbbc7c76df4875ef287ee7aa916f65868743a7803e00836cb61bec0c1df2bb18974dec591075c3f78cd872b828218df7c7ded8455290df03a253df0320b
diff --git a/sys-devel/gcc/gcc-4.0.4-r2.ebuild b/sys-devel/gcc/gcc-4.0.4-r3.ebuild
index e5a34bf356ad..dba04bf9dc4f 100644
--- a/sys-devel/gcc/gcc-4.0.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.5"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit toolchain
diff --git a/sys-devel/gcc/gcc-4.2.4-r3.ebuild b/sys-devel/gcc/gcc-4.2.4-r4.ebuild
index 03b5c5788ee6..f9f923b618c2 100644
--- a/sys-devel/gcc/gcc-4.2.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.6"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit toolchain
diff --git a/sys-devel/gcc/gcc-4.3.6-r3.ebuild b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
index f160e48e5044..fbb4b15a0529 100644
--- a/sys-devel/gcc/gcc-4.3.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.4"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit toolchain
diff --git a/sys-devel/gcc/gcc-4.4.7-r2.ebuild b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
index 5f7a73a76bee..75b290303ee9 100644
--- a/sys-devel/gcc/gcc-4.4.7-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.5"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit eutils toolchain
diff --git a/sys-devel/gcc/gcc-4.5.4-r2.ebuild b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
index 3eda7487fbf8..29074def7cf9 100644
--- a/sys-devel/gcc/gcc-4.5.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.5"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit eutils toolchain
diff --git a/sys-devel/gcc/gcc-4.6.4-r2.ebuild b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
index ade4c68df1fc..2ec6905d63c5 100644
--- a/sys-devel/gcc/gcc-4.6.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.5"
+PATCH_VER="2"
 UCLIBC_VER="1.0"
 
 inherit eutils toolchain
diff --git a/sys-devel/gcc/gcc-8.3.0-r3.ebuild b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
new file mode 100644
index 000000000000..55d50a762419
--- /dev/null
+++ b/sys-devel/gcc/gcc-8.3.0-r3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
+
+src_prepare() {
+	toolchain_src_prepare
+	eapply "${FILESDIR}"/gcc-8.3.0-norisc32.patch
+}
diff --git a/sys-devel/gcc/gcc-9.2.0-r2.ebuild b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
new file mode 100644
index 000000000000..59bb7f5d87ec
--- /dev/null
+++ b/sys-devel/gcc/gcc-9.2.0-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.13 )
+	>=${CATEGORY}/binutils-2.20"
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
+fi
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 84d7083a3f92..393817b6e620 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -33,7 +33,6 @@
     <flag name="objc-gc">Build support for the Objective C code language Garbage
       Collector</flag>
     <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
-    <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
     <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
     <flag name="ssp">Build packages with stack smashing protector on by default</flag>
     <flag name="systemtap">enable systemtap static probe points</flag>
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index deeeef021db6..4f0b6dd3d6f0 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -5,5 +5,5 @@ AUX gettext-0.20-parallel_install.patch 1494 BLAKE2B 58bd84878c351e29acac861f298
 DIST gettext-0.19.8.1.tar.gz 19704011 BLAKE2B 17dc7aad338a26d71b818fea51e46a47dccf14744ee575ce86b591becaea402e36d64dc018e1a84113c356122ffef367cf2fa424e51ebc9720350040b4960091 SHA512 073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1
 DIST gettext-0.20.1.tar.gz 23267473 BLAKE2B 34e776b985c7db105f8029e0f3400aa645ff6843cd35f778d48450368a31218ddcf590fbc7fd2d10f716b63094d6a15bf40b358e8a6f498d450d2420e7e7a5f2 SHA512 af6d74986da285df0bdd59524bdf01bb12db448e5ea659dda3b60b660c4a9063c80e8c74cc8751334e065e98348ee0db0079e43c67d485a15e86ae236115fe06
 EBUILD gettext-0.19.8.1.ebuild 3943 BLAKE2B a47b7da091c324ba47f8311b637f4d8e5b011240ce096b904d7e98523a86f80510efd85e6cd03b2b427af4a99d28710edcb1cbd76f90302c831630438912da19 SHA512 d7a1e4971a092f428a0b4f92f13f3e30a52030af45ade53161c99cad8b8217ab49e96ddd027b6ee6d68935c39787f1fc8d9969116fdc64973526d5c22fd79a79
-EBUILD gettext-0.20.1.ebuild 4050 BLAKE2B 6dd494aab1281bfd62ea894971a6bd27d4a1e050cf859f11111d163978cc908f8071fa385f55def5dfc24491cf7765999b09a94e44ee62e90fff0801a5153aa6 SHA512 e5f60809aa5477fad33e9d73fcc7a86887ead1d8122386ea928f95d560c3d65ff5a2b0351706bb167083f774af12aa32b7d17b08463b04e17a7dbc99ef9800a5
+EBUILD gettext-0.20.1.ebuild 4080 BLAKE2B 051fea9d6833fdd5cdb1eefd7686bdfc41496aaf5a1f8352400f9ea89d764c58b513232c38244e067cf891f633cedf0ae6cdefacd9e4ced82edbeb3ba28323a8 SHA512 5cddaf83dd49aea9307f57da10dfddeaf1b23097157a66724649d1d445afcd3a71bc6563228f094d5b463f2e37642656a9a02f3517996d121d72197a51692add
 MISC metadata.xml 630 BLAKE2B 4e89248161acde4bca6252961fdf9227a08c528cfb91c7c06f85e4573bac6d0c3c7543ddd582b36cfbaedb7acf5139216e4518af4f7f310b1a9a1fd5b960fa5d SHA512 2eac2c110dde44856c6b45a3a1f5d58e26b887041fe8250c17ee6ca555240204296592a25122cf7595551b83b6414a4890a0886458dc4ff4e9135e2bbfc86507
diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild b/sys-devel/gettext/gettext-0.20.1.ebuild
index 0bcc71805343..7de043924130 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -36,6 +36,9 @@ RDEPEND="${DEPEND}
 	!git? ( cvs? ( dev-vcs/cvs ) )
 	git? ( dev-vcs/git )
 	java? ( >=virtual/jre-1.4 )"
+BDEPEND="
+	git? ( dev-vcs/git )
+"
 PDEPEND="emacs? ( app-emacs/po-mode )"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -114,7 +117,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	emake -j1 DESTDIR="${D}" install
+	emake DESTDIR="${D}" install
 
 	if multilib_is_native_abi ; then
 		dosym msgfmt /usr/bin/gmsgfmt #43435
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index c0ea63ede103..e0e7fa9fee7c 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -67,4 +67,4 @@ EBUILD kgcc64-8.2.0.ebuild 1417 BLAKE2B 5719bf546721d85a78dcf81a0264cb51bbbfef5f
 EBUILD kgcc64-8.3.0.ebuild 1253 BLAKE2B 380cc764ddf5e4619e33f62795922ba3cf64c196c8937b74e491dfce25427c60fda3105a38a484c465123852f6ec89343a301a74043541db786e2d828c499cea SHA512 08d00606e0b5f603d66e3d7398c56831c4a9f8c612a42955eff195c60c3e6a2cdaa9bb203fd076a70795eb4ef9eb41e445f0f41dc204e250fcd770bd9c1c53ce
 EBUILD kgcc64-9.1.0.ebuild 1084 BLAKE2B 4fd8dafcfd8dacbe4daea58457434a0f66da7b09589b4ac4281d9b13cfad92f9bc82e6f19f7f3742267b2b3d20a0d86d135daf82ba1e729535054850dfe3ede3 SHA512 4892d29f5a0ef47402b37966e218ecc722a0352ffcb4fc8b77681b58b2c77788a523be434df77f6b252cc3542fcc0d8950a6553d05077bafe44dc6ba3065edc8
 EBUILD kgcc64-9.2.0.ebuild 1082 BLAKE2B baff05bc1722cdf84f36cdf9500cbe04e861a47a20626e0f2bf49754355b21684ff83d8135367fbd9a43e9e6cc0496733036bf4f75290536fb507dd5b655ce15 SHA512 8982f56eaf2a0d7957464ef18b5ab560eaf1bf3578876a58c0290d4895a7e0450058dbd2cbd642ff2077d4faa2be83cb54206ec64425c453bb27a2e0bba85862
-MISC metadata.xml 391 BLAKE2B 74b9e74159068a03a6bd89c2f746c0da70d46da728916e67743ce770511962f9312937502be1540c3ca00e4bc94699f792c0f26b847d97f989a67282aee8b7b7 SHA512 2706ffd3bd99ac2ddb63bee433322d96264cf2a1f7abbc1356dd8ea9ba3ca6e43f5aa7a9723defe5bf01153c1eb4deef18df55fe904bba25a9c2ed75755e83c1
+MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-devel/kgcc64/metadata.xml b/sys-devel/kgcc64/metadata.xml
index df7607df3a85..3a840c8dcd05 100644
--- a/sys-devel/kgcc64/metadata.xml
+++ b/sys-devel/kgcc64/metadata.xml
@@ -5,7 +5,4 @@
     <email>toolchain@gentoo.org</email>
     <name>Gentoo Toolchain Project</name>
   </maintainer>
-  <use>
-    <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
-  </use>
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-devel
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)