--- /usr/portage/sys-devel/libperl/libperl-5.8.4-r1.ebuild	2004-09-27 21:37:35.000000000 +1000
+++ libperl-5.8.4-r1.ebuild	2004-10-08 01:22:20.000000000 +1000
@@ -79,10 +79,20 @@
 	SLOT="0"
 fi
 
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+if useq ppc-macos || useq macos; then
+	LPNAME="libperl.dylib"
+	LPSLOT="libperl.${PERLSLOT}.dylib"
+	LPFIND="libperl.?.*.dylib"
+	LIBPERL="libperl.${PERLSLOT}.${SHORT_PV}.dylib"
+else
+	LPNAME="libperl.so"
+	LPSLOT="libperl.so.${PERLSLOT}"
+	LPFIND="libperl.so.?.*"
+	LIBPERL="${LPSLOT}.${SHORT_PV}"
+fi
 
 LICENSE="Artistic GPL-2"
-KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ~ia64 ~ppc64 s390"
+KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ~ia64 ~ppc64 s390 ppc-macos"
 
 DEPEND="!uclibc? ( sys-apps/groff )
 	berkdb? ( sys-libs/db )
@@ -135,7 +145,9 @@
 	#
 	#   LIBPERL=libperl.so.${SLOT}.`echo ${PV} | cut -d. -f1,2`
 	#
-	cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	if ! (useq ppc-macos || useq macos) ; then
+		cd ${S}; epatch ${FILESDIR}/${P}-create-libperl-soname.patch
+	fi
 
 	# uclibc support - dragonheart 2004.06.16
 	cd ${S}; epatch ${FILESDIR}/${P}-uclibc.patch
@@ -215,8 +227,8 @@
 			-Ud_csh \
 			${myconf} || die
 
-		emake -f Makefile depend || die "Couldn't make libperl.so depends"
-		emake -f Makefile ${LIBPERL} || die "Unable to make libperl.so"
+		emake -f Makefile depend || die "Couldn't make ${LPNAME} depends"
+		emake -f Makefile ${LIBPERL} || die "Unable to make ${LPNAME}"
 		mv ${LIBPERL} ${WORKDIR}
 	else
 cat > config.over <<EOF
@@ -274,8 +286,8 @@
 		local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
 		dodir ${coredir}
 		dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
-		dosym ../../../../${LIBPERL} ${coredir}/libperl.so
+		dosym ../../../../${LIBPERL} ${coredir}/${LPSLOT}
+		dosym ../../../../${LIBPERL} ${coredir}/${LPNAME}
 
 		# Fix for "stupid" modules and programs
 		dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
@@ -345,19 +357,19 @@
 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/lib/${LPNAME}" -a ! -L "${ROOT}usr/lib/${LPNAME}" ]
 	then
-		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
+		mv -f ${ROOT}usr/lib/${LPNAME} ${ROOT}usr/lib/${LPNAME}.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/lib/${LPFIND} | 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 ${LPSLOT} ${ROOT}usr/lib/${LPNAME}
 	else
 		if [ -x "${ROOT}/usr/bin/perl" ]
 		then
@@ -365,23 +377,27 @@
 			# if there are already a perl installed, if so, link libperl.so
 			# 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
 			# Link libperl.so to the *soname* versioned lib ...
-			ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` libperl.so
+			if useq ppc-macos || useq macos; then
+				ln -snf `echo libperl.?.${perlversion}.dylib | cut -d. -f1,2,3` ${LPNAME}
+			else
+				ln -snf `echo libperl.so.?.${perlversion} | cut -d. -f1,2,3` ${LPNAME}
+			fi
 		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/lib/libperl.so.?.*`
+			for x in `ls -1 ${ROOT}usr/lib/${LPFIND}`
 			do
 				latest="${x}"
 			done
 
 			cd ${ROOT}usr/lib
 			# 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` ${LPNAME} 
 		fi
 	fi
 }