gentoo resync : 30.05.2020

4 files changed, 84 insertions, 15 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 663e43b36ad4..5df6a4db7e22 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.2.1.tar.xz 16292 BLAKE2B bed319b73bb1dd1c693715654dab7d16c12929353eb28c6e93ffeda0d4539d8204e84287c58de65ed5198011130a6e0ef71421cf41e7cf59cc48781a94ec9af2 SHA512 783caf2f4236d7c84e7c76c2d001d069a1b8544644d7e6e12b79f4dc55f34c953a24a8cd8d01b2aa69fa7f8e02ec3380e0e33a83eda6b3cb00e8c43d2f69f673
+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-9999.ebuild 1191 BLAKE2B 5968b7ce726f124fdb75d485f0e0ed55f86b1d46df261824a5f71b4ed3738d1fb0565af51b11bdaad1ce0f9dec4afdf22d8072b228e51bdf8b9200fe4a01b001 SHA512 f65a73ea91c35638620f16c68768275dacfc5a47dc98b92ce9ee5c1c6477ea4d329321b1a9b1c96eb16989d1b30eceba2c5ed72769e7876047cc1897a0422e64
-MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
+EBUILD gcc-config-2.3.ebuild 1477 BLAKE2B 54a4304c340b7841be69e7308ff3c9d1b3c4db050fdbfd51313e47ee98e6daba6d9656264193f5c0997159ba0cc88c5eeaeaf0f6c01b53aa8ddf04cea2f2d5f4 SHA512 b4f845afe3380107f7444cbf1d18b7ab00946e0b2e3853f4eeb368c655b5a920217a137d0440cfc610a035f1484d02499d17a381a212994e59e0bc29eb305edf
+EBUILD gcc-config-9999.ebuild 1477 BLAKE2B 54a4304c340b7841be69e7308ff3c9d1b3c4db050fdbfd51313e47ee98e6daba6d9656264193f5c0997159ba0cc88c5eeaeaf0f6c01b53aa8ddf04cea2f2d5f4 SHA512 b4f845afe3380107f7444cbf1d18b7ab00946e0b2e3853f4eeb368c655b5a920217a137d0440cfc610a035f1484d02499d17a381a212994e59e0bc29eb305edf
+MISC metadata.xml 419 BLAKE2B 5dda1b92bb225b4a887de96721c7f8913e7ae26e0780bb0dabb875b0ee6993ec118b01c085bfa8e2d7ad824b23b561caa8a1bba443728832809242380dcde77c SHA512 7735c88b13f8ea1f076ca4344737d4d1200343e298ab37ceeeba0ff4651af7987140e541136bbdbb9feb75802e1b57f48c7b6c53bf684cd542f06adeeba5c562
diff --git a/sys-devel/gcc-config/gcc-config-2.3.ebuild b/sys-devel/gcc-config/gcc-config-2.3.ebuild
new file mode 100644
index 000000000000..e2c270403dd3
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.3.ebuild
@@ -0,0 +1,59 @@
+# 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="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="+native-symlinks"
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PV="${PV}" \
+		SUBLIBDIR="$(get_libdir)" \
+		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-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index c27a2a1f2a82..e2c270403dd3 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -9,23 +9,23 @@ 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/~dilfridge/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	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=""
+IUSE="+native-symlinks"
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		PV="${PV}" \
-		SUBLIBDIR="$(get_libdir)"
+		SUBLIBDIR="$(get_libdir)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)"
 }
 
 src_install() {
@@ -37,12 +37,14 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Scrub eselect-compiler remains
-	rm -f "${ROOT}"/etc/env.d/05compiler &
+	# 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 ...
-	rm -f "${ROOT}"/usr/include/g++{,-v3} &
+	# To be removed in 2021.
+	rm -f "${ROOT}"/usr/include/g++{,-v3}
 
 	# Do we have a valid multi ver setup ?
 	local x
@@ -50,5 +52,8 @@ pkg_postinst() {
 		gcc-config ${x}
 	done
 
-	wait
+	# 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/metadata.xml b/sys-devel/gcc-config/metadata.xml
index e396f3755977..33e9604b0414 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="native-symlinks">Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.</flag>
+	</use>
 </pkgmetadata>