diff options
| -rw-r--r-- | dev-lang/perl/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/perl/Manifest | 42 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.7.ebuild | 90 |
3 files changed, 94 insertions, 43 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index f86b24b43a0c..c517a805669d 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.144 2005/08/08 14:58:02 koon Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.145 2005/08/12 10:21:14 mcummings Exp $ + + 12 Aug 2005; Michael Cummings <mcummings@gentoo.org> perl-5.8.7.ebuild: + getlibdir changes for 5.8.7, bug #58931 08 Aug 2005; Thierry Carrez <koon@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 3f9f2d0cdecb..b271c099718f 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,25 +1,35 @@ -MD5 ae644099cbd0a96fee093c4d18297832 perl-5.8.7.ebuild 17709 -MD5 1ca250651f27d47663fed0a39b8ef191 ChangeLog 41371 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0578b5be990ce8e489e9c5875320ff34 ChangeLog 41493 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 +MD5 0fc127afe35b8af9e2c636fc0f2515b5 perl-5.8.7.ebuild 19121 MD5 22cf94434cac9a59de7bd3ad73a814e4 perl-5.8.6-r5.ebuild 17615 -MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 -MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 -MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 -MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250 -MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476 MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 -MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141 -MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023 MD5 ec653227d62631d790aed48ee7ccf3dd files/perl-5.8.7-regexp-nossp.patch 458 -MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64 -MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400 +MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 +MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113 +MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 +MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 +MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007 MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879 +MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446 +MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400 +MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476 +MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141 +MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023 MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573 -MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 -MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 -MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007 -MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 +MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64 +MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489 -MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446 +MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250 +MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.0 (GNU/Linux) + +iD8DBQFC/HgttG5z4I8BtQoRAsKLAJ9dTL623OYjIHAEuhqmdGMRyxVbAACeMnid +9d+xwC9ih2YCymjhpSLOXPc= +=P80A +-----END PGP SIGNATURE----- diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild index 5014c3439c6d..c8d930b0725f 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.4 2005/08/08 14:58:02 koon Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.5 2005/08/12 10:21:14 mcummings Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -13,12 +13,12 @@ DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" 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" -IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sh ~sparc ~x86" +IUSE="berkdb debug doc gdbm ithreads perlsuid build minimal userland_Darwin" PERL_OLDVERSEN="5.8.0 5.8.2 5.8.4 5.8.5 5.8.6" DEPEND="!elibc_uclibc? ( sys-apps/groff ) @@ -120,7 +120,7 @@ src_unpack() { # 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,6 +139,8 @@ src_configure() { if [[ ${KERNEL} == "FreeBSD" && "${ELIBC}" = "FreeBSD" ]]; then osname="freebsd" + elif [[ ${USERLAND} == "Darwin" ]]; then + osname="darwin" else # Default setting osname="linux" @@ -262,8 +264,8 @@ 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.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} @@ -391,6 +393,31 @@ src_remove_extra_files() ${prV}/DirHandle.pm ${prV}/Exporter/Heavy.pm ${prV}/Exporter.pm + ${prV}/ExtUtils/Command.pm + ${prV}/ExtUtils/Constant.pm + ${prV}/ExtUtils/Embed.pm + ${prV}/ExtUtils/Installed.pm + ${prV}/ExtUtils/Install.pm + ${prV}/ExtUtils/Liblist.pm + ${prV}/ExtUtils/MakeMaker.pm + ${prV}/ExtUtils/Manifest.pm + ${prV}/ExtUtils/Mkbootstrap.pm + ${prV}/ExtUtils/Mksymlists.pm + ${prV}/ExtUtils/MM_Any.pm + ${prV}/ExtUtils/MM_MacOS.pm + ${prV}/ExtUtils/MM.pm + ${prV}/ExtUtils/MM_Unix.pm + ${prV}/ExtUtils/MY.pm + ${prV}/ExtUtils/Packlist.pm + ${prV}/ExtUtils/testlib.pm + ${prV}/ExtUtils/Miniperl.pm + ${prV}/ExtUtils/Command/MM.pm + ${prV}/ExtUtils/Constant/Base.pm + ${prV}/ExtUtils/Constant/Utils.pm + ${prV}/ExtUtils/Constant/XS.pm + ${prV}/ExtUtils/Liblist/Kid.pm + ${prV}/ExtUtils/MakeMaker/bytes.pm + ${prV}/ExtUtils/MakeMaker/vmsish.pm ${prV}/fields.pm ${prV}/File/Basename.pm ${prV}/File/Compare.pm @@ -404,32 +431,32 @@ src_remove_extra_files() ${prV}/filetest.pm ${prVA}/attrs.pm ${prVA}/auto/attrs - ${prVA}/auto/Cwd/Cwd.so - ${prVA}/auto/Data/Dumper/Dumper.so + ${prVA}/auto/Cwd/Cwd.$(get_libname) + ${prVA}/auto/Data/Dumper/Dumper.$(get_libname) ${prVA}/auto/DynaLoader/dl_findfile.al - ${prVA}/auto/Fcntl/Fcntl.so - ${prVA}/auto/File/Glob/Glob.so - ${prVA}/auto/IO/IO.so + ${prVA}/auto/Fcntl/Fcntl.$(get_libname) + ${prVA}/auto/File/Glob/Glob.$(get_libname) + ${prVA}/auto/IO/IO.$(get_libname) ${prVA}/auto/POSIX/autosplit.ix ${prVA}/auto/POSIX/fstat.al ${prVA}/auto/POSIX/load_imports.al ${prVA}/auto/POSIX/POSIX.bs - ${prVA}/auto/POSIX/POSIX.so + ${prVA}/auto/POSIX/POSIX.$(get_libname) ${prVA}/auto/POSIX/stat.al ${prVA}/auto/POSIX/tmpfile.al - ${prVA}/auto/re/re.so - ${prVA}/auto/Socket/Socket.so + ${prVA}/auto/re/re.$(get_libname) + ${prVA}/auto/Socket/Socket.$(get_libname) ${prVA}/auto/Storable/autosplit.ix ${prVA}/auto/Storable/_retrieve.al ${prVA}/auto/Storable/retrieve.al - ${prVA}/auto/Storable/Storable.so + ${prVA}/auto/Storable/Storable.$(get_libname) ${prVA}/auto/Storable/_store.al ${prVA}/auto/Storable/store.al ${prVA}/B/Deparse.pm ${prVA}/B.pm ${prVA}/Config.pm ${prVA}/Config_heavy.pl - ${prVA}/CORE/libperl.so + ${prVA}/CORE/libperl$(get_libname) ${prVA}/Cwd.pm ${prVA}/Data/Dumper.pm ${prVA}/DynaLoader.pm @@ -504,6 +531,15 @@ src_remove_extra_files() ${prV}/warnings.pm ${prV}/warnings/register.pm" + # Catch the headers in CORE + if use minimal ; then + for header in `find ${D}${prVA} -name "*.h"|sed -e "s:${D}::g"`; do + #header=`echo $head|sed -e "s:${D}::g"` + MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL} + $header" + done + fi + if use perlsuid ; then MINIMAL_PERL_INSTALL="${MINIMAL_PERL_INSTALL} ${bindir}/suidperl @@ -513,6 +549,8 @@ src_remove_extra_files() pushd ${D} > /dev/null # Remove cruft einfo "Removing files that are not in the minimal install" + echo "${MINIMAL_PERL_INSTALL}" + sleep 120 for f in $(find . -type f); do has ${f} ${MINIMAL_PERL_INSTALL} || rm -f ${f} done @@ -523,12 +561,12 @@ src_remove_extra_files() 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)/libperl$(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 +574,12 @@ pkg_postinst() { if [ "${perllib}" != "${LIBPERL}" ] then # Delete stale symlinks - rm -f ${ROOT}usr/$(get_libdir)/libperl.so - rm -f ${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.so.${PERLSLOT} - ln -snf ${LIBPERL} ${ROOT}usr/$(get_libdir)/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.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" }') @@ -575,7 +613,7 @@ pkg_postinst() { # Tried doing this via -z, but $INC is too big... if [ "${INC}x" != "x" ]; then cleaner_msg - epause 10 + epause 5 fi } @@ -585,7 +623,7 @@ cleaner_msg() { eerror "assist with this transition. This script is capable" eerror "of cleaning out old .ph files, rebuilding modules for " eerror "your new version of perl, as well as re-emerging" - eerror "applications that compiled against your old libperl.so" + eerror "applications that compiled against your old libperl$(get_libname)" eerror eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT." eerror "Part of the rebuilding of applications compiled against " |