gentoo Easter resync : 12.04.2020

5 files changed, 7 insertions, 63 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index dc6f3f8d16bc..aeea35905bb2 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,8 +1,6 @@
 DIST gcc-config-2.1.tar.xz 15520 BLAKE2B 0e37762877116d90265a31cf6d9bc99da9b358afc26c0f7cb6fdbbb44dce23ebf59a1d5c2e481d456c03fbcc383efb7a56559af0bbd1f2bd78f407a853c88369 SHA512 0b19cb758a1e8c5e2e1f7901799fa1eb598d9d5c8d89ceace2e294ec569bfa90978bef72f52b9c2a3455f2ffd21be0899fb3e23b5fbdf62b70e978c153961272
 DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
-DIST gcc-config-2.2.tar.xz 15956 BLAKE2B c83c1e2584c42d5e6317e044fc6681f5006d9158ecb8d7127383a773e0b51fc2388aab9462088c087a877d77f8ee0631eb00b48b4ef13125af2bbb3871ea2582 SHA512 501d870488ebbeab2e704cab046b6432379c0dcf430fa24737fc97d9a0aa635e25fd4f7c0b7983f349ffd4c378b1971e4c8c82dc524b4916415985a6e0e7480b
-EBUILD gcc-config-2.1.ebuild 1187 BLAKE2B 8ccb39fdd56470671bb17b6b89a987ce215c13a43d6ad21be8f0da52271b95caf696bba65621fe9e3f6bf6bb317cc26814aca33b869e19e16a0fd07271d5ecd7 SHA512 306335a3c80850da82ef7e430e20819d098adab8902ed7795843689c33f362a430ad404ab32b12538ef64e2c62f0346e7058fba5368d780d05994e8bd1481ab8
-EBUILD gcc-config-2.2.1.ebuild 1199 BLAKE2B 907baa9a57b1691667ef09b8721bf9d53e84849b58ffd5a4e512067cd36f253d25e795397b636596b7efe2e4f7eb83938be9f81f31dd4b078070c01babf0ba00 SHA512 05e5d6053e8fc02d879dd882fa23c0fde1e0e6b0488ff640a443842fcda20f0633548bb245f7246502c0391669a0fd8be055a6126b4e24800a727049410ed1ec
-EBUILD gcc-config-2.2.ebuild 1190 BLAKE2B eb4b74f282309607dbb1d53973ad68634481a2578203518db9c8cae5af35fd60ad356a7469881b4a77374cf1e1c2cbdd2a3b547aacf20f2f1939a29e0baba78b SHA512 2b5d7d2086cfc3710571fae4b124be34111293c45906c23a106a0c07328cf3f4dcb403c9754639daf51602235af701b7c34ca6caf6aaf1ba4105b5dc59c4ec35
-EBUILD gcc-config-9999.ebuild 1195 BLAKE2B b5ec2af87244bfe98a13861e0114c12c72bf0adfc656e53fc425d88adce6c32700079ef5e03d469a0eb87bd77add159b5d453eaa2a6866deea8152e1fc38f842 SHA512 26bae4dfa89fcaeca9d9600eda7350b7cfec9239b9529b5e1cbfeadb2aef9ca2049a1253c306dfa09c7509c6dac806459250bbe3dbfd0c53ab684a6f4448c95c
+EBUILD gcc-config-2.1.ebuild 1185 BLAKE2B e0becacb2c2063d67c61a934a13cbb55c32f9b66ecaeb61d6648961d448c8b59bf56ecec972135af3b3d662d2db259e4ee50dadad6208174da66038e35da7b16 SHA512 fccf111223e65ed8ad8af762fc6b8b75a3c6917cd238f3562a5e7617a33bc8ddbd80480804aeae92091357897e4e376afeda1008c91213f8d4dad71d83f47dad
+EBUILD gcc-config-2.2.1.ebuild 1186 BLAKE2B c12aab5a9529bda5ad1a8d71598f8614428e494607651d26b510ccb14a5f612a2f114c8d40f9fdee1f4d62397891dc619bc60d7f54f1e987d1ad54f6b956a4a1 SHA512 ceb3d6b270f1bc0607b112dbb09faa27bc0584f1a35abcd770a4f3c2ac673b3a22ee3f3eaf6ac1073af66bac9802197bd408bee6a60c1dacd35350d04010cb6b
+EBUILD gcc-config-9999.ebuild 1191 BLAKE2B 5968b7ce726f124fdb75d485f0e0ed55f86b1d46df261824a5f71b4ed3738d1fb0565af51b11bdaad1ce0f9dec4afdf22d8072b228e51bdf8b9200fe4a01b001 SHA512 f65a73ea91c35638620f16c68768275dacfc5a47dc98b92ce9ee5c1c6477ea4d329321b1a9b1c96eb16989d1b30eceba2c5ed72769e7876047cc1897a0422e64
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index 96b1f1393f83..62349abc564c 100644
--- a/sys-devel/gcc-config/gcc-config-2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
index 14719662eb89..defb04078d85 100644
--- a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; 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"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc-config/gcc-config-2.2.ebuild b/sys-devel/gcc-config/gcc-config-2.2.ebuild
deleted file mode 100644
index 813b0267e422..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
-	inherit git-r3
-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"
-fi
-
-DESCRIPTION="Utility to manage compilers"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)" \
-		install
-}
-
-pkg_postinst() {
-	# Scrub eselect-compiler remains
-	rm -f "${ROOT}"/etc/env.d/05compiler &
-
-	# We not longer use the /usr/include/g++-v3 hacks, as
-	# it is not needed ...
-	rm -f "${ROOT}"/usr/include/g++{,-v3} &
-
-	# Do we have a valid multi ver setup ?
-	local x
-	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
-		gcc-config ${x}
-	done
-
-	wait
-}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index f79e8cf5bc76..c27a2a1f2a82 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"