Use realpath when available, rather than readlink -f, to support Gentoo/FreeBSD.

Package-Manager: portage-2.1_pre7-r5

3 files changed, 28 insertions, 18 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 470bb5f27066..7ddf8c81580a 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.200 2006/03/31 20:49:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.201 2006/04/20 20:30:54 flameeyes Exp $
+
+  20 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> perl-5.8.8-r1.ebuild:
+  Use realpath when available, rather than readlink -f, to support
+  Gentoo/FreeBSD.
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> perl-5.8.8-r1.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 054cf8bdb6ac..c003a9897779 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6d4eb220bb5a7390dd98d1bd6bbe605c ChangeLog 49400
-RMD160 4ace88709a5033cdd169cb49eed1c5d83dc5af3b ChangeLog 49400
-SHA256 d062bfbe1171b8e8679c0557630fc06f1d1e9e8ca0e2e4a87010902e5ab5b3f6 ChangeLog 49400
+MD5 282604cb0d4ff6977bd7bb3bb3801973 ChangeLog 49561
+RMD160 65cf1e9748392b1c5ed3ca79993f90196e3f5358 ChangeLog 49561
+SHA256 4dac184e6a46b29d556b4b50809247a91488830ce369346334f4af0e81c78edb ChangeLog 49561
 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703
 RMD160 d1f50057744ef79428667ebbf1e37c09e1791e45 files/CAN-2005-0156-suid.patch 703
 SHA256 123cc60410b2f09e4d10b892c151b3394a32c1b26dd216102c21fece64d45142 files/CAN-2005-0156-suid.patch 703
@@ -151,16 +151,16 @@ SHA256 60b6ad9d8d26184db24c7bc0c4b1b2dc5d0d5ce0aa9fa756ccdf59e0b42b3cbc perl-5.8
 MD5 5af1d9db05e7055740baff2a28fbcbee perl-5.8.7.ebuild 19224
 RMD160 10dc91b734fd85fa30f325ea2998083bc5f6e36a perl-5.8.7.ebuild 19224
 SHA256 0a81d4c267392bb49a3ca605751275daa16be3172e288fe8cb401516c0f82a4d perl-5.8.7.ebuild 19224
-MD5 5d8411ebd9657b72d091384048f5d5b2 perl-5.8.8-r1.ebuild 18868
-RMD160 8562ac40c568ab5b31403aa2df8de50d6cb8de60 perl-5.8.8-r1.ebuild 18868
-SHA256 3e8b98bdd121c0b16ea22f93f7a7e10dbd7d0bdde10c6152ca007e323fbdf8f4 perl-5.8.8-r1.ebuild 18868
+MD5 9d8009340ea2185d6a26ee4e42f2b0a9 perl-5.8.8-r1.ebuild 19082
+RMD160 e072f937e4b7f03df48369508e3c57d19cb014eb perl-5.8.8-r1.ebuild 19082
+SHA256 e3e71fabfc13dd08d712fa1c58a8931d48cd9c4674bc2fde9f27cd1801c84b6a perl-5.8.8-r1.ebuild 19082
 MD5 9981bea0123b51f5b13f7440608a28f7 perl-5.8.8.ebuild 18728
 RMD160 8a49d93e06083f117e61ead33306296db610688a perl-5.8.8.ebuild 18728
 SHA256 0c95755dd47b9a63d91232ac4748fd41e46b7b3d6adde3302c2a137910e91774 perl-5.8.8.ebuild 18728
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFELZXxAiZjviIA2XgRAiA4AKCOAspwPPzZRdoFB7nmct51F6QyLQCfal2K
-7xrLA9GiSJ20SOy19mv1XAo=
-=MnuQ
+iD8DBQFER+7MAiZjviIA2XgRAsZ6AJ44bJ+KK/ANh/YmQpfS5ghYEEadGQCeIZEN
+NmChKsSxfNa7lFa+DirX+2M=
+=Y7ur
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/perl/perl-5.8.8-r1.ebuild b/dev-lang/perl/perl-5.8.8-r1.ebuild
index 31db5936eebf..d96421dad2ec 100644
--- a/dev-lang/perl/perl-5.8.8-r1.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r1.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-r1.ebuild,v 1.2 2006/03/31 20:49:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r1.ebuild,v 1.3 2006/04/20 20:30:54 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -28,7 +28,8 @@ 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"
+	!<perl-core/Test-Simple-0.47-r1
+	|| ( sys-apps/coreutils app-admin/realpath sys-freebsd/freebsd-bin )"
 
 RDEPEND="~sys-devel/libperl-${PV}
 	berkdb? ( sys-libs/db )
@@ -98,10 +99,10 @@ src_unpack() {
 	# MakeMaker module, bug #105054.
 	epatch ${FILESDIR}/${PN}-5.8.7-MakeMaker-RUNPATH.patch
 
-	# Starting and hopefully ending with 5.8.7 we observe stack 
-	# corruption with the regexp handling in perls DynaLoader code 
-	# with ssp enabled. This become fatal during compile time so we 
-	# temporally disable ssp on two regexp files till upstream has a 
+	# Starting and hopefully ending with 5.8.7 we observe stack
+	# corruption with the regexp handling in perls DynaLoader code
+	# with ssp enabled. This become fatal during compile time so we
+	# temporally disable ssp on two regexp files till upstream has a
 	# chance to work it out. Bug #97452
 	[[ -n $(test-flags -fno-stack-protector) ]] && \
 		epatch ${FILESDIR}/${PN}-regexp-nossp.patch
@@ -325,7 +326,7 @@ EOF
 	done
 
 	# Note: find out from psm why we would need/want this.
-	# ( use berkdb && has_version '=sys-libs/db-1*' ) || 
+	# ( use berkdb && has_version '=sys-libs/db-1*' ) ||
 	#	find ${D} -name "*NDBM*" | xargs rm -f
 
 	dodoc Changes* Artistic Copying README Todo* AUTHORS
@@ -564,7 +565,12 @@ pkg_postinst() {
 		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
 	fi
 
-	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
+	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