Remove profiles for non-existent versions of gcc from /etc/eselect/compiler when we first install eselect-compiler.

Package-Manager: portage-2.1_rc3-r2

5 files changed, 14 insertions, 270 deletions

diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index dadaaf1e3226..3ee844a63e39 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -10,32 +10,25 @@ MD5 41ae1c7a156d13710a458bd1a70078f3 files/eselect-compiler-2.0.0_rc1-inherit.pa
 RMD160 67805308fc7dacb16730873b2cc72f902b0ed61f files/eselect-compiler-2.0.0_rc1-inherit.patch 645
 SHA256 b22f15cf016ee3e4314a88c148c3b2fd02fc97128a94af5eab0fb015939a61fe files/eselect-compiler-2.0.0_rc1-inherit.patch 645
 DIST compiler-config-2.0.0_rc1.tar.gz 117180 RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 SHA1 3a1a1605dd0e8b59ba5d796c4583244f46f97a03 SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2
-EBUILD eselect-compiler-2.0.0_rc1-r2.ebuild 3773 RMD160 fae03db56fed581d1f066fd519114ae4d7cdd8bc SHA1 e339bc5dae2ddd55b1bac173c676997d28a36760 SHA256 31becb85cd8fd8b6a25428c8cc23092a6a6d6cf014b5ddc621b56ca89e90e6a4
-MD5 2c81c4b0f3b6d850bd57cbd692925d9a eselect-compiler-2.0.0_rc1-r2.ebuild 3773
-RMD160 fae03db56fed581d1f066fd519114ae4d7cdd8bc eselect-compiler-2.0.0_rc1-r2.ebuild 3773
-SHA256 31becb85cd8fd8b6a25428c8cc23092a6a6d6cf014b5ddc621b56ca89e90e6a4 eselect-compiler-2.0.0_rc1-r2.ebuild 3773
-EBUILD eselect-compiler-2.0.0_rc1-r3.ebuild 3893 RMD160 e9b123a60b8c785eeb1e4f4910ea6c7b32c72877 SHA1 d7e42c810a82cc86091d32dab62e70f44348e5f9 SHA256 3f2c2bc5a261568b02278ab9fb6d0e4e46f59000307ce534902495dcd112ef6f
-MD5 0ae20a1af8e2db8ecd1e92536f9135d7 eselect-compiler-2.0.0_rc1-r3.ebuild 3893
-RMD160 e9b123a60b8c785eeb1e4f4910ea6c7b32c72877 eselect-compiler-2.0.0_rc1-r3.ebuild 3893
-SHA256 3f2c2bc5a261568b02278ab9fb6d0e4e46f59000307ce534902495dcd112ef6f eselect-compiler-2.0.0_rc1-r3.ebuild 3893
-MISC ChangeLog 4546 RMD160 8d48e2bf2344d7a5f96af195f9ed4fc26cf2b5dc SHA1 8202666ee3a26e6bf9be2c3005cbed83bc909ed9 SHA256 317c99ff9898932b36fcfbcdd755f63259ea3bc461c72fecd5682719168eaa29
-MD5 4aaf0ace187f73f037965368cd2dac19 ChangeLog 4546
-RMD160 8d48e2bf2344d7a5f96af195f9ed4fc26cf2b5dc ChangeLog 4546
-SHA256 317c99ff9898932b36fcfbcdd755f63259ea3bc461c72fecd5682719168eaa29 ChangeLog 4546
+EBUILD eselect-compiler-2.0.0_rc1-r4.ebuild 4246 RMD160 401573e619ddf4733541db40facb6f96b06041a5 SHA1 e37ba0b77a228eb8ddcf20b2aa6e36ba13f2c435 SHA256 485956da88c03fb2aa6429729ba512307dfea65580362a3b174c4ec04beee7e4
+MD5 fac84df6970f982ab7018f072a9afd58 eselect-compiler-2.0.0_rc1-r4.ebuild 4246
+RMD160 401573e619ddf4733541db40facb6f96b06041a5 eselect-compiler-2.0.0_rc1-r4.ebuild 4246
+SHA256 485956da88c03fb2aa6429729ba512307dfea65580362a3b174c4ec04beee7e4 eselect-compiler-2.0.0_rc1-r4.ebuild 4246
+MISC ChangeLog 4893 RMD160 087da48a75c1dd6ed4dcf7729bf687e84a8681f1 SHA1 ad0fbcc5fb01d874761be5e7daf81008926e2375 SHA256 a377aadaa85441cc970670570eec63ef16fd5820a93df76bcae459df7140d598
+MD5 36357866e3211fdee955476a6f39f43d ChangeLog 4893
+RMD160 087da48a75c1dd6ed4dcf7729bf687e84a8681f1 ChangeLog 4893
+SHA256 a377aadaa85441cc970670570eec63ef16fd5820a93df76bcae459df7140d598 ChangeLog 4893
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
-MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r2 277
-RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r2 277
-SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r2 277
-MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r3 277
-RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r3 277
-SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r3 277
+MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r4 277
+RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r4 277
+SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r4 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfrJGOpjtAl+gMRURAnoRAJ4jxriIDHni4pxeVMLX8g/yucy7LgCfcT1j
-DQJn06ZzrFpwAsU3+E9ZvXY=
-=PUPy
+iD8DBQFEfrZXOpjtAl+gMRURAqPjAKDHTqAB9r1/8AgayxZIdx1uJmTmGQCgrXj6
+XxrzjLQMhgmA4BNI1FE777c=
+=Yxko
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r2.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r2.ebuild
deleted file mode 100644
index 6b0270af3fc0..000000000000
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r2.ebuild,v 1.2 2006/05/27 06:37:53 halcy0n Exp $
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Utility to configure the active toolchain compiler"
-HOMEPAGE="http://www.gentoo.org/"
-
-MY_PN="compiler-config"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-SRC_URI=" http://dev.gentoo.org/~eradicator/toolchain/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="hardened"
-
-RDEPEND=">=app-admin/eselect-1.0_rc1"
-
-# We want to verify that compiler profiles exist for our toolchain
-pkg_setup() {
-	local abi
-	for abi in $(get_all_abis) ; do
-		local ctarget=$(get_abi_CHOST ${abi})
-		if ! grep -q "^[[:space:]]*ctarget=${ctarget}$" ${ROOT}/etc/eselect/compiler/*.conf ; then
-			eerror "We weren't able to find a valid eselect compiler profile for ${abi}."
-			eerror "Please do the following to re-emerge gcc, then retry emerging"
-			eerror "eselect-compiler:"
-			eerror "# emerge -v --oneshot sys-devel/gcc"
-
-			die "Missing eselect-compiler profile for ${abi}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	# Some toolchain.eclass installed confs had some bugs that need fixing
-	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
-	sed -i 's:spec=:specs=:g' ${ROOT}/etc/eselect/compiler/*
-
-	# Activate the profiles
-	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
-		ewarn "This looks like the first time you are installing eselect-compiler.  We are"
-		ewarn "activating toolchain profiles for the CTARGETs needed by your portage"
-		ewarn "profile You should have profiles installed from compilers that you emerged"
-		ewarn "after October, 2005. If a compiler you have installed is missing an"
-		ewarn "eselect-compiler profile, you can either re-emerge the compiler, create the"
-		ewarn "profile yourself, or you can migrate profiles from gcc-config-1.x by doing:"
-		ewarn "# eselect compiler migrate"
-		ewarn
-		ewarn "Note that if you use the migration tool, your current profiles will be"
-		ewarn "replaced, so you should backup the data in /etc/eselect/compiler first."
-		echo
-		einfo "The following profiles have been activated.  If an incorrect profile is"
-		einfo "chosen or an error is reported, please use 'eselect compiler set' to"
-		einfo "manually choose it"
-
-		local abi
-		for abi in $(get_all_abis) ; do
-			local ctarget=$(get_abi_CHOST ${abi})
-
-			local spec
-			if use hardened ; then
-				spec="hardened"
-			else
-				spec="vanilla"
-			fi
-
-			local isset=0
-			local tuple
-			for tuple in "${CHOST}" "${CTARGET}" "${ctarget}" ; do
-				local version
-				for version in "$(gcc-fullversion)" ; do
-					local profile
-					for profile in "${abi}-${spec}" "${spec}" "${abi}-default" "default" "${abi}-vanilla" "vanilla" ; do
-						if eselect compiler set ${tuple}-${version}/${profile} &> /dev/null ; then
-							einfo "${abi}: ${tuple}-${version}/${profile}"
-
-							isset=1
-							break
-						fi
-					done
-					[[ ${isset} == 1 ]] && break
-				done
-				[[ ${isset} == 1 ]] && break
-			done
-
-			if [[ ${isset} == 0 ]] ; then
-				eerror "${abi}: Unable to determine an appropriate profile.  Please set manually."
-			fi
-		done
-	else
-		eselect compiler update
-	fi
-
-	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
-		echo
-		ewarn "You should source /etc/profile in your open shells."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-inherit.patch
-}
-
-src_install() {
-	dodoc README
-	make DESTDIR="${D}" install || die
-
-	doenvd ${FILESDIR}/25eselect-compiler
-
-	# This is installed by sys-devel/gcc-config
-	rm ${D}/usr/bin/gcc-config
-}
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild
deleted file mode 100644
index 6afde0269c6a..000000000000
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r3.ebuild,v 1.1 2006/06/01 09:24:12 eradicator Exp $
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Utility to configure the active toolchain compiler"
-HOMEPAGE="http://www.gentoo.org/"
-
-MY_PN="compiler-config"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-SRC_URI=" http://dev.gentoo.org/~eradicator/toolchain/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="hardened"
-
-RDEPEND=">=app-admin/eselect-1.0_rc1"
-
-# We want to verify that compiler profiles exist for our toolchain
-pkg_setup() {
-	local abi
-	for abi in $(get_all_abis) ; do
-		local ctarget=$(get_abi_CHOST ${abi})
-		if ! grep -q "^[[:space:]]*ctarget=${ctarget}$" ${ROOT}/etc/eselect/compiler/*.conf ; then
-			eerror "We weren't able to find a valid eselect compiler profile for ${abi}."
-			eerror "Please do the following to re-emerge gcc, then retry emerging"
-			eerror "eselect-compiler:"
-			eerror "# emerge -v --oneshot sys-devel/gcc"
-
-			die "Missing eselect-compiler profile for ${abi}"
-		fi
-	done
-}
-
-pkg_postinst() {
-	# Some toolchain.eclass installed confs had some bugs that need fixing
-	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
-	sed -i 's:spec=:specs=:g' ${ROOT}/etc/eselect/compiler/*
-
-	# Activate the profiles
-	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
-		ewarn "This looks like the first time you are installing eselect-compiler.  We are"
-		ewarn "activating toolchain profiles for the CTARGETs needed by your portage"
-		ewarn "profile You should have profiles installed from compilers that you emerged"
-		ewarn "after October, 2005. If a compiler you have installed is missing an"
-		ewarn "eselect-compiler profile, you can either re-emerge the compiler, create the"
-		ewarn "profile yourself, or you can migrate profiles from gcc-config-1.x by doing:"
-		ewarn "# eselect compiler migrate"
-		ewarn
-		ewarn "Note that if you use the migration tool, your current profiles will be"
-		ewarn "replaced, so you should backup the data in /etc/eselect/compiler first."
-		echo
-		einfo "The following profiles have been activated.  If an incorrect profile is"
-		einfo "chosen or an error is reported, please use 'eselect compiler set' to"
-		einfo "manually choose it"
-
-		local abi
-		for abi in $(get_all_abis) ; do
-			local ctarget=$(get_abi_CHOST ${abi})
-			local extra_options=""
-
-			if [[ ${abi} == ${DEFAULT_ABI} ]] ; then
-				extra_options="-n"
-			fi
-
-			local spec
-			if use hardened ; then
-				spec="hardened"
-			else
-				spec="vanilla"
-			fi
-
-			local isset=0
-			local tuple
-			for tuple in "${CHOST}" "${CTARGET}" "${ctarget}" ; do
-				local version
-				for version in "$(gcc-fullversion)" ; do
-					local profile
-					for profile in "${abi}-${spec}" "${spec}" "${abi}-default" "default" "${abi}-vanilla" "vanilla" ; do
-						if eselect compiler set ${tuple}-${version}/${profile} ${extra_options} &> /dev/null ; then
-							einfo "${abi}: ${tuple}-${version}/${profile}"
-
-							isset=1
-							break
-						fi
-					done
-					[[ ${isset} == 1 ]] && break
-				done
-				[[ ${isset} == 1 ]] && break
-			done
-
-			if [[ ${isset} == 0 ]] ; then
-				eerror "${abi}: Unable to determine an appropriate profile.  Please set manually."
-			fi
-		done
-	else
-		eselect compiler update
-	fi
-
-	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
-		echo
-		ewarn "You should source /etc/profile in your open shells."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-inherit.patch
-}
-
-src_install() {
-	dodoc README
-	make DESTDIR="${D}" install || die
-
-	doenvd ${FILESDIR}/25eselect-compiler
-
-	# This is installed by sys-devel/gcc-config
-	rm ${D}/usr/bin/gcc-config
-}
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r2 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r2
deleted file mode 100644
index e5670a7296b1..000000000000
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b67d2f339f159da455d19c49e4868d9c compiler-config-2.0.0_rc1.tar.gz 117180
-RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 compiler-config-2.0.0_rc1.tar.gz 117180
-SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2 compiler-config-2.0.0_rc1.tar.gz 117180
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3
deleted file mode 100644
index e5670a7296b1..000000000000
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b67d2f339f159da455d19c49e4868d9c compiler-config-2.0.0_rc1.tar.gz 117180
-RMD160 dbcd8120139c75f40ae2405746ab2a5f26e810b4 compiler-config-2.0.0_rc1.tar.gz 117180
-SHA256 a911a7b0a1184c576500df8530e77823f976dce387001c581ba89ac8edfe30c2 compiler-config-2.0.0_rc1.tar.gz 117180