Test for broken/breaking scripts

2 files changed, 25 insertions, 26 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 8a9f8414f..d4f5f3c41 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,6 +1,6 @@
 DIST perl-5.10.1-5.tar.bz2 4338 RMD160 90ab1caa99a3fd34d99e174d2d4e4216dbebd2a2 SHA1 c617fb5226d54cad630615f54163ea8388a589bd SHA256 fa6eff4370317f5d85bee40efa8c1f3ab39c51ae4057a0aea08e57fbd1ae89f7
 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
-EBUILD perl-5.10.1-r11.ebuild 17011 RMD160 aa045f4713b839f2c3190307d86807e5d77aff87 SHA1 a7eb53f18cc7eed89f331dad008b1855f4b5652d SHA256 467df88766b6f97b21b2e13ddfbceb22898b4f5e8af804687d2db09b79aa9493
+EBUILD perl-5.10.1-r11.ebuild 17277 RMD160 8279e48b33b7448c7d521e42a744d27ef5b7dc08 SHA1 c4f3675ed4a24625593a9323b41e3a9abd36bcb4 SHA256 1417c50b8cca1cc287856de0eeb91242a7f3e95e87f1b55be711b5aa0dde1941
 EBUILD perl-5.10.1-r9.ebuild 19788 RMD160 2bcc203ddf20fca7e8c9517fd634af242005226a SHA1 bb563fb96427fd2095c33301135d089da5603a16 SHA256 339a977701981b563b4f31f4c9e0c923372e73c75fb5cf0ac0ed04e604cc98e1
 MISC ChangeLog 1558 RMD160 b85d00a85cad896f72211423560417fce24cc05d SHA1 6e16c5b6bfc622b46028b754a9d06895317e8d4d SHA256 8a12307c00fb263ff4913d63b848e1a292c2f30831aa0bf56aaa47b01f6331f1
 MISC metadata.xml 461 RMD160 360fba2419f631eafd941170779e5750211be37f SHA1 ddc34aa27e5999ea066e0cf275be6e5bd38d5a15 SHA256 032a33881cea03f47fd306dc91e12272584ea47533556c86f0ceaa1db5dc8fc3
diff --git a/dev-lang/perl/perl-5.10.1-r11.ebuild b/dev-lang/perl/perl-5.10.1-r11.ebuild
index fa19b44be..365403534 100644
--- a/dev-lang/perl/perl-5.10.1-r11.ebuild
+++ b/dev-lang/perl/perl-5.10.1-r11.ebuild
@@ -29,7 +29,7 @@ IUSE="berkdb build debug doc gdbm ithreads"
 
 COMMON_DEPEND="berkdb? ( sys-libs/db )
 	gdbm? ( >=sys-libs/gdbm-1.8.3 )
-	!<sys-devel/libperl-5.10.1-r10
+	>=sys-devel/libperl-5.10.1-r10
 	app-arch/bzip2
 	sys-libs/zlib"
 DEPEND="${COMMON_DEPEND}
@@ -38,26 +38,16 @@ RDEPEND="${COMMON_DEPEND}"
 PDEPEND=">=app-admin/perl-cleaner-1.03"
 
 dual_scripts() {
-	# - perl-core/Archive-Tar
-	src_remove_dual_scripts 1.52 ptar ptardiff
-	# - perl-core/Digest-SHA
-	src_remove_dual_scripts 5.47 shasum
-	# - perl-core/CPAN
-	src_remove_dual_scripts 1.9402 cpan
-	# - perl-core/CPANPLUS
-	src_remove_dual_scripts 0.88 cpanp cpan2dist cpanp-run-perl
-	# - perl-core/Encode
-	src_remove_dual_scripts 2.35 enc2xs piconv
-	# - perl-core/ExtUtils-MakeMaker
-	src_remove_dual_scripts 6.55_02 instmodsh
-	# - perl-core/Module-Build
-	src_remove_dual_scripts 0.34_02 config_data
-	# - perl-core/Module-CoreList
-	src_remove_dual_scripts 2.18 corelist
-	# - perl-core/PodParser
-	src_remove_dual_scripts 1.37 pod2usage podchecker podselect
-	# - perl-core/Test-Harness
-	src_remove_dual_scripts 3.17 prove
+	src_remove_dual_scripts perl-core/Archive-Tar        1.52    ptar ptardiff
+	src_remove_dual_scripts perl-core/Digest-SHA         5.47    shasum
+	src_remove_dual_scripts perl-core/CPAN               1.9402  cpan
+	src_remove_dual_scripts perl-core/CPANPLUS           0.88    cpanp cpan2dist cpanp-run-perl
+	src_remove_dual_scripts perl-core/Encode             2.35    enc2xs piconv
+	src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.55_02 instmodsh
+	src_remove_dual_scripts perl-core/Module-Build       0.34_02 config_data
+	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
 }
 
 pkg_setup() {
@@ -81,10 +71,11 @@ pkg_setup() {
 			ewarn "TOGGLED USE-FLAGS WARNING:"
 			ewarn "You changed one of the use-flags ithreads or debug."
 			ewarn "You must rebuild all perl-modules installed."
-			ewarn "Use: perl-cleaner --???"
+			ewarn "Use: perl-cleaner --all"
 			epause
 		fi
 	fi
+	dual_scripts
 }
 
 src_prepare() {
@@ -391,9 +382,10 @@ cleaner_msg() {
 }
 
 src_remove_dual_scripts() {
-	local i ver ff
-	ver="$1"
-	shift
+	local i pkg ver ff
+	pkg="$1"
+	ver="$2"
+	shift 2
 	if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
 		for i in "$@" ; do
 			ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
@@ -401,6 +393,13 @@ src_remove_dual_scripts() {
 			alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
 			alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
 		done
+	elif has "${EBUILD_PHASE:-none}" "setup" ; then
+		for i in "$@" ; do
+			if [[ -f /usr/bin/${i} && ! -h /usr/bin/${i} ]] ; then
+				ewarn "You must reinstall $pkg !"
+				break
+			fi
+		done
 	else
 		for i in "$@" ; do
 			mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die