More get_libdir-ization, fixes compilation on amd64's no-lib32 profile.

(Portage version: 2.0.51.22-r1)

3 files changed, 29 insertions, 26 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index f6710007bf3e..aa5327f04b43 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/libperl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.59 2005/03/08 23:53:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.60 2005/05/23 11:22:45 herbs Exp $
+
+  23 May 2005; Herbie Hopkins <herbs@gentoo.org> libperl-5.8.6.ebuild:
+  More get_libdir-ization, fixes compilation on amd64's no-lib32 profile.
 
   08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
   libperl-5.8.6.ebuild:
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 194fc7ae2dc1..76d43bf260c7 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,28 +1,28 @@
-MD5 9ab9c99daa2f4fae0e67414f898e9fd5 ChangeLog 8475
-MD5 c765cb7edc867f283b36360e4dd18500 libperl-5.8.4.ebuild 10940
+MD5 81db7794efc73ba016d4a00d4088d72f libperl-5.8.6.ebuild 10095
+MD5 bf0b5b7898f1f4eff92a67cf9c1249d9 libperl-5.8.4-r1.ebuild 11058
 MD5 8c7d9cfb9a391a4af31dc33338de4474 libperl-5.8.5.ebuild 9895
 MD5 b55765cd96246e73a424cdac485a27f1 libperl-5.8.2.ebuild 10664
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 de302dbdeeec15e01a8c8b9a192ad3a2 libperl-5.8.2-r1.ebuild 10776
-MD5 bf0b5b7898f1f4eff92a67cf9c1249d9 libperl-5.8.4-r1.ebuild 11058
+MD5 7da1e6bf8f9a5efdb48cfae1f60d743d ChangeLog 8621
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 c765cb7edc867f283b36360e4dd18500 libperl-5.8.4.ebuild 10940
 MD5 d60e1fc888c4e3d54d69b7d4b7f736d1 libperl-5.8.5-r1.ebuild 10021
-MD5 2176f56b8d11fb8679142cb7de35ff08 libperl-5.8.6.ebuild 10005
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.5-uclibc.patch 573
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.6-create-libperl-soname.patch 417
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.6-noksh.patch 611
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.4-uclibc.patch 573
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.5-create-libperl-soname.patch 417
+MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-5.8.5-reorder-INC.patch 2211
+MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4 64
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
-MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2 64
+MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
 MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.4-create-libperl-soname.patch 417
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.4-noksh.patch 611
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.6-uclibc.patch 573
 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-libperl-5.8.2-r1 64
 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-libperl-5.8.4-r1 64
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
 MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.4-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.2-create-libperl-soname.patch 417
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.6-create-libperl-soname.patch 417
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-5.8.5-create-libperl-soname.patch 417
 MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.5-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.5-uclibc.patch 573
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
-MD5 d9412dab085f22309997c8f08ea1ac85 files/libperl-5.8.5-reorder-INC.patch 2211
-MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-5.8.6-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.6-uclibc.patch 573
diff --git a/sys-devel/libperl/libperl-5.8.6.ebuild b/sys-devel/libperl/libperl-5.8.6.ebuild
index f8dfb9d1c00d..829dbb639dda 100644
--- a/sys-devel/libperl/libperl-5.8.6.ebuild
+++ b/sys-devel/libperl/libperl-5.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.7 2005/03/14 23:46:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.6.ebuild,v 1.8 2005/05/23 11:22:45 herbs Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -306,19 +306,19 @@ EOF
 pkg_postinst() {
 
 	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
+	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
 	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
+		mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old
 	fi
 
 	# Next bit is to try and setup the /usr/lib/libperl.so symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/lib/libperl.so.?.* | grep -v '\.old' | wc -l`"
+	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
 	if [ "${libnumber}" -eq 1 ]
 	then
 		# Only this version of libperl is installed, so just link libperl.so
 		# to the *soname* version of it ...
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -327,7 +327,7 @@ pkg_postinst() {
 			# to that *soname* version of libperl.so ...
 			local perlversion="`${ROOT}/usr/bin/perl -V:version | cut -d\' -f2 | cut -d. -f1,2`"
 
-			cd ${ROOT}usr/lib
+			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
 		else
@@ -335,12 +335,12 @@ pkg_postinst() {
 
 			# Nope, we are not so lucky ... try to figure out what version
 			# is the latest, and keep fingers crossed ...
-			for x in `ls -1 ${ROOT}usr/lib/libperl.so.?.*`
+			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.*`
 			do
 				latest="${x}"
 			done
 
-			cd ${ROOT}usr/lib
+			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
 			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
 		fi