Added env.d entry for CONFIG_PROTECT_MASK. Just tell new users about 'eselect compiler migrate' rather than use it since most users will probably already have eselect-compiler profiles installed, and those are superior to the migrated ones. Added logic to choose the compiler during the first install.

Package-Manager: portage-2.1_rc2-r2

3 files changed, 18 insertions, 77 deletions

diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 6af36729322d..4258067fe384 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -1,30 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 25eselect-compiler 44 RMD160 0792a5df6708dba634e2a33f6c1baa580637f031 SHA1 b8e52e7f30d30cde19e96e1c6ae4138f5b384b1a SHA256 20bd17134dd852bd5fecd8b344e132445672f350614a7280e34b322ae8898507
+MD5 19c86a8070333c2a4eb2782a94c99dc0 files/25eselect-compiler 44
+RMD160 0792a5df6708dba634e2a33f6c1baa580637f031 files/25eselect-compiler 44
+SHA256 20bd17134dd852bd5fecd8b344e132445672f350614a7280e34b322ae8898507 files/25eselect-compiler 44
 AUX eselect-compiler-2.0.0_rc1-inherit.patch 645 RMD160 67805308fc7dacb16730873b2cc72f902b0ed61f SHA1 eb74337d333b818daf9444ac14f1bb7fa9183e17 SHA256 b22f15cf016ee3e4314a88c148c3b2fd02fc97128a94af5eab0fb015939a61fe
 MD5 41ae1c7a156d13710a458bd1a70078f3 files/eselect-compiler-2.0.0_rc1-inherit.patch 645
 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-r1.ebuild 1722 RMD160 22f7ab821b04dfd740f3a713f6a6f55b33e272a0 SHA1 4c0abc7245dc6f10d74dcb15841ee68c45ebd7ed SHA256 583a06ffac959a5f8be6b37c283a0d5858c9a7ab3ac4b6c516ae6c28da57fbac
-MD5 684d89675cacb696db1b80ce021e5d75 eselect-compiler-2.0.0_rc1-r1.ebuild 1722
-RMD160 22f7ab821b04dfd740f3a713f6a6f55b33e272a0 eselect-compiler-2.0.0_rc1-r1.ebuild 1722
-SHA256 583a06ffac959a5f8be6b37c283a0d5858c9a7ab3ac4b6c516ae6c28da57fbac eselect-compiler-2.0.0_rc1-r1.ebuild 1722
-MISC ChangeLog 3781 RMD160 f3cd5d4d04768b07ff03d09d089a582cd173107f SHA1 83f7819731ca4efb011334e4da8a0d70af5f31a1 SHA256 20ef05b7bf94ca5ecc2f2a897ba5b08424bb8c72e552f3c8d9dd80d00d6a10f2
-MD5 1292cf518aa0b589f74f5db2f6932f6a ChangeLog 3781
-RMD160 f3cd5d4d04768b07ff03d09d089a582cd173107f ChangeLog 3781
-SHA256 20ef05b7bf94ca5ecc2f2a897ba5b08424bb8c72e552f3c8d9dd80d00d6a10f2 ChangeLog 3781
+EBUILD eselect-compiler-2.0.0_rc1-r2.ebuild 3904 RMD160 ad786a56ad554c7f07e51cf0a9d0391b422c4c3b SHA1 2946ff6b874bc62ef8be875157cc76a82e292d4a SHA256 5d072fa45805c2d6203eb0521763436e63a17ca26f0b72d74739b31fb34302b2
+MD5 7731fc29f0eb86d217d68c796091d25d eselect-compiler-2.0.0_rc1-r2.ebuild 3904
+RMD160 ad786a56ad554c7f07e51cf0a9d0391b422c4c3b eselect-compiler-2.0.0_rc1-r2.ebuild 3904
+SHA256 5d072fa45805c2d6203eb0521763436e63a17ca26f0b72d74739b31fb34302b2 eselect-compiler-2.0.0_rc1-r2.ebuild 3904
+MISC ChangeLog 4307 RMD160 9eb18d8ab7f2c95be0b75716332463fc8d946c85 SHA1 016fdbd2e933bfafca7bd9f7c16ada5c966bf099 SHA256 e26bd448c81f5d53c8f8bba594f31e5088cf395bb3fe1c85f79e32ffeaaac57b
+MD5 b320bf0f3389c9672a03ca3e789b0bd0 ChangeLog 4307
+RMD160 9eb18d8ab7f2c95be0b75716332463fc8d946c85 ChangeLog 4307
+SHA256 e26bd448c81f5d53c8f8bba594f31e5088cf395bb3fe1c85f79e32ffeaaac57b ChangeLog 4307
 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-r1 277
-RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r1 277
-SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r1 277
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEdwr5AiZjviIA2XgRApRGAJ9gs1v7lDAkl69SALb0mOiRJuvd0gCfbba7
-3omp8CBvfpWdmanHI9RmXwM=
-=Cecy
+iD8DBQFEd38cOpjtAl+gMRURAii4AJ9oARZFGXodcLMuy6qAQoMDfWth4gCgm9k8
+cmwXnUP05zxsBvcx4UM+zbY=
+=EKwy
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r1.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r1.ebuild
deleted file mode 100644
index bc7caccbf051..000000000000
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,60 +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-r1.ebuild,v 1.3 2006/05/26 14:04:35 flameeyes Exp $
-
-inherit eutils
-
-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=""
-
-RDEPEND=">=app-admin/eselect-1.0_rc1"
-
-pkg_postinst() {
-	# Some toolchain.eclass installed confs aren't quite right
-	sed -i 's:chost:ctarget:g' ${ROOT}/etc/eselect/compiler/*
-	sed -i 's:spec=:specs=:g' ${ROOT}/etc/eselect/compiler/*
-
-	# Migrate from the old configs
-	if [[ ! -f "${ROOT}/etc/eselect/compiler/selection.conf" ]] ; then
-		# Migrate isn't smart enough to handle the toolchain.eclass
-		# installed confs.
-		# This should be fixed before it comes out of beta and p.m.
-		rm -f ${ROOT}/etc/eselect/compiler/*.conf
-		eselect compiler migrate
-	fi
-
-	# Update the wrappers
-	eselect compiler update
-
-	if rm -f ${ROOT}/etc/env.d/05gcc* &> /dev/null ; then
-		ewarn "You should source /etc/profile in your open shells."
-	fi
-
-	ewarn "Thanks for beta testing eselect-compiler.  If you have any problems,"
-	ewarn "please contact eradicator@gentoo.org."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-inherit.patch
-}
-
-src_install() {
-	dodoc README
-	make DESTDIR="${D}" install || die
-
-	# 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-r1 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r1
deleted file mode 100644
index e5670a7296b1..000000000000
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r1
+++ /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