Delete buggy spec files rather than fixing them with sed. This will allow portage to properly delete the profiles on unmerge.

Package-Manager: portage-2.1_rc3-r5

3 files changed, 30 insertions, 17 deletions

diff --git a/app-admin/eselect-compiler/ChangeLog b/app-admin/eselect-compiler/ChangeLog
index bcca634c23bb..18221e01f17a 100644
--- a/app-admin/eselect-compiler/ChangeLog
+++ b/app-admin/eselect-compiler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-compiler
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.18 2006/06/02 18:08:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-compiler/ChangeLog,v 1.19 2006/06/02 22:01:10 eradicator Exp $
+
+  02 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  eselect-compiler-2.0.0_rc1-r4.ebuild:
+  Delete buggy spec files rather than fixing them with sed. This will allow
+  portage to properly delete the profiles on unmerge.
 
   02 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org>
   eselect-compiler-2.0.0_rc1-r4.ebuild:
diff --git a/app-admin/eselect-compiler/Manifest b/app-admin/eselect-compiler/Manifest
index 5b094eb459f7..59b275e65e49 100644
--- a/app-admin/eselect-compiler/Manifest
+++ b/app-admin/eselect-compiler/Manifest
@@ -10,14 +10,14 @@ 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 4485 RMD160 5e4e6506cbb6ae8317c0e5f3c85f9e4bcc64d925 SHA1 2356da1d30ad3e2dd5b51011e5236c8ee1223fa9 SHA256 7f943b41ed5338cabc3ee5a2f0c3b96d334dabc3e3ddce059f445fb55f0bc132
-MD5 bac5fd73f3d2c2180c7b33feaf5f3c85 eselect-compiler-2.0.0_rc1-r4.ebuild 4485
-RMD160 5e4e6506cbb6ae8317c0e5f3c85f9e4bcc64d925 eselect-compiler-2.0.0_rc1-r4.ebuild 4485
-SHA256 7f943b41ed5338cabc3ee5a2f0c3b96d334dabc3e3ddce059f445fb55f0bc132 eselect-compiler-2.0.0_rc1-r4.ebuild 4485
-MISC ChangeLog 5068 RMD160 e38ed83f0d411a3de86dbc2636fed7565a90a623 SHA1 5aec1b731bd8289ab1ea8435a25449bc2b345a50 SHA256 33ab478704618c5958cca557aa821d5558071070ac566b3161a39e15097d1c9b
-MD5 1b89a79974839504d14c8430332bba85 ChangeLog 5068
-RMD160 e38ed83f0d411a3de86dbc2636fed7565a90a623 ChangeLog 5068
-SHA256 33ab478704618c5958cca557aa821d5558071070ac566b3161a39e15097d1c9b ChangeLog 5068
+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
+MISC ChangeLog 5296 RMD160 692298768465b13b15f6a75769bc815b6be00ea9 SHA1 dcb2a1d3294fee61c4632a43676eebfd0beb87c6 SHA256 cd828f8b715de91e2c6ed3501c2c82da7bb3081ef114cf72246d877d103c8531
+MD5 60a51b61ab9fed3f91d6f306edb09ef4 ChangeLog 5296
+RMD160 692298768465b13b15f6a75769bc815b6be00ea9 ChangeLog 5296
+SHA256 cd828f8b715de91e2c6ed3501c2c82da7bb3081ef114cf72246d877d103c8531 ChangeLog 5296
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -28,7 +28,7 @@ SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEgH6NOpjtAl+gMRURAgoPAKDV6Ag5hzS8R2yM4WYHh7NNWpIlEgCfWNOc
-/hdGvOUyWFyzuqWzlI/km4g=
-=0cOI
+iD8DBQFEgLUwOpjtAl+gMRURAnTBAKCDy7Fsi/qAsmparqjpIoR5ERBjOwCcDdrx
+OferGGg3/VM0r8wjZHY7YLg=
+=giL4
 -----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 1a0a4df290b0..35932429893f 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.2 2006/06/02 18:08:01 eradicator Exp $
+# $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 $
 
 inherit eutils multilib toolchain-funcs
 
@@ -22,6 +22,18 @@ 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
+
 	local abi
 	for abi in $(get_all_abis) ; do
 		local ctarget=$(get_abi_CHOST ${abi})
@@ -37,10 +49,6 @@ pkg_setup() {
 }
 
 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"