Run env-update after updating /etc/env.d file.

Package-Manager: portage-2.1_rc4-r4

3 files changed, 18 insertions, 182 deletions

diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index dbdedff6a508..e3f6e9a1800c 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -5,30 +5,34 @@ AUX 25eselect-compiler 44 RMD160 0792a5df6708dba634e2a33f6c1baa580637f031 SHA1 b
 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-env-update.patch 439 RMD160 0a373b6496244cbfc00bbf779e276a54a2c560c5 SHA1 ddbe72b47078d4483489e0c396f9cae47d2b9f38 SHA256 ad6edea6add9c81e731357b498a83ff1d57b5a7d245c3feb7f1b69acd93cbb38
+MD5 cd7b6f440dd26f13302e9d856e73dd21 files/eselect-compiler-2.0.0_rc1-env-update.patch 439
+RMD160 0a373b6496244cbfc00bbf779e276a54a2c560c5 files/eselect-compiler-2.0.0_rc1-env-update.patch 439
+SHA256 ad6edea6add9c81e731357b498a83ff1d57b5a7d245c3feb7f1b69acd93cbb38 files/eselect-compiler-2.0.0_rc1-env-update.patch 439
 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-r5.ebuild 5031 RMD160 25a7b021fb6195b2361f2757847438d4b556eb28 SHA1 5b3c2060576ed97b9d07a13b4ba630710212f604 SHA256 71c1d8edc4043dcb6c478126e3cb7bf53a7861971f5128902fc710b4a1083ec8
-MD5 ed0054129b8b5025c8ff833ad7be3552 eselect-compiler-2.0.0_rc1-r5.ebuild 5031
-RMD160 25a7b021fb6195b2361f2757847438d4b556eb28 eselect-compiler-2.0.0_rc1-r5.ebuild 5031
-SHA256 71c1d8edc4043dcb6c478126e3cb7bf53a7861971f5128902fc710b4a1083ec8 eselect-compiler-2.0.0_rc1-r5.ebuild 5031
-MISC ChangeLog 5747 RMD160 e26e0a6b3cd1a825a87464d624d26e4005404cb5 SHA1 751dc14627cb7d47d0b8989c08b8066e69291a2e SHA256 7aea692df5bd2ebb3210f12620a4265e7e211a9d3d5352b2f7cd311cc82a706f
-MD5 57d502daf03f628828f92684aaa50d4b ChangeLog 5747
-RMD160 e26e0a6b3cd1a825a87464d624d26e4005404cb5 ChangeLog 5747
-SHA256 7aea692df5bd2ebb3210f12620a4265e7e211a9d3d5352b2f7cd311cc82a706f ChangeLog 5747
+EBUILD eselect-compiler-2.0.0_rc1-r6.ebuild 5073 RMD160 1e089285d771c99bf53c90bf570c8d86926b699a SHA1 436ddd9b88407ddc4b0bc866aeabe3b4ae83db4d SHA256 ae1364e285710316b8b51def46ac54e6d308f5a27c4f406f96d7e87edad89fed
+MD5 c03da992bad7860c2b792ab709d7de28 eselect-compiler-2.0.0_rc1-r6.ebuild 5073
+RMD160 1e089285d771c99bf53c90bf570c8d86926b699a eselect-compiler-2.0.0_rc1-r6.ebuild 5073
+SHA256 ae1364e285710316b8b51def46ac54e6d308f5a27c4f406f96d7e87edad89fed eselect-compiler-2.0.0_rc1-r6.ebuild 5073
+MISC ChangeLog 6036 RMD160 0cf24a1cc5da3def02b6c0ba4cd3cd7e889c0e86 SHA1 919a2712d85f7e02d2c480e35729f54c55e95a03 SHA256 17c4a754c905e183ab85d18819b1de083891d6ce489d5142e3b78d44ad3d3512
+MD5 bd6540cc307ea0600de25f94a8c965fb ChangeLog 6036
+RMD160 0cf24a1cc5da3def02b6c0ba4cd3cd7e889c0e86 ChangeLog 6036
+SHA256 17c4a754c905e183ab85d18819b1de083891d6ce489d5142e3b78d44ad3d3512 ChangeLog 6036
 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-r5 277
-RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r5 277
-SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r5 277
+MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-eselect-compiler-2.0.0_rc1-r6 277
+RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-eselect-compiler-2.0.0_rc1-r6 277
+SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-eselect-compiler-2.0.0_rc1-r6 277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhjyhOpjtAl+gMRURAhL1AKCZjI/99rXT6x61W/m35eymSB0csQCg0FWS
-w3KfqioXjwxcdtOHOmFwhaQ=
-=t5sN
+iD8DBQFEicfDOpjtAl+gMRURAhvEAKDj4+omq5IYPiWgSbF0Qz/BO3HkCACeM3rk
+zAjvWeF99HfDAL2bnMahCfY=
+=jzgT
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r5.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r5.ebuild
deleted file mode 100644
index 5006c5420c4a..000000000000
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r5.ebuild
+++ /dev/null
@@ -1,165 +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-r5.ebuild,v 1.1 2006/06/07 02:36:16 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() {
-	delete_invalid_profiles
-
-	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() {
-	# 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
-
-	local file
-	local resource_profile=0
-	for file in ${ROOT}/etc/env.d/05gcc* ; do
-		if [[ -f ${file} ]] ; then
-			ewarn "Removing env.d entry which was used by gcc-config:"
-			ewarn "    ${file}"
-
-			rm -f ${file}
-
-			resource_profile=1
-		fi
-	done
-
-	if [[ ${resource_profile} == 1 ]] ; 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
-
-	# For bug #135749
-	exeinto /lib
-	newexe ${D}/usr/libexec/eselect/compiler/compiler-wrapper cpp
-
-	doenvd ${FILESDIR}/25eselect-compiler
-
-	# This is installed by sys-devel/gcc-config
-	rm ${D}/usr/bin/gcc-config
-}
-
-# The profiles are protected by CONFIG_PROJECT until eselect-compiler is installed, so we need to clean out
-# the invalid profiles when eselect-compiler is first installed
-delete_invalid_profiles() {
-	# Some toolchain.eclass installed confs had some bugs in them. We
-	# could just use sed to update them, but then portage won't remove
-	# them automatically on unmerge. 
-	local file
-	for file in $(grep "^[[:space:]]*chost=" ${ROOT}/etc/eselect/compiler/*.conf | cut -f1 -d:)  ; do
-		rm ${file}
-	done
-	for file in $(grep "^[[:space:]]*spec=" ${ROOT}/etc/eselect/compiler/*.conf | cut -f1 -d:)  ; do
-		rm ${file}
-	done
-
-	# First we need to clean out /etc/eselect/compiler as there may
-	# be some profiles in there which were not unmerged with gcc.
-	local item
-	for item in $(grep "^[[:space:]]*binpath=" ${ROOT}/etc/eselect/compiler/*.conf | sed 's/:.*binpath=/:/') ; do
-		local file=${item%:*}
-		local binpath=${item#*:}
-		[[ -d ${binpath} ]] || rm ${file}
-	done
-}
-
diff --git a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r5 b/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r5
deleted file mode 100644
index e5670a7296b1..000000000000
--- a/app-admin/eselect-compiler/files/digest-eselect-compiler-2.0.0_rc1-r5
+++ /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