--- libperl-5.8.7.ebuild	Thu Aug  4 20:15:31 2005
+++ libperl-5.8.7-r1.ebuild	Fri Aug  5 15:23:47 2005
@@ -66,9 +66,9 @@
 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 ~ppc64 ~s390 ~sh ~sparc ~x86 ppc-macos"
 
 # rac 2004.08.06
 
@@ -129,7 +129,9 @@
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	if ! use ppc-macos; then
+		cd ${S}; epatch ${FILESDIR}/${PN}-create-libperl-soname.patch
+	fi
 
 	# uclibc support - dragonheart 2004.06.16
 	# Now upstreamed - MPC 2005.06.28
@@ -156,9 +158,12 @@
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBsd" ]]; then
 		osname="freebsd"
+	else if [[ ${KERNEL} == "Darwin" ]]; then
+		osname="darwin"
 	else
 		osname="linux"
 	fi
+	fi
 
 	if use ithreads
 	then
@@ -228,8 +233,8 @@
 		-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 depends"
+	emake -j1 -f Makefile LIBPERL=${LIBPERL} ${LIBPERL} || die "Unable to make libperl"
 	mv ${LIBPERL} ${WORKDIR}
 }
 
@@ -247,8 +252,8 @@
 		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}
@@ -317,20 +322,21 @@
 
 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" ]
+	# Make sure we do not have stale/invalid libperl dynamic librarieso '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.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
+	# Next bit is to try and setup the /usr/lib/libperl symlink
 	# properly ...
-	local libnumber="`ls -1 ${ROOT}usr/$(get_libdir)/libperl.so.?.* | grep -v '\.old' | wc -l`"
+	local libnumber
+	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,21 +347,20 @@
 
 			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
 }
-