Check for broken alternative scripts in ROOT

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

4 files changed, 20 insertions, 18 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index ad021e4334ef..917785a96e71 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.296 2009/11/14 09:08:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.297 2009/11/14 11:31:30 tove Exp $
+
+  14 Nov 2009; Torsten Veller <tove@gentoo.org> perl-5.8.8-r8.ebuild,
+  perl-5.10.1.ebuild:
+  Check for alternative scripts in ROOT
 
 *perl-5.8.8-r8 (14 Nov 2009)
 
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8f29c07809de..cbde53a81d71 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -31,16 +31,16 @@ AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5
 DIST perl-5.10.1-8.tar.bz2 7018 RMD160 aa8ec083175b328a659b75e045be9f4c6bb8f854 SHA1 88df50f09b6b0ca70b720bff363244cca81d0aec SHA256 85ba8f76c74693f8bb5f9bfdd9a593cf01858804e64c833dc20b75aa7bda3990
 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD perl-5.10.1.ebuild 17802 RMD160 119721426041be115e6d117c3c53d4a964b4d91d SHA1 7ac3b6a825fb6f5f6ff23281cfda4ec07b468eb8 SHA256 52b97f3585be1668985add1870da4203613a3569a7acff0b20664203b6cc7c76
+EBUILD perl-5.10.1.ebuild 17809 RMD160 36ff47493362633a0546902cdfdb53cff7247c5e SHA1 0fe2896062bc5fd2af67ae2dd19970d57a9c73c8 SHA256 3dc037c4f233415b2818ee75f195b61921a1d7ab995ca0f59f84a11c44dfe14e
 EBUILD perl-5.8.8-r5.ebuild 19309 RMD160 e96b9016ac7d415fc0662107384c58ce93f01c2d SHA1 9ade925c85bf618cb6aae9ab6ef93152a1932b0b SHA256 42a654e9e2dbcf2d105acb10a092d7fd079a543c01b2a6a216dcdfcce692fb62
 EBUILD perl-5.8.8-r6.ebuild 19745 RMD160 e8b10189225a79880cbc99ca274af66165dc04be SHA1 d6449cb18f89a502f6dd2c3f2027479da5686c07 SHA256 ac275f3959902c31d662c32c266991752544da7cd7b589c4aeb1ce804bc02c3a
-EBUILD perl-5.8.8-r8.ebuild 20758 RMD160 cf0a97f202a2dffdcfe3f7fa3fb8d650515ea8d4 SHA1 50af767aafe5835ea23fca1de9e94aed6355133e SHA256 c9e18d2e59ca70a8421b8f4ad63989291aa6ede6463aeb32014183b9d7143808
-MISC ChangeLog 62542 RMD160 bff34b37c35ec487f4616557af691fa4f4590ea9 SHA1 d3fc24eaeeccaca4b12476d6673157154e05dd35 SHA256 7e9944fadf94798e0f7f330d5be75a21df83d8bcbd7fb161334bce718eed7f79
+EBUILD perl-5.8.8-r8.ebuild 20726 RMD160 597d5938f6786599be1d8f4a2c102054ba5cc4d8 SHA1 1aff5cc62099941011af75fc4a4b91fe815dce0c SHA256 ce2d3f0320c64c5d163705901f047ffe7fece3a263a29079a61206547c2f0f02
+MISC ChangeLog 62675 RMD160 1a42e6eb487cd510fe0e9ed4b5d4aded1c944276 SHA1 43729a663edf7f3b5e9385f4776645738e7af1df SHA256 0adc9560baac594a848f268b5b2d6a29364fbfd51aaf16b19b2c74a91614d8c2
 MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkr+c5gACgkQV3J2n04EauxIsACgufgDg+LTDWXPfO+/Wn3y1Spc
-F4UAnigufslhnIa4EYYamcClTCULMSUV
-=feom
+iEYEARECAAYFAkr+lRgACgkQV3J2n04Eauz8PgCeMs+ZQrthpMe8Bct4ST2nQofw
+OoAAoIb7gAth7EUpQuTN1W/qHwBNMNQ7
+=Wpea
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/perl-5.10.1.ebuild b/dev-lang/perl/perl-5.10.1.ebuild
index 0cbfef96febd..c57c1dc492fe 100644
--- a/dev-lang/perl/perl-5.10.1.ebuild
+++ b/dev-lang/perl/perl-5.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.10.1.ebuild,v 1.9 2009/10/27 17:20:11 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.10.1.ebuild,v 1.10 2009/11/14 11:31:30 tove Exp $
 
 EAPI=2
 
@@ -50,7 +50,7 @@ dual_scripts() {
 	src_remove_dual_scripts perl-core/Module-CoreList    2.18    corelist
 	src_remove_dual_scripts perl-core/PodParser          1.37    pod2usage podchecker podselect
 	src_remove_dual_scripts perl-core/Test-Harness       3.17    prove
-	src_remove_dual_scripts !perl-core/podlators          2.2.2   pod2man pod2text
+	src_remove_dual_scripts perl-core/podlators          2.2.2   pod2man pod2text
 }
 
 pkg_setup() {
@@ -400,8 +400,8 @@ src_remove_dual_scripts() {
 		done
 	elif has "${EBUILD_PHASE:-none}" "setup" ; then
 		for i in "$@" ; do
-			if [[ -f /usr/bin/${i} && ! -h /usr/bin/${i} ]] ; then
-				[[ ${pkg::1} == "!" ]] || ewarn "You must reinstall $pkg !"
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
 				break
 			fi
 		done
diff --git a/dev-lang/perl/perl-5.8.8-r8.ebuild b/dev-lang/perl/perl-5.8.8-r8.ebuild
index e9adc059f4e3..05ba98ab9015 100644
--- a/dev-lang/perl/perl-5.8.8-r8.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r8.ebuild,v 1.1 2009/11/14 09:08:34 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r8.ebuild,v 1.2 2009/11/14 11:31:30 tove Exp $
 
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib
 
@@ -47,7 +47,7 @@ dual_scripts() {
 	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.30    instmodsh
 	src_remove_dual_scripts perl-core/Test-Harness       2.56    prove
 	src_remove_dual_scripts perl-core/CPAN               1.76_02 cpan
-	src_remove_dual_scripts !perl-core/podlators         1.37    pod2man pod2text
+	src_remove_dual_scripts perl-core/podlators          1.37    pod2man pod2text
 }
 
 pkg_setup() {
@@ -491,11 +491,9 @@ src_remove_dual_scripts() {
 		done
 	elif has "${EBUILD_PHASE:-none}" "setup" ; then
 		for i in "$@" ; do
-			if [[ -f /usr/bin/${i} && ! -h /usr/bin/${i} ]] ; then
-				if [[ ${pkg::1} != "!" ]] && has_version ${pkg} ; then
-					ewarn "You must reinstall $pkg !"
-					break
-				fi
+			if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
+				has_version ${pkg} && ewarn "You must reinstall $pkg !"
+				break
 			fi
 		done
 	else