From 7be183c15f7df7adf30766f3e691b34d296e1a35 Mon Sep 17 00:00:00 2001 From: Herbie Hopkins Date: Mon, 23 May 2005 11:25:53 +0000 Subject: More get_libdir-ization, fixes compilation on amd64's no-lib32 profile. Package-Manager: portage-2.0.51.22-r1 --- dev-lang/perl/ChangeLog | 5 ++- dev-lang/perl/Manifest | 70 +++++++++++++++++++------------------- dev-lang/perl/perl-5.8.6-r4.ebuild | 22 ++++++------ 3 files changed, 50 insertions(+), 47 deletions(-) (limited to 'dev-lang') diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 3bea0b52737d..c3eaf3ce089d 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.116 2005/05/16 16:14:32 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.117 2005/05/23 11:25:53 herbs Exp $ + + 23 May 2005; Herbie Hopkins perl-5.8.6-r4.ebuild: + More get_libdir-ization, fixes compilation on amd64's no-lib32 profile. 16 May 2005; Michael Cummings perl-5.8.2-r4.ebuild, perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild: diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 9f00a7c3e403..43b0f66cfc67 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,52 +1,52 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 8383d165119f5431459b9002f3d84d7b ChangeLog 35866 -MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 290826f9f4eb8a2c1a587948b6a93c68 perl-5.8.2-r4.ebuild 11083 MD5 994914600d0321d557517e19f2e89524 perl-5.8.4-r4.ebuild 13221 MD5 41209d7161da73d7712064aed0e118b3 perl-5.8.5-r5.ebuild 12862 -MD5 9360ccc740e14e68ddfbcf22d18be15c perl-5.8.6-r4.ebuild 12940 +MD5 32e75f5309c3cc3c9d8603b351ab5806 perl-5.8.6-r4.ebuild 13056 +MD5 290826f9f4eb8a2c1a587948b6a93c68 perl-5.8.2-r4.ebuild 11083 +MD5 6f2e3d2ecd3234964175430e74fac3f5 ChangeLog 36008 +MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 +MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446 +MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.6-prelink-lpthread.patch 476 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250 +MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.6-reorder-INC.patch 2211 +MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.5-prelink-lpthread.patch 476 +MD5 3195cf2f1f12f77ecc5b9c4fe9ea0995 files/libperl_rebuilder 10556 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211 +MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211 +MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 +MD5 2e12f5128439c83b3c5a3615253f4d8f files/perl-cleaner 8606 +MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.5-picdl.patch 250 +MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489 +MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476 +MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.5-noksh.patch 611 +MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573 +MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.6-picdl.patch 250 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250 +MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489 +MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 +MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.5-reorder-INC.patch 2211 MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r4 64 MD5 93155b02a7e9d3cdc6d6934ce78d9f11 files/digest-perl-5.8.4-r4 64 MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-perl-5.8.5-r5 64 MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r4 64 -MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 -MD5 3195cf2f1f12f77ecc5b9c4fe9ea0995 files/libperl_rebuilder 10556 -MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch 446 -MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.2-perldoc-emptydirs.patch 489 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250 -MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.2-prelink-lpthread.patch 476 -MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.2-reorder-INC.patch 2211 -MD5 ce442db939c59218a16be167f793b817 files/perl-5.8.2-uclibc.patch 573 -MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 -MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.4-noksh.patch 611 -MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.4-nonblock.patch 400 -MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.4-perldoc-emptydirs.patch 489 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.4-picdl.patch 250 -MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.4-prelink-lpthread.patch 476 -MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.4-reorder-INC.patch 2211 -MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.5-noksh.patch 611 -MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.5-perldoc-emptydirs.patch 489 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.5-picdl.patch 250 -MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.5-prelink-lpthread.patch 476 -MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.5-reorder-INC.patch 2211 -MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113 MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-5.8.6-noksh.patch 611 +MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 +MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 +MD5 01af75daf3d222a668059e90d78a1f9d files/perl-5.8.5-nonblock.patch 400 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-5.8.6-perldoc-emptydirs.patch 489 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.6-picdl.patch 250 -MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.6-prelink-lpthread.patch 476 -MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.6-reorder-INC.patch 2211 -MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 -MD5 2e12f5128439c83b3c5a3615253f4d8f files/perl-cleaner 8606 -MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCiMcHtG5z4I8BtQoRAmKmAJ9qE6lJLWQjev8QmhFud4J/InrnnACglJoR -P7pOdJAjYzahouF2iJ6rGlw= -=f7Aj +iD8DBQFCkb462G5bA0cA/ScRAgYXAKDkE/JkH0wbPEM+vOYS/yCLm3ELPACg0Ffi +7/OrwWNZf3gI4zUicio18vI= +=Y8E6 -----END PGP SIGNATURE----- diff --git a/dev-lang/perl/perl-5.8.6-r4.ebuild b/dev-lang/perl/perl-5.8.6-r4.ebuild index cca2676910ae..4568ae2ce806 100644 --- a/dev-lang/perl/perl-5.8.6-r4.ebuild +++ b/dev-lang/perl/perl-5.8.6-r4.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.6-r4.ebuild,v 1.6 2005/05/16 16:14:32 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.7 2005/05/23 11:25:53 herbs Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -56,12 +56,12 @@ pkg_setup() { ewarn "" fi - if [ ! -f "${ROOT}/usr/lib/${LIBPERL}" ] + if [ ! -f "${ROOT}/usr/$(get_libdir)/${LIBPERL}" ] then # Make sure we have libperl installed ... - eerror "Cannot find ${ROOT}/usr/lib/${LIBPERL}! Make sure that you" + eerror "Cannot find ${ROOT}/usr/$(get_libdir)/${LIBPERL}! Make sure that you" eerror "have sys-libs/libperl installed properly ..." - die "Cannot find /usr/lib/${LIBPERL}!" + die "Cannot find /usr/$(get_libdir)/${LIBPERL}!" fi } @@ -347,12 +347,12 @@ EOF 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/$(get_libdir)/libperl.so" -a ! -L "${ROOT}usr/$(get_libdir)/libperl.so" ] then - mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old + mv -f ${ROOT}usr/$(get_libdir)/libperl.so ${ROOT}usr/$(get_libdir)/libperl.so.old fi - local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`" + local perllib="`readlink -f ${ROOT}usr/$(get_libdir)/libperl.so | 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 @@ -360,12 +360,12 @@ pkg_postinst() { if [ "${perllib}" != "${LIBPERL}" ] then # Delete stale symlinks - rm -f ${ROOT}usr/lib/libperl.so - rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT} + 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/lib/libperl.so.${PERLSLOT} + ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/libperl.so.${PERLSLOT} # Create libperl.so (we use the *soname* versioned lib here ..) - ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so + ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/$(get_libdir)/libperl.so fi INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${PV}'|etc|local|perl$/; print "$line\n" }') -- cgit v1.2.3-65-gdbad