Following a conversation with agaffney, removed code that is dup'd from libperl that was causing a loop in catalyst building - fixes help2man bugs

Package-Manager: portage-2.1_rc2-r2

3 files changed, 15 insertions, 39 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 5a27b6b2ae2b..bbe20a32f84c 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.217 2006/06/03 18:08:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.218 2006/06/07 02:04:29 mcummings Exp $
+
+  07 Jun 2006; <mcummings@gentoo.org> perl-5.8.8-r2.ebuild:
+  Following a conversation with agaffney, removed code that is dup'd from
+  libperl that was causing a loop in catalyst building - fixes help2man bugs
 
   03 Jun 2006; Guy Martin <gmsoft@gentoo.org>
   +files/perl-hppa-pa7200-configure.patch, perl-5.8.8-r2.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 0ffc80ab5364..5d57d2b62256 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -161,18 +161,18 @@ EBUILD perl-5.8.8-r1.ebuild 19074 RMD160 784412857c3371f9d577cb66c082635baebfb31
 MD5 93fdd7eafa23f8326dc1462bd567348b perl-5.8.8-r1.ebuild 19074
 RMD160 784412857c3371f9d577cb66c082635baebfb31a perl-5.8.8-r1.ebuild 19074
 SHA256 764d53db5b63f74cd6a2fcccadd8126880075cacdb2aeaba254ce6fbae95ed80 perl-5.8.8-r1.ebuild 19074
-EBUILD perl-5.8.8-r2.ebuild 19255 RMD160 20031f1003ab4bc6ef6d7340f0c9659896f067e9 SHA1 bc297a36fe2687e08737061a6f65d8e4c9ea2716 SHA256 52b3164769de643977fb0273290c599095b19aeeda2ad72fd6aa257212c70bc4
-MD5 8b84bbbf8fa5ec418ce20d732c734657 perl-5.8.8-r2.ebuild 19255
-RMD160 20031f1003ab4bc6ef6d7340f0c9659896f067e9 perl-5.8.8-r2.ebuild 19255
-SHA256 52b3164769de643977fb0273290c599095b19aeeda2ad72fd6aa257212c70bc4 perl-5.8.8-r2.ebuild 19255
+EBUILD perl-5.8.8-r2.ebuild 17994 RMD160 3dda3b90ba61827ca723773553abf69a02f9e3ba SHA1 6d8a6bb2b7fcdd78c97572813c9290f1e5b5113c SHA256 3b8b842953cedb94c214f9cb431f33c37157a3462f8b8f533d47032f7253104b
+MD5 f8f8e6a6deb0930e8efab12920fe2260 perl-5.8.8-r2.ebuild 17994
+RMD160 3dda3b90ba61827ca723773553abf69a02f9e3ba perl-5.8.8-r2.ebuild 17994
+SHA256 3b8b842953cedb94c214f9cb431f33c37157a3462f8b8f533d47032f7253104b perl-5.8.8-r2.ebuild 17994
 EBUILD perl-5.8.8.ebuild 18728 RMD160 8a49d93e06083f117e61ead33306296db610688a SHA1 1b659cf8ec8270c224d8fecaea25028667a997e8 SHA256 0c95755dd47b9a63d91232ac4748fd41e46b7b3d6adde3302c2a137910e91774
 MD5 9981bea0123b51f5b13f7440608a28f7 perl-5.8.8.ebuild 18728
 RMD160 8a49d93e06083f117e61ead33306296db610688a perl-5.8.8.ebuild 18728
 SHA256 0c95755dd47b9a63d91232ac4748fd41e46b7b3d6adde3302c2a137910e91774 perl-5.8.8.ebuild 18728
-MISC ChangeLog 51272 RMD160 417480e54330e445e70f23c8241908ffc8af015d SHA1 c3d792b7994a596141ec2d5ab3d52c4ff03c78c8 SHA256 983b930e069909eaa2f165f1835acd7b5afa4cbc6c3fd723c7997888c10e2818
-MD5 d7b53ac8d00b0bb92724a9aa3f546e84 ChangeLog 51272
-RMD160 417480e54330e445e70f23c8241908ffc8af015d ChangeLog 51272
-SHA256 983b930e069909eaa2f165f1835acd7b5afa4cbc6c3fd723c7997888c10e2818 ChangeLog 51272
+MISC ChangeLog 51487 RMD160 5f622768739a2262ec0ac39393273d97f7af970f SHA1 240b333a2da0403147631c79df94c750d0bcb743 SHA256 b306a87214ef26dd8d643a854ebd336a9bce5f8f8835a47f89a6c367828ab64b
+MD5 d7b5704b4e8c1e4c4177e6ab47a60a0e ChangeLog 51487
+RMD160 5f622768739a2262ec0ac39393273d97f7af970f ChangeLog 51487
+SHA256 b306a87214ef26dd8d643a854ebd336a9bce5f8f8835a47f89a6c367828ab64b ChangeLog 51487
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index a0ec4f3117ca..1380986bf92e 100644
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.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/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.11 2006/06/03 18:08:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.12 2006/06/07 02:04:29 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -28,8 +28,7 @@ DEPEND="berkdb? ( sys-libs/db )
 	<sys-devel/libperl-5.9
 	!<perl-core/ExtUtils-MakeMaker-6.17
 	!<perl-core/File-Spec-0.87
-	!<perl-core/Test-Simple-0.47-r1
-	|| ( sys-apps/coreutils app-admin/realpath sys-freebsd/freebsd-bin )"
+	!<perl-core/Test-Simple-0.47-r1"
 
 RDEPEND="~sys-devel/libperl-${PV}
 	berkdb? ( sys-libs/db )
@@ -565,33 +564,6 @@ src_remove_extra_files()
 }
 
 pkg_postinst() {
-	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" -a ! -L "${ROOT}usr/$(get_libdir)/libperl$(get_libname)" ]
-	then
-		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
-	fi
-
-	local perllib
-	if [[ -z $(type -p realpath) ]]; then
-		perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
-	else
-		perllib="`realpath ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
-	fi
-
-	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
-	# point to the version of perl we are running, else builing something
-	# against libperl.so will break ...
-	if [ "${perllib}" != "${LIBPERL}" ]
-	then
-		# Delete stale symlinks
-		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
-		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname).${PERLSLOT}
-		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
-	fi
-
 	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
 	if [ "${ROOT}" = "/" ]
 	then