gentoo resync : 22.05.2021

3 files changed, 2 insertions, 66 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index afcd74b81a1e..0e0fdca50a49 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,6 +1,4 @@
-DIST gcc-config-2.3.2.tar.xz 17444 BLAKE2B c66fd121770dddcb27033be228de691f766f1acd9ada9580ae96dc12f6fbd0cd823e6656dc9b0515d498305b10d72f9cd87cf69388791971e9eac1a20e3f97c9 SHA512 31327d9abd26fdadaaf25a63568fd860ae25030b4a99dcbf0424f2d8fb14e61f041e681eea90c781a3f4e5401e3a7ba3299b1260ceb6e51bda5bef24f65dcacc
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
-EBUILD gcc-config-2.3.2-r1.ebuild 1520 BLAKE2B 4698418cb48a7a0ecf79196b15f87eb13846add959fe1f43cd91694853bba029e7b7df27d8ed91ec8952d574851b027ad6b5ea1dc6646419e9e44fd6e5077163 SHA512 248c692001923d026985c59140a959737466309c098ca1d053b2ea8d4ecd6c568a766d291ec11b32426645a08f707ded3fa3da5b3d8feea29d2fe230264acc68
-EBUILD gcc-config-2.4.ebuild 1277 BLAKE2B 2d278e677f9731a57e68abb8682f4db48497e41fa7c89381b0dd51883f7800b14461b0900b8bc0e4eb1b75cb0c7bbdba55f0ca348efb8bbc75d155a98e4f55b2 SHA512 04ff5dbe62dd50cfd9afc219d0ff819757588dead3e58954e514dfc6fa6a5cebac6c982476580531135ead23272c233a6632128d4207c46fc11cc196253be220
+EBUILD gcc-config-2.4.ebuild 1275 BLAKE2B b6340119be04417ad3445d2004ea0bbf9502da36b46dd2142790a434700a6bedde3b42142b5905903ba00456ed90849a07da276f35c7d4789066a7aa8de2ac9f SHA512 1d1d4047dd123be6869cbf912a331f960d48f292ded426f05000da11b01ddfb256918bfecc890dc3ed71c1d0f242d27c0b0910deb418d82905b0d7ff96beec57
 EBUILD gcc-config-9999.ebuild 1528 BLAKE2B 2748dbbcd43c80df61ee32e744059d421691298f696d3db52d51bc8084b72da0971df1bbc22a224713690268453585e9d84ab57de94c6ba7fb25d9807c049986 SHA512 bd50f91b0ea31a175ba83180db0bfb6e3252f8c3afcfe64fe11d4abb7721accb6aebc49288fc9ee4989539adae5fa82fcbc41c0f042c7a625ab600b47806fe52
 MISC metadata.xml 532 BLAKE2B f2ce0b655376a7a6a31520f557917b4a6e2036ceec6726d869f795b6fff0a97fa27b7e13b7a41b6ea1b83ff67b9e3ef4ea12c0a8058911007da92f986c0f8265 SHA512 f2dc77e3d2301f3fadc24ceba33894ee8fd07831496b04e3513369906e101c155c7cb10cf81a4a08628514db5758368a64b0b4eb37c41f7f8fe4942f90b11935
diff --git a/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild b/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild
deleted file mode 100644
index 41607b404c0c..000000000000
--- a/sys-devel/gcc-config/gcc-config-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 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="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="+cc-wrappers +native-symlinks"
-
-RDEPEND=">=sys-apps/gentoo-functions-0.10"
-
-_emake() {
-	emake \
-		PV="${PVR}" \
-		SUBLIBDIR="$(get_libdir)" \
-		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
-		USE_NATIVE_LINKS="$(usex native-symlinks)" \
-		TOOLCHAIN_PREFIX="${CHOST}-" \
-		"$@"
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	# Scrub eselect-compiler remains.
-	# To be removed in 2021.
-	rm -f "${ROOT}"/etc/env.d/05compiler
-
-	# We not longer use the /usr/include/g++-v3 hacks, as
-	# it is not needed ...
-	# To be removed in 2021.
-	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
-
-	# USE flag change can add or delete files in /usr/bin worth recaching
-	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-}
diff --git a/sys-devel/gcc-config/gcc-config-2.4.ebuild b/sys-devel/gcc-config/gcc-config-2.4.ebuild
index 786a945b65f3..2a704b191de1 100644
--- a/sys-devel/gcc-config/gcc-config-2.4.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.4.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"