Check for broken alternative scripts in ROOT

(Portage version: 2.2_rc49/cvs/Linux x86_64)

3 files changed, 14 insertions, 12 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/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