Consolidate the code for cleaning out old profiles.

Package-Manager: portage-2.1_rc3-r5

2 files changed, 34 insertions, 28 deletions

diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 59b275e65e49..900855f7d6ee 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -10,10 +10,10 @@ 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-r4.ebuild 4714 RMD160 1b9b745184c32f8ba69c65330821cfcfdcac5816 SHA1 055d430f307851a44845b8e0a9c6a6a31bb86d03 SHA256 a1cfcfdbffce10960d17aa898295324190886059561471aed47ba0d2cb0afa10
-MD5 e2ca43e592fa7e8a872c5600940e9ace eselect-compiler-2.0.0_rc1-r4.ebuild 4714
-RMD160 1b9b745184c32f8ba69c65330821cfcfdcac5816 eselect-compiler-2.0.0_rc1-r4.ebuild 4714
-SHA256 a1cfcfdbffce10960d17aa898295324190886059561471aed47ba0d2cb0afa10 eselect-compiler-2.0.0_rc1-r4.ebuild 4714
+EBUILD eselect-compiler-2.0.0_rc1-r4.ebuild 4934 RMD160 f9605eaaa96e74bd8fa4f9c5a3ac3c2d927fffed SHA1 7af9cdedafd8335597b66a3fc86a37659c65924d SHA256 f6c8a3634f47886e30def0801327bd207681d503f340d00982a07ee71cf047ea
+MD5 4bf2d082d4dc7d6a4e5f24a06c78854c eselect-compiler-2.0.0_rc1-r4.ebuild 4934
+RMD160 f9605eaaa96e74bd8fa4f9c5a3ac3c2d927fffed eselect-compiler-2.0.0_rc1-r4.ebuild 4934
+SHA256 f6c8a3634f47886e30def0801327bd207681d503f340d00982a07ee71cf047ea eselect-compiler-2.0.0_rc1-r4.ebuild 4934
 MISC ChangeLog 5296 RMD160 692298768465b13b15f6a75769bc815b6be00ea9 SHA1 dcb2a1d3294fee61c4632a43676eebfd0beb87c6 SHA256 cd828f8b715de91e2c6ed3501c2c82da7bb3081ef114cf72246d877d103c8531
 MD5 60a51b61ab9fed3f91d6f306edb09ef4 ChangeLog 5296
 RMD160 692298768465b13b15f6a75769bc815b6be00ea9 ChangeLog 5296
@@ -28,7 +28,7 @@ SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEgLUwOpjtAl+gMRURAnTBAKCDy7Fsi/qAsmparqjpIoR5ERBjOwCcDdrx
-OferGGg3/VM0r8wjZHY7YLg=
-=giL4
+iD8DBQFEgLkSOpjtAl+gMRURAjumAKDQv3CPHaP6SHiK2y+JmfQGfxysygCeL3ZU
+6trG7aQSJ8xWp3W4TEyk8FA=
+=HMAU
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
index 35932429893f..4199c72d1aa2 100644
--- a/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
+++ b/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.3 2006/06/02 22:01:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/eselect-compiler-2.0.0_rc1-r4.ebuild,v 1.4 2006/06/02 22:17:20 eradicator Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -22,17 +22,7 @@ RDEPEND=">=app-admin/eselect-1.0_rc1"
 
 # We want to verify that compiler profiles exist for our toolchain
 pkg_setup() {
-	# 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
+	delete_invalid_profiles
 
 	local abi
 	for abi in $(get_all_abis) ; do
@@ -66,15 +56,6 @@ pkg_postinst() {
 		einfo "chosen or an error is reported, please use 'eselect compiler set' to"
 		einfo "manually choose it"
 
-		# 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
-
 		local abi
 		for abi in $(get_all_abis) ; do
 			local ctarget=$(get_abi_CHOST ${abi})
@@ -153,3 +134,28 @@ src_install() {
 	# 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
+}
+