gentoo resync : 05.12.2021

4 files changed, 75 insertions, 16 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index ba90fdb68935..368520e0305b 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,4 +1,6 @@
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
-EBUILD gcc-config-2.4.ebuild 1272 BLAKE2B 31e191e6b22c9cd3487f4c19313d1494c53d6723a98fc8de8d166e660cc9971ef9b67c1c59a40b28ddd84ff48120d13c7483cc16b3d19ffb756a968158e3e222 SHA512 68251bfc3a5bd36393fba65ba49ed7f4eb7a758960ae68f0ba52b4eb18f79bdd016e137df5a02b5ec1a5094591a47ca121cf5688f87581136c3ea86fa62b1756
-EBUILD gcc-config-9999.ebuild 1525 BLAKE2B b4a52226ab76034d1af330a90408276a107e01cdfa727050b84e76392b3179688d37c11cb3de6c7295a66373095dfcfa7481121cd2d1de0b52697b235020fd73 SHA512 26017e3c01a1ce72795ffeb194c8893fe9161c514b32ef686068cb2b33e204b85418b4b5ec349b20427d304c0e1b285caa205268a4caccb1af5ae6d816438555
+DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83
+EBUILD gcc-config-2.4.ebuild 1248 BLAKE2B f37d9bc45e4b934ff696719aa437076c514f477b2eced5f1c2c46c71145c072be1be89aa8396c6495d2e8a914c60567d3ad2fe7a89bbdd2c3b2af70e440a6b87 SHA512 89646c3f10a395dd703bed306b64ba19920b82513aec1d88d450c839a1b34e39d839f3296d97a37e76d8f60612b9480a1133f8424813bf78ab9abcf55e392b5f
+EBUILD gcc-config-2.5-r1.ebuild 1672 BLAKE2B cef3f7b2430791ec1947ccdb3bff48697789d7f7d855b2e76030e11a6f1cbf8325c77794cbda9c02e2f406e31df1014536566b3a9b8e54778491b2ad765ebbc4 SHA512 412e883870259486d752f1285cabfe0538cae24c61bf8d6137af93e04c6dec042104ddf99ae1b61bf064801bc1aabae83a257dd981634a2fbc71e67af52f01fb
+EBUILD gcc-config-9999.ebuild 1672 BLAKE2B cef3f7b2430791ec1947ccdb3bff48697789d7f7d855b2e76030e11a6f1cbf8325c77794cbda9c02e2f406e31df1014536566b3a9b8e54778491b2ad765ebbc4 SHA512 412e883870259486d752f1285cabfe0538cae24c61bf8d6137af93e04c6dec042104ddf99ae1b61bf064801bc1aabae83a257dd981634a2fbc71e67af52f01fb
 MISC metadata.xml 533 BLAKE2B 09d7ad23670553dc578f92d35dddd92b9421d7ef75e8920498bb16e451cce64a626a7479ece4c1ae1f8d7b67b5cd79c7033d0cf87cd48a788639b6f746fda5cc SHA512 ce12b8cbbe543ee3a1f51cd06c577ec5e99f48863445053858f36ae50ea68e1100da598dd44cef787de0cce8ad392350f95e7fd9071b70aa488a0d31cce7e22c
diff --git a/sys-devel/gcc-config/gcc-config-2.4.ebuild b/sys-devel/gcc-config/gcc-config-2.4.ebuild
index 7eccdffac24f..1d9d5647b2f3 100644
--- a/sys-devel/gcc-config/gcc-config-2.4.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.4.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit toolchain-funcs
-
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
 	inherit git-r3
@@ -15,6 +13,7 @@ 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"
diff --git a/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
new file mode 100644
index 000000000000..67c6a7ee6316
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/~sam/distfiles/${CATEGORY}/${PN}/${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() {
+	# 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
+
+	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
+		# Warn about obsolete /usr/bin/gcj for bug #804178
+		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
+		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
+		ewarn "If you have no idea what this means, please delete the file:"
+		ewarn " rm ${EROOT}/usr/bin/gcj"
+	fi
+}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index a2b5cb735263..67c6a7ee6316 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -3,18 +3,17 @@
 
 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/~sam/distfiles/${P}.tar.xz"
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${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"
@@ -40,15 +39,6 @@ src_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
@@ -59,4 +49,12 @@ pkg_postinst() {
 	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
 		eselect compiler-shadow update all
 	fi
+
+	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
+		# Warn about obsolete /usr/bin/gcj for bug #804178
+		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
+		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
+		ewarn "If you have no idea what this means, please delete the file:"
+		ewarn " rm ${EROOT}/usr/bin/gcj"
+	fi
 }