21 files changed, 128 insertions, 67 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8dabf44983d3..cd20199f2d03 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 175523d550b7..94779e95a815 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -10,7 +10,7 @@ DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf5
 DIST autogen-5.18.4.tar.xz 1017936 BLAKE2B bc2b4d7143642baa923c49bfe37d60c0d3a0a3a09a9af504c5dc865f1054e4d510ca3144737c2098a75189a7335bc560ec26318689ebf6d1291969d5a081cfa2 SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6
 EBUILD autogen-5.18.10.ebuild 1144 BLAKE2B f10a7b680ad7c3f0d50a7abbc7cdb22f057006d60791fff8ca2af146bdf35a981ca1648642631780d2fdcbfda2e64066350e4da10527807ac90f82b6c781dd5e SHA512 cd281ae6ce63f836774d82137f8326cd215f946a7827d0e2c318de7f507d74f6218c4bf1bf059c25c9d9a2cc089119b84e4b03c8c6f69d4cf96931c90e43a1ec
 EBUILD autogen-5.18.12.ebuild 1203 BLAKE2B b66487c33b2e9929b06357ed1964a7bac33f982fd10bcce2f1060776d0f4b4c7eaf351feb88120b131670e2db3d69b64d0490ae7827ca9f6a19513dda969977e SHA512 e2699dd820942e1eaf147e32f92ba7f66d02eadb4dde7ca1817dded7560af787868fa195038cce70448e818aeea198f70b5b1b7451a7d6f42fea5a4641cae13e
-EBUILD autogen-5.18.16-r1.ebuild 1628 BLAKE2B 19a04fe8871142b79852f2104d7e0a5986cb56cf33426a1c7f060a43c5301e203a17982aff36b94c2587242d0b19860d06b844904fbd1573b482b935ddf56718 SHA512 53c036ea3571cdf5afd1eece6a6f3a139f11372e273747344da7aa40ffb847c29230ad8ecc17af2a5dcb94a2bafce96cd1885b505adadfc1f23ad1c11fa31aac
+EBUILD autogen-5.18.16-r1.ebuild 1869 BLAKE2B 232d34c5ca35de43fa4441fd058ba46b653cb5298a477f7539382b7331ee2edd1af6d78924d4f5373d02346c4873e0fe701f5372feed0d041c133c35a36f5f7e SHA512 b1bd9e7ea47561b38b8e763fd25860aecb3bfeceaaeb85326adc8226662bfb56b84e67da1f149300e1b78e3c83864bb240b3cc4a82c67b9caa919b7540b381b1
 EBUILD autogen-5.18.16.ebuild 1567 BLAKE2B f3077c810d9e1bff53730a57b687bf3c82b899035c84d193f5d491999c87c29ea16ef5622501dad821e9af27556ae2f8ba7a9c5fd25cf24c9bb5488ebe3bfca8 SHA512 4125f2681f8973577e0667d09017145b3c91b3eda8f8ae1504f605893ada5e22a0cb7ae9572f752527f54af3e27091f7ed9f1e7fc138567a5f42f665c7918677
 EBUILD autogen-5.18.4-r1.ebuild 964 BLAKE2B 61f358436309dea7b7f8f7336e9d1bbb689f4c5b901fe0997cf01f8f682e2d8d40a69555f71a1dd57067301e3be520866f1abe7cb59a16643ca97024144c7c3d SHA512 ff910273519ed23d1307b1e37180eb2678c3b2474db7458a62caf187480b076187c1129e32274d7ce11058f92e79c0dfefefd91ad17046f2239c39a91c5e7567
 EBUILD autogen-5.18.4.ebuild 977 BLAKE2B 959781466ca3fbb9b5a1a1817502c674628dee24c021fe37ff84294355a604d1015c22191a15e1dfb740b9dac03ba827d9e581bcca3431c930aa601180933d7b SHA512 597b14fcaefb0f95a8add36e74418060857abfb622769b813f1701a87c6ea8c3d78a61a71183e9ee60c2e348643696233cf47a6647860615ada22c0bd50843d3
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index d69abe1e265b..b2f45d68237b 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -43,6 +43,13 @@ src_configure() {
 	# suppress possibly incorrect -R flag
 	export ag_cv_test_ldflags=
 
+	# autogen requires run-time sanity of regex and string functions.
+	# Use defaults of linux-glibc until we need somethig more advanced.
+	if tc-is-cross-compiler ; then
+		export ag_cv_run_strcspn=no
+		export libopts_cv_with_libregex=yes
+	fi
+
 	econf $(use_enable static-libs static)
 }
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 21e7466b3c0c..c466dec31d6e 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -21,6 +21,6 @@ EBUILD binutils-2.28.1.ebuild 280 BLAKE2B 6c8363e933c3a7e40fc21a737b59d08d2b9bdd
 EBUILD binutils-2.29.1-r1.ebuild 328 BLAKE2B 1f38a6896f710e1c18ea80569f02a93814daaf0fa84b08f9762bbe002607189a8c75ddcbee978af878d5976ede247f31d84fda6c00142f5020e7d18b4b03b17c SHA512 7a08fc2878be20f311cd5cf10f59035f17869da5f59822a73c55da3c134a9dffdc57de855f7392b396dfe3a526c1dc4ff60d3202466b6e9c2d26e1cd18a48289
 EBUILD binutils-2.30-r4.ebuild 12023 BLAKE2B a30f16d4bd14247b3528ec6647190e066a01cd1b5b11f8eb14f132b73bb520c38acfbe648d683c64b50feb46dd70f6ca8835ac4405100ceefc918552e80a0239 SHA512 208574e5c850d00402d6630d7ef30b9216fdabec8aa0287f3f379b3c9d4d1315c8b4b0e55016807906c1bb01c3fb6941712606004ad627c78a950b632a45f2ec
 EBUILD binutils-2.31.1-r6.ebuild 12418 BLAKE2B cc585caed5c8f42bec4b4c9023b0f3dfbc2c128c158f1a907d226129dab62958f1ac5da6c063fc5581b42254dbacde585985849f3de160c9b4a730712cb661fe SHA512 379bcc5f5d4742be1537398db91d5941d2f069341018f67011d56ec8c094319d0b33368564cc8e0769fa3168d0de37a8b66d14d7cd41d2002b0dcd13796eba17
-EBUILD binutils-2.32-r1.ebuild 12624 BLAKE2B 76fa20733bd5066fabe2e4590657dba83a32d3cdbadfa09ced6d5d8a92362aa33ca089ec5c9c0b909926757fc8a22cecd1c2c91a85f6a09803c6289f6ca49462 SHA512 2c4df0c315e7ed32d21a794a4e19d6ae985f6d867728454630634b5641e391e0efcc5297907492ebea15b8eebde655975f797be4e330c19df52b9df04028990e
+EBUILD binutils-2.32-r1.ebuild 12623 BLAKE2B 54fa4f6ed2c4a96b78eea139fa9992243706d2cda8ba6c50688ad55678cde610e9de5f945694b2de1e087c282b48458dce7e4102d5302edd4d653b60e1324968 SHA512 a2e9db9f3535abf9db17a81c2d006188f4894df7e4188ed4b06212bcfd40f834525026a12e0571c35ca71051b6caf1177a1fb4969cfdad5c6d364f5be0c4e447
 EBUILD binutils-9999.ebuild 12128 BLAKE2B 593fbabb2debe0faedface04a49f94e16c5c8aa4b7276a365bb159f8e2334b525315f91c8123f3b47420acac3efd05188629f98e609e964879ba4d0e91f0e4e5 SHA512 423085df8080716a64589d7bf80582d5bd26a46eaf0e6a8213bc684d5784ebb857cdf894f527a39f5a67b3be45428b8bc54241e8a85225f096ff095e9d7962d4
 MISC metadata.xml 650 BLAKE2B 5f0547bb9a41a09f28afc7feb1d6f2da32205924d860a88f64a7970a5e24749b961531c023a8647720e119ffbf2bdcab9384f10726a3371a8ec750b808233eaf SHA512 9057a779adcdf1da85c7e26fdd134303e4fe53ba015dda84761f5e4894833ba50f1411c1e96102319479fb1becf6c02e23984737b3660a7c24101d0cf0d404b2
diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild
index c1e39fee45ef..184c0d38265d 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
 	*)
 		SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
 		SLOT=$(get_version_component_range 1-2)
-		KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 		;;
 esac
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 0542128e4aea..764b23e41619 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -2,9 +2,11 @@ DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7
 DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325e8a61776b8b47ecaf2e5437150554f6973c5306d233a836e4ffe3ff0480167c9b877c5f9e733681fd502016a19d4 SHA512 896bf050c81f3f34b2be187a851832494c039aa93177c806b689a75d16567f178e4ca33c21282fc320506b76e09b0cde8a45976b6309bf9bc5be8290db3dd8af
 DIST crossdev-20190311.tar.xz 27176 BLAKE2B 444828314b4e5363e9603a1fea8034e0b2b604a164d8efd6c31bf15591080daebd936eb2881c83e165f945742d11f54b04bf5f59b4ff39c048e55fef9989d268 SHA512 1f572df09204e297efd6e97001aad929226f26e9ddc706568680d75b1746a624e86c1578c5d3ee1e52ece0bbafdd17ae59565f3098864f018768c2901821f4ff
 DIST crossdev-20190712.tar.xz 27240 BLAKE2B a2d09a21df1eeeb16ad03c7415a58e3d3424221b08d1a672167945df8ebe9b6c1898ee3f684d8653ed088cc1ef0155de0156b14e2a77bb47389c6f3e277039d7 SHA512 987c29b7e36f94e1bd14c4072514a04d6655a41a922cc179e6cd12bc78a71dd60202d202c40a107365297fe11c6e2bdcbd2a3cea21b5b7260c0b8608d9d3ade5
+DIST crossdev-20190901.tar.xz 27180 BLAKE2B 879616453e883c54c9646e9111aba0fca86bda36c3f1fb327a4036a140c58b6b09498fb8e2b6d8e19dcd5efe15245d70585c6b4b463ec9f58ed5c2b84395fa49 SHA512 42d31626f798136df1d9000d0de325d53d51746a8f187001279090b112fe05862930110d2ef877d14dfc9a6d111649f3e335e1bb8e023696a69129592b6a8976
 EBUILD crossdev-20181020.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20181202.ebuild 853 BLAKE2B d9a5fe47015d1d73a4b54b91cbf745780ad2fcafd857a11e4bf7b4ba2cc3c54c75918a491f5146c25626bbb271c2ff121fd6b524a2b54a52e4a4d5e1ba1cf262 SHA512 d19b06a4d29e3a43829db890b5b24180a3a6979f446dd9ce4e131ebdbd4f1dd547133d2aae718c146d085813323ad2223a5f9ef8b07091757927a06bca86ac78
 EBUILD crossdev-20190311.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
-EBUILD crossdev-20190712.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
+EBUILD crossdev-20190712.ebuild 860 BLAKE2B dbd958904546375349ac0ea43abc0614cbddc0ef834d9134ebf4a70fcaa59c62f13cd5ba1d5687fac9e6f4ea33cfa5fa99dcfad1e1345cbbe7e34ec56f9c4857 SHA512 9cd21e0ad7c5744226e75931e9c3c0fc3598ad8e3c015042418fa65007ea21061b91a698622cc806a53c7d8ac26fef28302ab5c560356896cf3ffca900209948
+EBUILD crossdev-20190901.ebuild 873 BLAKE2B 6ba21dec4b1fcf5a36f23ce56c07cef4eb5f00ae08cba636354c966e83f19569c9d3772f112e4a033863cab938ebd6a476fd731f18284eaa4d64f7e8acbfd961 SHA512 4ca24706a276064a3c4a89667ac4d8c6033796db077e06d7bd28f18e218a6c0c018a890789216cace24bb228c3344975eb287a79df49a5c40b851d77a7bf3e78
 EBUILD crossdev-99999999.ebuild 879 BLAKE2B 9ac2da81d2ce3e295b1ddf9b4c5febb91718a37badefcadc32c984523169a455001e14d591d4873bcb3e691fe4b8b532c45e379935de71d573aef47b438275a7 SHA512 f3420056b96dc3bbd175638eeb4cd16779d8676db61a25635d60533f9f1d08ec434e4e70e8c00001eb8a961bd79aa3b50d20729c2cddf14c4225fe18d801bab0
-MISC metadata.xml 356 BLAKE2B 2220babfa5cc38c63a0e8361b84d1f3b288e5d050fd587562cac160621a60efb109df5af98b6108c1cd442947911d76db38cc9b82ef83c7a52553d5dab231116 SHA512 9b90e3370e18885739fad8a1ff7fd420eae5cf188fde84e8aec8002bbbc390291bd37481e308ad584d33e643e9d17a47000c8ce0852780ff18c0bfddb7327cae
+MISC metadata.xml 380 BLAKE2B ebe1b011d5cc2077d90cc003f1340fe1243abed1aa3d66203eb5594a5e9176e4cdff826e938fcb1c26f020c2d75dc51d3585faf65a23446dac3043e16f8f0caf SHA512 c9ab89db8d3200e469dbfbcfaa3bb920852779bfbc3eadf86a5da7bc67f7b166fc0fb30f03292c2b5f3416d2488bdbef375666f7cb06e210bea0f4cb24581a41
diff --git a/sys-devel/crossdev/crossdev-20190712.ebuild b/sys-devel/crossdev/crossdev-20190712.ebuild
index 36e054f04b26..81c40d108dab 100644
--- a/sys-devel/crossdev/crossdev-20190712.ebuild
+++ b/sys-devel/crossdev/crossdev-20190712.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"
diff --git a/sys-devel/crossdev/crossdev-20190901.ebuild b/sys-devel/crossdev/crossdev-20190901.ebuild
new file mode 100644
index 000000000000..36e054f04b26
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-20190901.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-2.1
+	>=app-portage/portage-utils-0.55
+	app-shells/bash
+	sys-apps/gentoo-functions
+	!sys-devel/crossdev-wrappers"
+DEPEND="app-arch/xz-utils"
+
+src_install() {
+	default
+
+	if [[ "${PV}" == "99999999" ]] ; then
+		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die
+	fi
+}
diff --git a/sys-devel/crossdev/metadata.xml b/sys-devel/crossdev/metadata.xml
index 496c0ca9a6fe..1721f3415795 100644
--- a/sys-devel/crossdev/metadata.xml
+++ b/sys-devel/crossdev/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>crossdev@gentoo.org</email>
-<name>Gentoo Crossdev Team</name>
-</maintainer>
-<maintainer type="project">
-<email>embedded@gentoo.org</email>
-<name>Embedded Gentoo</name>
-</maintainer>
+  <maintainer type="project">
+    <email>crossdev@gentoo.org</email>
+    <name>Gentoo Crossdev Team</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 94a710c80dd7..62342df87e3a 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,4 +1,4 @@
 DIST gdb-8.3.tar.xz 20490300 BLAKE2B 24b2a2a9bda7ae8093f757e42d6d0ab5642ff1d7e5a832896c28c5b17961166072c0dae158c04d7f7660cb059194c259bcff71ad5763960027b0ac3d7045eb1a SHA512 47ac074d20a09a3fac8f4a41dce0a0cbe6ef702f7dc21ba8b7d650d306128dcae481e9a16bf65e596b3a541dc82ae57c02bcbb786d551b4ef3e2917b9b6f0ae1
-EBUILD gdb-8.3.ebuild 7195 BLAKE2B cf61ce4e763dac7ba2ac06c09187347e91a4e977add25e56beb7936cd7fe657f3b0601f37e9ad17bde908f104c4ee906f6c9c9e7208b0d14e1485746317fced1 SHA512 64926d922cf7109e6ade7daa7d51b1942d7da0fd5a523b74c5ee9ceba454b00f4dfee9701227b869ffe2a60ba45dae20aa3239b099c363f16381fb673ac4d968
+EBUILD gdb-8.3.ebuild 7194 BLAKE2B b99060f1a38cb582e5455ddd334c49c1a4dbcbd7a97fdd5983c19d60a503bdb3bf90957e835070b823d5a43eda584b625081e484a772f6be0dc7cebb46711aa1 SHA512 18476bc11a487720655b30128da1aa4a1d929ef14393a4da0cfce65522f1c801ccbb6b20a53bca7fb66298ce02753dae4a77e1fb22cfb67f075e55e21a44c166
 EBUILD gdb-9999.ebuild 7207 BLAKE2B abb0fa5f13c95a6dd64e9672e7149b871eaf6fcfad0d74ef69addb10779d0cbf299dfa730f117748ad5debf56fafd56807a7853c976eee1017240b5a3a442ecf SHA512 db11a68493bbddebc1a703dddc3455afd7417d7e2c57fd9aab57c18e3372c35a52aef4d37bfe7ec0e861e7dd324e904d55f92d9098bad35bdbf8febc54dde8b0
 MISC metadata.xml 1021 BLAKE2B 81d865fbf0282b889509edfd6901654f25e60474be0eeca406803dbee20260da840f323f036818edbe27635e5a8c944b53bfba9fd7b715301d1a3eaa50898dfc SHA512 2255a18e7275069a9d8011f8360399444924ca6a3baef788c2e44e790896ba388c974fceb36ae2d394afc943b481a785ec3c11657e5018b7cd5db0eaa869c530
diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index b6dffddab4cc..7a92d8c02987 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -60,7 +60,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml"
 REQUIRED_USE="
diff --git a/sys-devel/kgcc64/Manifest b/sys-devel/kgcc64/Manifest
index 8afd131a4d34..c0ea63ede103 100644
--- a/sys-devel/kgcc64/Manifest
+++ b/sys-devel/kgcc64/Manifest
@@ -43,6 +43,8 @@ DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68
 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-1.tar.bz2 12836 BLAKE2B c29516d2877229129cc69ebb781198918f0e59e2a4631f3b2933b5a6db61d50ef0d2e78ee9acaaf1c50c597aad3203d81e49d4e0674f7ac74bdedc401238940b SHA512 0382ed0d483955079bd20fc15066b8f45772651bcba83dbed2c35e51f7259cfd28b825243c6a49a0bf51d9ab1eacec3cf55c47a00d2873d6122d32b9fc05d87c
+DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 EBUILD kgcc64-4.1.2.ebuild 1168 BLAKE2B b9092641f591201dcb6c59767dac678edc30552927d0850358b308544ea5c85edcdb160db582348679b24dd2a56350476ac6292ab5bed5b0f9fee6df23618896 SHA512 20afe58f1789807d68af569b54cfa0222d82cc8b9f73a50a754f8d0c8ed70a9655ddfb33043caf252fad28563211f716e51204a25fedbfbe5c0d8d47fb8f5fd4
 EBUILD kgcc64-4.2.4.ebuild 1044 BLAKE2B fe27d00088a1dbbafe880dd2ab3fcbb3a5588e918b9a0222225aa8ce0cf46b378bee9f2c77ebb8ad0a1fc7e81d4f6aac5f7fe47428164674adda74d760e49e8e SHA512 604992390f8babdeeacc5afa90934a7b6bf0d2d70d31e4dfda597da8a5f8d62f1ba6c1ccd491ef4ca814e87cc0d9491b3907e452ab51c84f15c5d5486c302c02
 EBUILD kgcc64-4.3.5.ebuild 1101 BLAKE2B 9dc7c4a0948ad9d187749c4a4334cb1755150069d73be88b5e297bc904cc2f54204af9da37347dc787cf6d9ba16401eb422f260480d132d7aedf6f74ef897481 SHA512 04f1dda7aab17364756555b4bbec110437166b6a361067b6e29dd134cdf912581ec76605be99e06a93861b71654867a3af98f91e3e1c35556401422ee9857628
@@ -64,4 +66,5 @@ EBUILD kgcc64-7.3.0.ebuild 1256 BLAKE2B b87b6ed043bd9fb82e3082d4ebf52faa1ad0d27d
 EBUILD kgcc64-8.2.0.ebuild 1417 BLAKE2B 5719bf546721d85a78dcf81a0264cb51bbbfef5f6963dbf0219018c34a65da0ba4d36d0e8f9be4228b7da3d291f29b3f822ae0dd4511fed864275ef6726caf95 SHA512 b347147977439b6257675f4fb1fca9f0bd5828571c7ad6bd0623d7350bb85ef472906728ac7b4f17e8cd6a16b9a0ed56396c68c371eb984191c4225e3cd74c5c
 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
diff --git a/sys-devel/kgcc64/kgcc64-9.2.0.ebuild b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
new file mode 100644
index 000000000000..73a7576ad10e
--- /dev/null
+++ b/sys-devel/kgcc64/kgcc64-9.2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+case ${CHOST} in
+	hppa*)    CTARGET=hppa64-${CHOST#*-};;
+	mips*)    CTARGET=${CHOST/mips/mips64};;
+	powerpc*) CTARGET=${CHOST/powerpc/powerpc64};;
+	s390*)    CTARGET=${CHOST/s390/s390x};;
+	sparc*)   CTARGET=${CHOST/sparc/sparc64};;
+	i?86*)    CTARGET=x86_64-${CHOST#*-};;
+esac
+export CTARGET
+TOOLCHAIN_ALLOWED_LANGS="c"
+GCC_TARGET_NO_MULTILIB=true
+
+PATCH_VER="1"
+inherit toolchain
+
+DESCRIPTION="64bit kernel compiler"
+
+# Works on hppa and mips; all other archs, refer to bug #228115
+KEYWORDS="~hppa ~mips"
+
+# unlike every other target, hppa has not unified the 32/64 bit
+# ports in binutils yet
+DEPEND="
+	hppa? ( sys-devel/binutils-hppa64 )
+	!sys-devel/gcc-hppa64
+	!sys-devel/gcc-mips64
+	!sys-devel/gcc-powerpc64
+	!sys-devel/gcc-sparc64"
+
+pkg_postinst() {
+	toolchain_pkg_postinst
+
+	cd "${ROOT}"/usr/bin
+	local x
+	for x in gcc cpp ; do
+		cat <<-EOF >${CTARGET%%-*}-linux-${x}
+		#!/bin/sh
+		exec ${CTARGET}-${x} "\$@"
+		EOF
+		chmod a+rx ${CTARGET%%-*}-linux-${x}
+	done
+}
diff --git a/sys-devel/parity/Manifest b/sys-devel/parity/Manifest
index d309b71e86cf..92428ad3bbb1 100644
--- a/sys-devel/parity/Manifest
+++ b/sys-devel/parity/Manifest
@@ -5,5 +5,5 @@ DIST parity-1.2.6.tar.gz 559357 BLAKE2B 733721306e02e50d5fc65859b77d562c4fd5a7df
 EBUILD parity-1.2.4.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.5.ebuild 1840 BLAKE2B b2f7e16a0991c862e70e32a6dbd1c5b0825579983e408cd5230b2b6678272405f8c538cc79e8cd89ce981251a66b17f9f5841dc3ba810fb7306ef6e035fcac83 SHA512 b9a729395449b6265357c134b56046bd3928dfb2c99a526e402be319c74f04ddfeca107ca15db3c405ec1d9a9ed2b512e24aa48f7d57db0ae485c6ce86ff1379
 EBUILD parity-1.2.6.ebuild 1912 BLAKE2B aa23528b4e873248845648dbeb3b065f1b96e7dc402779f572c12bcb094396bba497ce9aedae51d5c8adc0e89fc5193287fab44c06c8793644e2dc9af32a5ce6 SHA512 3472126d0cca7f23f207187fe648c48a31abfafb7440a815f1a7dae952b53a42732fa3d50dae3b3e3eb5f5b42c00bfcd847f108a9845ecd21ecc440245b47c99
-EBUILD parity-9999.ebuild 1587 BLAKE2B a905b5192b5a9501c4c2daaad839647cc88757925e3c1de980a8838442e8c64771b2594ef76f33fa6e8af6f6200f84571ca4c5d98a160a3ed64fec36c6810128 SHA512 ea01e0224b73c1bf94995908467ba82062f6775083ada2a62f1a381eb368bbcc90636a44852de3a336166c166bdf0c1465dfba9ce0dd722ecc83ad6983090c28
-MISC metadata.xml 1089 BLAKE2B 42f41264a860009c3edc2a64bb87cc797e2b9fb9d11b7b8aa6dad187518b30c65c514adb931b9a5d5afb4b10faed6faac389aae1579aa06a670025a58d602794 SHA512 95540f4712c65941bbe51acaedd715a6b18cf4945d0d5157f6157255596365842c4f1bb0cc79dc63aa4cbed4ef130f10ea4b6f8d6e04f269eaf1c96230feefd8
+EBUILD parity-9999.ebuild 1764 BLAKE2B 3a8275c1a5807cb47b8797079c0e0e014b9bd6c91fe4499991cb06dc983cd8b0845e58fce6bcf13787806ae5a516c86f511900cfe752ed1d9d91aade66900336 SHA512 54d31b9ded689c7c4fef7277ae0da942009e87c94f5e66fe14fea42b61a9df8ecdc8598bec16edf3246d4fbf06a654adec91a87a97eb7df85b7aecf4257b797e
+MISC metadata.xml 1167 BLAKE2B 3d67fe08381e493a73ff9add1c70c1894ddb9cf250a022a39093fe9460dc1defaf771b0c6589f0d4026f4f75d142970b189fe59ab1f8c12db3c338e3dec1a7ba SHA512 c4f930164516bf18f2b911684e5a3bc11b337e50314ece31210abc58d327b91ce5845d0e3d7da85e71026f5e3657e362a66c34bcfa3f1569bce5c348dbcefccc
diff --git a/sys-devel/parity/metadata.xml b/sys-devel/parity/metadata.xml
index f6466ef21aa1..b5ae82a3cc83 100644
--- a/sys-devel/parity/metadata.xml
+++ b/sys-devel/parity/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name="vc14_0">Enable support for Visual Studio 2015</flag>
 		<flag name="vc15_0">Enable support for Visual Studio 2017</flag>
 		<flag name="vc16_2">Enable support for Visual Studio 2019</flag>
+		<flag name="vc_x64">Enable support for 64bit Visual Studio compilers</flag>
 		<flag name="vc_x86">Enable support for 32bit Visual Studio compilers</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-devel/parity/parity-9999.ebuild b/sys-devel/parity/parity-9999.ebuild
index 38577c8f86b1..50ab4b1e491e 100644
--- a/sys-devel/parity/parity-9999.ebuild
+++ b/sys-devel/parity/parity-9999.ebuild
@@ -14,14 +14,20 @@ fi
 DESCRIPTION="A POSIX to native Win32 Cross-Compiler Tool (requires Visual Studio)"
 HOMEPAGE="https://github.com/haubi/parity"
 
-parity-vcarchs() { echo x86 ; }
-parity-vcvers() { echo 7_0 7_1 8_0 9_0 10_0 11_0 12_0 14_0 15_0 16_2 ; }
+parity-vcarchs() { echo x64 x86 ; }
+parity-vcvers-legacy() { echo 7_0 7_1 8_0 9_0 ; }
+parity-vcvers-current() { echo 10_0 11_0 12_0 14_0 15_0 16_2 ; }
+parity-vcvers() {
+	parity-vcvers-legacy
+	parity-vcvers-current
+}
 
 LICENSE="LGPL-3"
 SLOT="0"
 IUSE="$(
 	for a in $(parity-vcarchs); do echo "+vc_${a}"; done
-	for v in $(parity-vcvers); do echo "+vc${v}"; done
+	for v in $(parity-vcvers-legacy); do echo "vc${v}"; done
+	for v in $(parity-vcvers-current); do echo "+vc${v}"; done
 )"
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest
index 644d11554a80..8b168493e102 100644
--- a/sys-devel/patch/Manifest
+++ b/sys-devel/patch/Manifest
@@ -11,6 +11,5 @@ AUX patch-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch 860 B
 AUX patch-2.7.6-fix-error-handling-with-git-style-patches.patch 3582 BLAKE2B c443abb5112283aeb20db4ccf57c0d1241bfa586ad8d54d0ff2e1ae9026174f560df37dda1fedfc39db8178db05f77a4f94827ede80982311f475f460e4ae57f SHA512 1c05cf05b7348b86c878bd464a3f2f978b3e97655bf4f9aa83732af8bfd1e82046b88db39b7ce70e33ffc00c7f09c28ba777fba3fbd9538fd76767bfc396f382
 AUX patch-2.7.6-fix-test-suite.patch 2610 BLAKE2B e750283b85f0cb9d52324f28b8a03087980e8a61b16c3465914eeca65a3b800d8946a10c4dd0ab08b18c1cbc37810e55fb5c35314082a8c11e383b7d50d1bd3f SHA512 7ced1f9b937bf62131654d8a25c8d2a3f3cfe5fa8961e2e000542cce68061b10895bc0001ded898b9a43608af1f9c07903dc5c2f0a41662470d97188ed682115
 DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
-EBUILD patch-2.7.6-r3.ebuild 1298 BLAKE2B 877407aae8120af22287b88e18b6ee7c32b4b0a23b38b1d6d32aa59ead1b04f7d8c88255502200992a2f81b3de6ef4ce0034ecffebb331d94244e81df2fcfd1c SHA512 17273f1362407e6e3841e859329b80bed8bee532dc865f54e046f858cac2d7b7f92b3fe5aa2409b7bed8236ad15b7c55841ddea0db7d89238f3c6b21f4c8f179
-EBUILD patch-2.7.6-r4.ebuild 1685 BLAKE2B 64246ce2a49e6e8314a1adf051a4b5cb58bab797acc296ecacf5a602a26256e2870b96b52d6522faf10c543c4250eb04d24953581bc7b1c3900c998240155c69 SHA512 73d04bf12481de8f2476c40af3c8e499acc17fd48455494905b2f94ce5751266bc8dd0e8f353df5034d8d4ebb455d97b5b4a83e58575565c70500f02191646f0
+EBUILD patch-2.7.6-r4.ebuild 1679 BLAKE2B 7a5facb177d8ab7d160abc12abf4b1dadab2607f998d9bc53977757d27f3c9c33ab9c00a85062fe6b5d136675ddc895e9c47e0a30abdc51dde871652d8b88fac SHA512 51cdb683e5b0f239a4a0612503a2a6a1498a8686cf2540601fcc93a2bbdad42597388d2478c52926413653c7cb47d7f8da9cf70f50597039191e50db1aaee861
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild
deleted file mode 100644
index 6efd86348705..000000000000
--- a/sys-devel/patch/patch-2.7.6-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic
-
-DESCRIPTION="Utility to apply diffs to files"
-HOMEPAGE="https://www.gnu.org/software/patch/patch.html"
-SRC_URI="mirror://gnu/patch/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static test xattr"
-
-RDEPEND="xattr? ( sys-apps/attr )"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/ed )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-test-suite.patch
-	"${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch
-	"${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch
-	"${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch
-)
-
-src_configure() {
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		$(use_enable xattr)
-		--program-prefix="$(use userland_BSD && echo g)"
-	)
-	# Do not let $ED mess up the search for `ed` 470210.
-	ac_cv_path_ED=$(type -P ed) \
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild
index ef42ee0ed008..b480b40246ed 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"
diff --git a/sys-devel/prelink/Manifest b/sys-devel/prelink/Manifest
index d7d7bc7d6d33..2d88dd2dbad4 100644
--- a/sys-devel/prelink/Manifest
+++ b/sys-devel/prelink/Manifest
@@ -2,7 +2,7 @@ AUX prelink-20130503-libiberty-md5.patch 2604 BLAKE2B 4e6eb6cbcd91ea31a090eddb92
 AUX prelink-20130503-prelink-conf.patch 910 BLAKE2B 71049a340b7f2d01c3b68b417296023bac432581ee5d9569ab707b1f9c308947e9d515711bbc528d99594f079700655046e9ea773eb7165758408e124cdc3d9e SHA512 640fce42bac33d76a9ed312a138817695b57b03e7b0d1c57b074903739c3fb3b7c64b8c0d839687dd60fd50054d682f2f095c3f0eff7d5f4fe505d6c334267b2
 AUX prelink-armhf-dynamic-linker.patch 519 BLAKE2B 1cc1790256e9c9cfedccb200dbcfcacd61e6dfe5165c9703a1ccd098c0e5b07c4053b9da6a46a309242347e27478ab47b12c95bf3b9e83e6e6f19e118b97669b SHA512 af898440f11af102d6d4b95ade2ed267dc5e3e01407ded17ca2df7454ee845f8177c0316e9bc73838f3965f5000f58ac51055588fdb4a90293cc431e07e9e467
 AUX prelink.confd 1677 BLAKE2B 009d62e2b8342d9b1ee1f4a4f09ba290099071624c1d5165e672855a99a49537fb0791390bd7943ba15a082836f5ab985f93c95342b46364e1afff0497e39643 SHA512 d9edf2535d0b5f1effa797882abfc1cae71a4944e7a443880845a6f860d160125f2ab3a1d69db444e31a35b62a09ed661adcbc1ee62539e9a73f270d33602e9b
-AUX prelink.cron 2424 BLAKE2B 511745b46843015f61965b8f81c01b12fc54dc36e77a1649d07cf940d338083eaba178f752be4243c823b442b59bde2212bfc51f9e4fe52afe6354f05b514584 SHA512 0c336bcd3b77fabd978d637b4063bb88ac6a675ba910b374af0373a0a7567ecffd356bf5a5532d66fab119d975fd7cc4f3c359b46f2696d313388aa6eb140f7d
+AUX prelink.cron 2452 BLAKE2B 5e6ad6afd895c09e12e6bf1836e94fb3461e2184464f09c2afb31d45554a66ac14236f463568c644897c1b82404d4cb8f2c290bafd85dac4f001f39db07ab4ad SHA512 1123d01fb08fc943d21362d53ce7c1fa79e3997f3567e854982ced9cdd4a7b0e73d860401d09a35382ef7af9f246c9911aac182197a87938e6b3b0c178524151
 DIST prelink-20130503.tar.bz2 928040 BLAKE2B cb0e6fbff85b57c8698f22750377461e127bf89f6d03e6fab2338cc50dc280036ab5d1f56b0e8eed5ebaf391f8e3e0d3c32d9df6499fa17e2e556656ba13966d SHA512 69138a695e3e535deacd8224f6f8364ff64b8868b87b516d1f3392d9df968f77265177e9fede09c38f16aa878f9fd57a9ec39f0d9deabc0c9c01609b11156ba3
 DIST prelink-cross-20151030.tar.bz2 701337 BLAKE2B 4875b936254a03afd0eeb1ee81ee99f97a2d654b7c0379acb80ea3763412f3e892c366a9962ff3e1493bba9c83a8a140e79a1d5fb08b269a08ef596d63fd1d32 SHA512 75edd8617b95ae5bd3bfc968732ee142c968855c97c5b2b93784d3476a9724e0fd9a4eb7af681a5356616a4f023e24d5c5a2e75fb57e2a25b142cc901d9bfcaf
 DIST prelink.pdf 474129 BLAKE2B 6df5d4998d0822a8032c5dcd1103d7eafa8e9002f2cbfa8fa821131d7c804d2998100dc98d310ae3ae601137b6815435ecdd2684d547a8d25025984c20c06318 SHA512 86b7163fcf6f43d1764183b3dfc30aad8de99ce198b2721af276c81fc361e9f5fd8f4aea1e8e0c653f0566e8346dff4b4ba72909359167aa92c094f5561d2e1e
diff --git a/sys-devel/prelink/files/prelink.cron b/sys-devel/prelink/files/prelink.cron
index a3edc429fee7..067fc2ea97a2 100644
--- a/sys-devel/prelink/files/prelink.cron
+++ b/sys-devel/prelink/files/prelink.cron
@@ -55,7 +55,7 @@ fi
 echo /usr/sbin/prelink -av $PRELINK_OPTS > ${log}
 /usr/sbin/prelink -av $PRELINK_OPTS >> ${log} 2>&1 \
   || echo Prelink failed with return value $? >> ${log}
-# Restart init if needed
-[ -n "$(find `ldd /sbin/init | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
+# Restart init if needed (and if exists)
+[ -n "$(find `ldd /sbin/init 2>/dev/null | awk 'NF == 4 { print $3 }'` /sbin/init -ctime -1 2>/dev/null )" ] && /sbin/telinit u
 
 exit 0