--- perl-5.8.7.ebuild	2005-08-06 15:35:09 -0500
+++ perl-5.8.7.ebuild	2005-08-06 14:53:49 -0500
@@ -13,11 +13,11 @@ 
 S="${WORKDIR}/${MY_P}"
 SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org/"
-LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal"
 PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6"
 
@@ -120,7 +120,7 @@ 
 	# 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
-	epatch "${FILESDIR}"/${P}-regexp-nossp.patch
+	use userland_Darwin || epatch "${FILESDIR}"/${P}-regexp-nossp.patch
 }
 
 src_configure() {
@@ -139,10 +139,13 @@ 
 
 	if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then
 		osname="freebsd"
+	elif [[ ${USERLAND} == "Darwin" ]]; then
+		osname="darwin"
 	else
 		# Default setting
 		osname="linux"
 	fi
 
 	if use ithreads
 	then
@@ -262,8 +265,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}
@@ -523,12 +526,12 @@ 
 
 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)/$(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
 
-	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl.so | sed -e 's:^.*/::'`"
+	local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname) | sed -e 's:^.*/::'`"
 
 	# 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
@@ -536,12 +539,12 @@ 
 	if [ "${perllib}" != "${LIBPERL}" ]
 	then
 		# Delete stale symlinks
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so
-		rm -f ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
-		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT}
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
+		# Regenerate libperl$(get_libname ${PERLSLOT})
+		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
 		# Create libperl.so (we use the *soname* versioned lib here ..)
-		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so
+		ln -snf libperl$(get_libname ${PERLSLOT}) ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
 	fi
 
 	INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }')