gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 47 deletions

diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 50e3dd635ef6..6bf68b6298bd 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,7 +3,6 @@ AUX binutils-config-5.1 12386 BLAKE2B 23ea0165db58116fc2e8655f09a094e8dfc2cad51d
 AUX binutils-config-5.2 11716 BLAKE2B cff36d78c6d872c329cd63a9cb5c03e4c30a2dde8ae148b0392aba0157313daf9cf1772edc5a56a6ac633bdb9d677339fa6c3ad828b57902f5af27e7dd30eada SHA512 083352834377abac7cecd412f89ead22f132244241ec643272c14c74f458b5db0ddf5fd539024df29fe32b3e654058044158cb497290a77d5cc4a20c1a9bc2cc
 AUX binutils-config.8 2710 BLAKE2B 1ed19de7f8e4552da3e13dbb99db2ad3b4c56b7d136b17dea76bf39c5e3621f58d85a9f59f39a4f8ba0aaa7b72bcfdd4aece660875b8c19477e9f99f7a22972c SHA512 185b3cd1a213afb6bd00efe59e081fb1839a8a795a8db93206ef556b0efda741a3e1b36a10d28b662aba340eb86cc73e3b94b4d0b05325104fafade295281455
 AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf32116d44cfdfc8ce3de5f90f7ad122e0b86b85d64d3ad5c5ae1c4819d8088ef7fd528b9c202ecb4a6 SHA512 105d2c50fbe2a988e669810db3f2d278cb70c24ee85a16c85a3f63c6e8e9e32bd91f430e4f9ec347e0ccb1a88ca4edb2eba9cbda73356e44d0871cb7ab9eb203
-EBUILD binutils-config-5-r4.ebuild 1088 BLAKE2B b719611d2f52024c32338593b217ba58293f3de0d8ab8dd986e22a38cbb3e8e7c8266756e6a0e5ca6fa45b3eca0ebf5f20efee203f304b283cefadc42df67223 SHA512 31a38db5c9afeeaaa228f26b8881734cf696ab4c79ec207d16cd6d9ce45697da53f3dcb826b70c7999b301e362b1a7308bf9164c0adb252ca858c68abeaa9f5b
-EBUILD binutils-config-5.1-r1.ebuild 1093 BLAKE2B 28652f565c8f965d0d25e799a00d61a8db7b920e888307e1ed70219842c3055ab3e29f8bbb1d855ba4323766b7e0556417d85deb3fb8fd7a73fb6853227b4d54 SHA512 739ed7fc0aef158a2e0eb5c0ba8ab2e0a53df92dda121c0ab4fc4a38308e7b837482c158faa7f060568e3ceee00a7933feecd6a4f181e6a873ba7c42506ef1a6
-EBUILD binutils-config-5.2.ebuild 1096 BLAKE2B 55c1b3bac2602025fbb78de16095ef210cac15d33c9cfae061ace625f3525d556d5e315366558eb989d2509ee735ca8fd9f5b09a1de09ff42e686c93d01e74dd SHA512 0f1f18371ee118baeada46f2ef13b78f212fa15a947321b0d9b1007a317547265f30908c56c8a975166f6a9dbd82cc672afc85e0c0efd1c4ce8226fcbb29c4a2
+EBUILD binutils-config-5.1-r1.ebuild 1091 BLAKE2B 72fea36252e65ba46c07fe779e107fc0ccc5e87f142ec8ac666f928c79f9509da5ec2ac668d31fc5cfc37ec66de375c5a1a89f845ee7fd0e85eb13a6554f66e9 SHA512 fb9e97f2ebbbd3446c15ac934b2bf321cec7f1ecadeb5bf9f98116ba6e019dd4fd0e222d043871643341871e6c9bc123b968f926f50e84ef86af50d4625509c2
+EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/binutils-config/binutils-config-5-r4.ebuild b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
deleted file mode 100644
index 0e40b27ac6a5..000000000000
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit prefix
-
-DESCRIPTION="Utility to change the binutils version being used"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Toolchain"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# We also RDEPEND on sys-apps/findutils which is in base @system
-RDEPEND="sys-apps/gentoo-functions"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin "${FILESDIR}"/${PN}-${PV} ${PN}
-	use prefix && eprefixify "${ED}"/usr/bin/${PN}
-	sed -i "s:@PV@:${PVR}:g" "${ED}"/usr/bin/${PN} || die
-	doman "${FILESDIR}"/${PN}.8
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/binutils.eselect
-}
-
-pkg_preinst() {
-	# Force a refresh when upgrading from an older version that symlinked
-	# in all the libs & includes that binutils-libs handles. #528088
-	if has_version "<${CATEGORY}/${PN}-5" ; then
-		local bc current
-		bc="${ED}/usr/bin/binutils-config"
-		if current=$("${bc}" -c) ; then
-			"${bc}" "${current}"
-		fi
-	fi
-}
diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index d124f18c027d..ae14aaa4c5c3 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system
diff --git a/sys-devel/binutils-config/binutils-config-5.2.ebuild b/sys-devel/binutils-config/binutils-config-5.2.ebuild
index f06a03d13692..855d88b035e3 100644
--- a/sys-devel/binutils-config/binutils-config-5.2.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system