gentoo resync : 25.08.2020

4 files changed, 4 insertions, 60 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index b69b4d8d67df..cd1e05a3a9b0 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,8 +1,6 @@
-DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
 DIST gcc-config-2.3.1.tar.xz 17368 BLAKE2B 59c77938b24cbbb548ef2f9e68be0de8c651f6beca74cf4e6007338f6217fa6e207c020f9a5e1c05c6abae24b9628fd193d0aeaaea28c6a1aac51e48b0145118 SHA512 7d7cdcd1aaaadb32e95227f61166b4390476d080e90387a167f031ef5c2c88dd3c785297946435500e39ed9bc31c0b5369cdacf1a12e75cd1786ba30bf7e407a
 DIST gcc-config-2.3.tar.xz 16736 BLAKE2B e8c22348d73ec756ebe377c3f9b0aca8e22b7ef53507bfa4dc0fbd459bca38ba6bea9dbb290b4d83239c21c913d12f8262a263e1c078a3997558a0b14fdf355d SHA512 4ce1e46bee6b2182c664746d939a7d843d5b4323c860ea3ee24e36aa629e65f3aa99da99905d4a7091ad0a3a37c14a6a56a0f79c76d6bc93fa0dad39552f221d
-EBUILD gcc-config-2.2.1.ebuild 1186 BLAKE2B c12aab5a9529bda5ad1a8d71598f8614428e494607651d26b510ccb14a5f612a2f114c8d40f9fdee1f4d62397891dc619bc60d7f54f1e987d1ad54f6b956a4a1 SHA512 ceb3d6b270f1bc0607b112dbb09faa27bc0584f1a35abcd770a4f3c2ac673b3a22ee3f3eaf6ac1073af66bac9802197bd408bee6a60c1dacd35350d04010cb6b
-EBUILD gcc-config-2.3.1.ebuild 1472 BLAKE2B 46db37d20da238fc05515c2bc000fcea6261b0f1651b6b8a20c19c2753fbde9661f2b4ba6380008bf144dbde6caf7787d62f935613e1f455a3dc6487c16141ca SHA512 ada2817124fa574984d12e3936db1286ecd57d92f11ac5423f2c8e211ee5f75ccc9819eff0b158b9eb9fa0a8962a524dfabee3d7ab8beb8d7d41ad533bd8cfb5
-EBUILD gcc-config-2.3.ebuild 1469 BLAKE2B 575e6c7fb71490f711ef3e73ad2ea48668c91f8fa0d5c17291c6a2e8f08efa934848a65faf365c6e16633c905512c386960fedfc5f6eb78f0fdbf121423f67ef SHA512 ddd2fef3990d4bf552b3055aa65a5102c5963ddf58c0210c6f199cff87842a72ab143fe3cf24bd2edde726429e285edeb4070603703bc3a42ba40552f8075c1c
+EBUILD gcc-config-2.3.1.ebuild 1465 BLAKE2B 24902450f20d7246bfbbea7b3a4bca4e5983065df853d26e54768900f4f9e99c0aa32db25839d14436028ec643d42a769118478070f2846e11876313f89fc00b SHA512 c4a86c9f10b53b978a5282121d75999db0b9452dc2c7e546dabddb725f327d20f5ae6058c18fa6d26182158b99cbdf9fef76d7c154615f90f1eee99ee7ccd271
+EBUILD gcc-config-2.3.ebuild 1468 BLAKE2B 8e21f53264dd75d7a419e940457565a9243265115f56538512f8deeea2b14cf4a703ac5d22ce69d41c7d1d5d1bed5311dc3a0057cdc8fd1f7c96c82b3cf60435 SHA512 5c9bc2b111f1a0eadb1605021291ef0b3bc266102502ca42a823befa687f1f37a7b2b70d0316b058c9036e2df4a6b70748744a6e0cd76bde13c2f3ef94f228a5
 EBUILD gcc-config-9999.ebuild 1527 BLAKE2B 9d1206cbf2823cfce941012aed05e30b7a782c241039d10589a20c5cd3db454fc73ea16f788994f95ad07d8b3877fc41b9e9a5ffb55a0a1f39bcaaabbd69540c SHA512 3145defe6cefa8757b10408b11fab862e3be943accdb7bc0871c33bf39ff71cea92e15e60c75f36a2c75199f7bbab612790ac3f79decc4db2498729876ef112b
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.2.1.ebuild b/sys-devel/gcc-config/gcc-config-2.2.1.ebuild
deleted file mode 100644
index defb04078d85..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.2.1.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 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-2.3.1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
index f18c030a06c7..e422852cc7cc 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild
index 9fc981c04a7c..dc82652e013b 100644
--- a/sys-devel/gcc-config/gcc-config-2.3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"