--- perl-5.8.7.ebuild	2005-08-12 10:52:12 -0500
+++ perl-5.8.7.ebuild-new	2005-08-12 10:51:20 -0500
@@ -264,7 +264,7 @@
 	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
 	dodir ${coredir}
 	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
-	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname).${PERLSLOT}
+	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${PERLSLOT})
 	dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
 
 	# Fix for "stupid" modules and programs
@@ -575,11 +575,11 @@
 	then
 		# Delete stale symlinks
 		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
-		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname).${PERLSLOT}
+		rm -f ${ROOT}usr/$(get_libdir)/libperl$(get_libname ${PERLSLOT})
 		# Regenerate libperl.so.${PERLSLOT}
-		ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/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$(get_libname).${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl$(get_libname)
+		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" }')