getlibdir changes for 5.8.7, bug #58931

(Portage version: 2.0.51.22-r1)

3 files changed, 32 insertions, 39 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 316e0734c4d6..4c6dbeb99993 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.75 2005/08/08 15:01:06 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.76 2005/08/12 10:20:13 mcummings Exp $
+
+  12 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
+  getlibdir changes for 5.8.7, bug #58931
 
   08 Aug 2005; <solar.@gentoo.org> libperl-5.8.5-r1.ebuild,
   libperl-5.8.5.ebuild, libperl-5.8.6-r1.ebuild, libperl-5.8.6.ebuild,
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 2e8ed9202040..802a3945d205 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,29 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 faa9f545e3711c37ee78d83eb338eebb libperl-5.8.6.ebuild 10471
-MD5 bf70b069d8a29b1cba1949437f7e8b0c libperl-5.8.5.ebuild 9920
-MD5 be57b8457762771bc4b3018afd55d704 libperl-5.8.6-r1.ebuild 10463
-MD5 635041e9c1d4a39c9269c241a2e0e6df libperl-5.8.7.ebuild 10508
 MD5 e6fae72a5278a66b962a1a6c5daca068 ChangeLog 11658
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 0875c75155583aa2bec241b36265d371 libperl-5.8.5-r1.ebuild 10029
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
-MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+MD5 bf70b069d8a29b1cba1949437f7e8b0c libperl-5.8.5.ebuild 9920
+MD5 faa9f545e3711c37ee78d83eb338eebb libperl-5.8.6.ebuild 10471
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 e8de471c4a4465c6987f6e981694a3bd libperl-5.8.7.ebuild 10756
+MD5 be57b8457762771bc4b3018afd55d704 libperl-5.8.6-r1.ebuild 10463
 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
+MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
+MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iQCVAwUBQvdy8J4WFLgrx1GWAQJk+AQAtep8FlLk16k3rV00uWzfwUm4RI45+wR+
-mU3YbN+GDdsCLwTzKm4J3MYe6+R3Ui8w6U0iuCnY6X0BFDiLYjie75ip9n79YlUN
-0FLU7wLwN3VrTr5UNPE1nFtzAmZ3SRjo85yYe3EKg/G8U4MEjYN1vaIEODoiaAhb
-3ZKnChVSqW8=
-=/i2l
------END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/libperl-5.8.7.ebuild b/sys-devel/libperl/libperl-5.8.7.ebuild
index b3fffa05e3a4..045ca09caf4e 100644
--- a/sys-devel/libperl/libperl-5.8.7.ebuild
+++ b/sys-devel/libperl/libperl-5.8.7.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.7.ebuild,v 1.4 2005/08/08 15:01:06 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.5 2005/08/12 10:20:13 mcummings Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -52,7 +52,7 @@
 #
 # Martin Schlemmer <azarah@gentoo.org> (28 Dec 2002).
 
-IUSE="berkdb debug gdbm ithreads"
+IUSE="berkdb debug gdbm ithreads userland_Darwin"
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -66,9 +66,9 @@ DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
 SRC_URI="ftp://ftp.cpan.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LIBPERL="libperl$(get_libname).${PERLSLOT}.${SHORT_PV}"
 LICENSE="Artistic GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 # rac 2004.08.06
 
@@ -156,6 +156,8 @@ src_compile() {
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
 		osname="freebsd"
+	elif [[ ${USERLAND} == "Darwin" ]]; then
+		osname="darwin"
 	else
 		osname="linux"
 	fi
@@ -228,8 +230,8 @@ src_compile() {
 		-Ud_csh \
 		${myconf} || die
 
-	emake -j1 -f Makefile depend || die "Couldn't make libperl.so depends"
-	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl.so"
+	emake -j1 -f Makefile depend || die "Couldn't make libperl$(get_libname) depends"
+	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl$(get_libname)"
 	mv ${LIBPERL} ${WORKDIR}
 }
 
@@ -247,8 +249,8 @@ src_install() {
 		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
 		dodir ${coredir}
 		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl.so
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname).${PERLSLOT}
+		dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
 
 		# Fix for "stupid" modules and programs
 		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -318,19 +320,19 @@ EOF
 pkg_postinst() {
 
 	# Make sure we do not have stale/invalid libperl.so 's ...
-	if [ -f "${ROOT}usr/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ]
+	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.so ${ROOT}usr/$(get_libdir)/libperl.so.old
+		mv -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) ${ROOT}usr/$(get_libdir)/libperl$(get_libname).old
 	fi
 
 	# Next bit is to try and setup the /usr/lib/libperl.so symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
+	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl$(get_libname).?.* | 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/$(get_libdir)/libperl.so
+		ln -snf libperl$(get_libname).${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -341,20 +343,20 @@ pkg_postinst() {
 
 			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
+			ln -snf `echo libperl$(get_libname).?.${perlversion} | cut -d.  -f1,2,3` libperl$(get_libname)
 		else
 			local x latest
 
 			# 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/$(get_libdir)/libperl.so.?.*`
+			for x in `ls -1 ${ROOT}usr/$(get_libdir)/libperl$(get_libname).?.*`
 			do
 				latest="${x}"
 			done
 
 			cd ${ROOT}usr/$(get_libdir)
 			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl.so
+			ln -snf `echo ${latest##*/} | cut -d. -f1,2,3` libperl$(get_libname)
 		fi
 	fi
 }