diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2005-08-14 15:45:53 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2005-08-14 15:45:53 +0000 |
| commit | 5221c8c6b40bc9af4e1aa2dd7fb75fc909108411 (patch) | |
| tree | 4259457fddfb6e84b2c5877669224267a0f52d2a /dev-lang | |
| parent | trailing space, manifest rebuild (diff) | |
| download | gentoo-2-5221c8c6b40bc9af4e1aa2dd7fb75fc909108411.tar.gz gentoo-2-5221c8c6b40bc9af4e1aa2dd7fb75fc909108411.tar.bz2 gentoo-2-5221c8c6b40bc9af4e1aa2dd7fb75fc909108411.zip | |
The rest of the patch for bug 58931
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/perl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/perl/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.7.ebuild | 8 |
3 files changed, 9 insertions, 16 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 34817eec7c19..c5d6159a18b1 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.147 2005/08/14 10:54:16 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.148 2005/08/14 15:45:53 mcummings Exp $ + + 14 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.7.ebuild: + The rest of the patch for bug 58931 14 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.6-r5.ebuild, perl-5.8.7.ebuild: diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index ad594bcf5202..9477a6ada2f4 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,9 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 ecdbb0a307a5d7ca1026bf21d7bde076 ChangeLog 41791 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 c6957defd2c2523df46f5c9c386de0ed perl-5.8.7.ebuild 19076 +MD5 3721aa4f06d132d4b2abccc1c7ed780f perl-5.8.7.ebuild 19076 MD5 026ffd8b4022d4c2a42f24d5ecc9c5b4 perl-5.8.6-r5.ebuild 17591 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 @@ -26,10 +23,3 @@ MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 MD5 ec653227d62631d790aed48ee7ccf3dd files/perl-5.8.7-regexp-nossp.patch 458 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC/yLrtG5z4I8BtQoRAu31AJ9OMmOTLICLuIUlzsctqefw5DpSZACdHn6+ -xLqFbmItq9tRJXySJTwVNm8= -=UIV2 ------END PGP SIGNATURE----- diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild index 62fcc8335480..f1a19db8620c 100644 --- a/dev-lang/perl/perl-5.8.7.ebuild +++ b/dev-lang/perl/perl-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/dev-lang/perl/perl-5.8.7.ebuild,v 1.8 2005/08/14 10:54:16 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.9 2005/08/14 15:45:53 mcummings Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -266,7 +266,7 @@ 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$(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 @@ -577,11 +577,11 @@ pkg_postinst() { 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} # 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" }') |