diff options
| -rw-r--r-- | dev-lang/perl/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lang/perl/Manifest | 17 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.12.4-r1.ebuild (renamed from dev-lang/perl/perl-5.12.3.ebuild) | 33 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.14.1-r1.ebuild (renamed from dev-lang/perl/perl-5.12.2-r6.ebuild) | 215 |
4 files changed, 158 insertions, 116 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 3ccf1b8c987d..d498f92be170 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/perl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.370 2011/06/24 14:48:58 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.371 2011/08/09 11:42:18 tove Exp $ + +*perl-5.14.1-r1 (09 Aug 2011) +*perl-5.12.4-r1 (09 Aug 2011) + + 09 Aug 2011; Torsten Veller <tove@gentoo.org> -perl-5.12.2-r6.ebuild, + -perl-5.12.3.ebuild, +perl-5.12.4-r1.ebuild, +perl-5.14.1-r1.ebuild: + Add xsubpp to the dual-life scripts list. Cleanup *perl-5.12.4 (24 Jun 2011) diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index e279565c15ef..f61bafd8543d 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -30,9 +30,6 @@ AUX perl-prelink-lpthread.patch 476 RMD160 f3252258e5f7a0f82b5f9ea49598ea9f4b0b4 AUX perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 SHA1 e7de561f7885fb3d49635fa2dc733c0eed63b987 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 DIST perl-5.10.1-9.tar.bz2 7388 RMD160 3758c2c78e22ed55fb90db283cfd9e5998535903 SHA1 edd1150deee51079be514f8ae8a3b14b1912c0ef SHA256 bd84671e6686288c098c26c0a61d1b8471ab38d8c16fb87571011398770cef44 DIST perl-5.10.1.tar.bz2 11608061 RMD160 840b3a5ac3d7f517770ce789676ebd9154d9ee5a SHA1 98b762b5cd4fb76dd354dfa5ba0d21bc2acacaf2 SHA256 9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826 -DIST perl-5.12.2-9.tar.bz2 28124 RMD160 1d870edc1c2a429bbdaf24c919fb9e7efdc3d0d1 SHA1 f3dd0d46404279b810cee6b1c0e9d9ee49acc61f SHA256 88975b0d149f56420607df3ee352cc99dd7a86015052a9a90581ae06e92b5816 -DIST perl-5.12.2.tar.bz2 12348985 RMD160 c41fa3ef2c982172f73d5ddfd695cde747a92e95 SHA1 75dbbdfa5bf8d4fc813503253e2b58486fa5a4eb SHA256 3b9a75fe4ae7a9a2a17be8c8c64754ef6fd706ca528170737b03e3db7d8eae0e -DIST perl-5.12.3-1.tar.bz2 8054 RMD160 f10a9eb37cb976d40868936d85d1413ca28d6e67 SHA1 2b7e2a9379182f6f5da03441c71e720efc59da10 SHA256 5712e8bffc44d1b2b1760e37e053ef481b1ab8e8691137eddd780784dfe4f615 DIST perl-5.12.3-4.tar.bz2 8908 RMD160 62b2a37f5b700f7d04cc8a62f617127a75c30e3c SHA1 b1756aa8dda478054bc36429a67b9c6c58d4aa92 SHA256 6e97770b5db0dc82630451ea87f2d6654591110ac6791e35bd377129e258dc8b DIST perl-5.12.3.tar.bz2 12041247 RMD160 e3c5825aa800e2304dd815858880372500a4f9a0 SHA1 86d77c6cbc7a60068dc14c88ffd0729324d1174f SHA256 7e3ce3f19f2290c2a2a43a98bcf8cb0ccb69b652d67ddc629544339edc6c7343 DIST perl-5.12.4-1.tar.bz2 8045 RMD160 040b90454c088398fffa8167d20c903cd0254dc6 SHA1 ea827025b80d35860550b31993b9565bb593cfe9 SHA256 a5b0a7385773da5e716d74c5f9a46c63d93de96e9e7e60899f40363bd9fe6823 @@ -41,18 +38,18 @@ DIST perl-5.14.1-1.tar.bz2 5074 RMD160 4b177a5a803757151420f53a3cdf9a0d890b0b28 DIST perl-5.14.1.tar.bz2 13266293 RMD160 57347db6c2794f5599f6f59183b6f2a92133a75c SHA1 3f629f84f5bf766d7e24f61af910b10f5981c002 SHA256 29b4a7e7c22d4a980ab9eb1ea486c5c4ee9ec533192a1ce8f3fe9ae32fb1f862 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9 EBUILD perl-5.10.1.ebuild 18125 RMD160 061e49a2031f270f2804923069d98ddf0a8edd40 SHA1 cb35c08fe202cd4e1eae39439cc307193a4bc72d SHA256 ed5ca8861b704f9dbfaa9cadddbe464644dfe93bdefe71d3118abd7d0c935776 -EBUILD perl-5.12.2-r6.ebuild 19364 RMD160 72e25dbd34a8d83c394fd79cc1504eb8c136df02 SHA1 50188994dc6c4db95997df7fea8a1731140be40b SHA256 dda4237f99b44567f529997f66d8c11e19237354e05c28212a4b518b2febe79e EBUILD perl-5.12.3-r1.ebuild 19395 RMD160 2fecbfe18cfc23bf4945ac564356d250088be46a SHA1 a03feeaa327eb4411e7f0fba7bf664aada53bca6 SHA256 88d44ed7abd26f5ee1077d3d52e0f1ba2799aeb34dc60fc612ea9609efe127ed -EBUILD perl-5.12.3.ebuild 19379 RMD160 fe52e4685f96b940966426f760199ba904e7f9f9 SHA1 7bf42b651539b51213b6ff3e2340dba0ec7549b8 SHA256 ce31cbfbf672704da9e0c9fe59aa0f55f13bb4eea899ef7e999ea9ec1ba731ee +EBUILD perl-5.12.4-r1.ebuild 19508 RMD160 06fb1dec73bdc057e89bd8a7f5c9894f5de446c5 SHA1 b21dedc25ae36ae0973f719c6f62abc72a9f758b SHA256 6817408ecbfddfe4c4265729e792058ec0346157317dfc87587350e201a9dd94 EBUILD perl-5.12.4.ebuild 19434 RMD160 1c3ea1f1045ab464bfbcb2530e0662e3e207bf92 SHA1 0f036fb213acc46db1538c85348c4c2fae0b2217 SHA256 1c5946b4c48a1d87026f62d03ef5d4eefc10fa93569d1a4ae78ea4309c77ac25 +EBUILD perl-5.14.1-r1.ebuild 19996 RMD160 c56e6bdcfe2923caa784407cdc6bd4f100845f33 SHA1 2fc45f90032c9223b257ed736567688a1460e5ae SHA256 bb8edc920f0450f1cd78277310a4bf95954e00645a84fa29351e0e6e49d86b6f EBUILD perl-5.14.1.ebuild 19375 RMD160 4366d553c06db5f874a2a9ba0f039b8991fe3310 SHA1 016d380d9ccd3dd7d4af64598c5accdd75b230f4 SHA256 85cf69568c9626ff875c66faa083db9f1411a4ea266e29b0f111029908865fb6 EBUILD perl-5.8.8-r8.ebuild 20685 RMD160 407925611750782be465654d4204c35fb5fd98db SHA1 7dfcf6028d61d42a6303dab28ab5d370f0fc27a6 SHA256 81d7022079a0d387b3caa8af0301e49741da5bd56d8d28f7d19eabf96c558998 -MISC ChangeLog 71698 RMD160 3b60d5647cc6cea8d344d59ee91c9560f6e0c1a1 SHA1 7cd78f9230b1676fb95867b3baed97fe97ec82f0 SHA256 04bf36ff0446420278b7d7911fdf5c76830590f181eaebbaa9a8fcb498075507 +MISC ChangeLog 71955 RMD160 1cd42bfc5fba87b9dabb1c3b776b435f500318bc SHA1 713b21c3cce110dea0d34f0f29752f14630b8273 SHA256 350c4bf4771d7dce785d5f34d9b224a3bf4d5e125e0ae9f0a578d07edf36c78b MISC metadata.xml 451 RMD160 8424230d79d13df7462c454050058b3526a78e92 SHA1 1ae85db5c1c1fc6413ca324ebc93b6894831b437 SHA256 49e06011c113616fa1f618cf58d42c2d6abbce5f71936f109b6ae3a5dfff587c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREIAAYFAk4Eo98ACgkQV3J2n04Eauz5JwCg2EM2gIRejNn8s035Huzjr67D -L+gAniCyU5wqqHR9rjQxvno3nuOmK6Nd -=2soE +iEYEAREIAAYFAk5BHSAACgkQV3J2n04EauxTQgCgoeZPShdinzD2vcHJZAhqOlx2 +zmwAn3EEgz0QXo6vhrUvYVeuSMkLMHwB +=p9ix -----END PGP SIGNATURE----- diff --git a/dev-lang/perl/perl-5.12.3.ebuild b/dev-lang/perl/perl-5.12.4-r1.ebuild index 6a4f3cfee10c..7adc3b31a57f 100644 --- a/dev-lang/perl/perl-5.12.3.ebuild +++ b/dev-lang/perl/perl-5.12.4-r1.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.3.ebuild,v 1.2 2011/03/07 11:35:06 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.4-r1.ebuild,v 1.1 2011/08/09 11:42:18 tove Exp $ -EAPI=3 +EAPI=4 inherit eutils alternatives flag-o-matic toolchain-funcs multilib PATCH_VER=1 -PERL_OLDVERSEN="5.12.2 5.12.1 5.12.0" +PERL_OLDVERSEN="5.12.3 5.12.2 5.12.1 5.12.0" SHORT_PV="${PV%.*}" MY_P="perl-${PV/_rc/-RC}" @@ -18,9 +18,9 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language" SRC_URI=" mirror://cpan/src/${MY_P}.tar.bz2 - mirror://cpan/authors/id/R/RJ/RJBS/${MY_P}.tar.bz2 + mirror://cpan/authors/id/L/LB/LBROCARD/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2" + http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2" # mirror://cpan/src/${MY_P}.tar.bz2 # mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2 HOMEPAGE="http://www.perl.org/" @@ -44,17 +44,18 @@ PDEPEND=">=app-admin/perl-cleaner-2.5" S="${WORKDIR}/${MY_P}" dual_scripts() { - src_remove_dual_scripts perl-core/Archive-Tar 1.54 ptar ptardiff - src_remove_dual_scripts perl-core/Digest-SHA 5.47 shasum - src_remove_dual_scripts perl-core/CPAN 1.9456 cpan - src_remove_dual_scripts perl-core/CPANPLUS 0.90 cpanp cpan2dist cpanp-run-perl - src_remove_dual_scripts perl-core/Encode 2.39 enc2xs piconv - src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56 instmodsh - src_remove_dual_scripts perl-core/Module-Build 0.3603 config_data - src_remove_dual_scripts perl-core/Module-CoreList 2.43 corelist - src_remove_dual_scripts perl-core/PodParser 1.37 pod2usage podchecker podselect - src_remove_dual_scripts perl-core/Test-Harness 3.17 prove - src_remove_dual_scripts perl-core/podlators 2.3.1 pod2man pod2text + src_remove_dual_scripts perl-core/Archive-Tar 1.54 ptar ptardiff + src_remove_dual_scripts perl-core/Digest-SHA 5.47 shasum + src_remove_dual_scripts perl-core/CPAN 1.945.600 cpan + src_remove_dual_scripts perl-core/CPANPLUS 0.900.0 cpanp cpan2dist cpanp-run-perl + src_remove_dual_scripts perl-core/Encode 2.39 enc2xs piconv + src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56 instmodsh + src_remove_dual_scripts perl-core/ExtUtils-ParseXS 2.210.0 xsubpp + src_remove_dual_scripts perl-core/Module-Build 0.3603 config_data + src_remove_dual_scripts perl-core/Module-CoreList 2.500.0 corelist + src_remove_dual_scripts perl-core/PodParser 1.370.0 pod2usage podchecker podselect + src_remove_dual_scripts perl-core/Test-Harness 3.17 prove + src_remove_dual_scripts perl-core/podlators 2.3.1 pod2man pod2text } pkg_setup() { diff --git a/dev-lang/perl/perl-5.12.2-r6.ebuild b/dev-lang/perl/perl-5.14.1-r1.ebuild index a589be41e397..c8c12618d5d4 100644 --- a/dev-lang/perl/perl-5.12.2-r6.ebuild +++ b/dev-lang/perl/perl-5.14.1-r1.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.2-r6.ebuild,v 1.7 2011/03/07 11:35:06 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.14.1-r1.ebuild,v 1.1 2011/08/09 11:42:18 tove Exp $ -EAPI=3 +EAPI=4 inherit eutils alternatives flag-o-matic toolchain-funcs multilib -PATCH_VER=9 +PATCH_VER=1 -PERL_OLDVERSEN="5.12.1 5.12.0" +PERL_OLDVERSEN="5.14.0" +MODULE_AUTHOR=JESSE SHORT_PV="${PV%.*}" MY_P="perl-${PV/_rc/-RC}" @@ -18,43 +19,53 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language" SRC_URI=" mirror://cpan/src/${MY_P}.tar.bz2 - mirror://cpan/authors/id/J/JE/JESSE/${MY_P}.tar.bz2 + mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2 - http://dev.gentoo.org/~tove/files/${MY_P}-${PATCH_VER}.tar.bz2" + http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2" # mirror://cpan/src/${MY_P}.tar.bz2 # mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2 HOMEPAGE="http://www.perl.org/" LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="berkdb build debug doc gdbm ithreads" -COMMON_DEPEND="berkdb? ( sys-libs/db ) +COMMON_DEPEND=" + berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) - >=sys-devel/libperl-5.10.1 - !!<sys-devel/libperl-5.10.1 app-arch/bzip2 - sys-libs/zlib" + sys-libs/zlib +" DEPEND="${COMMON_DEPEND} - elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs )" -RDEPEND="${COMMON_DEPEND}" + elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) +" +RDEPEND="${COMMON_DEPEND} +" PDEPEND=">=app-admin/perl-cleaner-2.5" S="${WORKDIR}/${MY_P}" dual_scripts() { - src_remove_dual_scripts perl-core/Archive-Tar 1.54 ptar ptardiff - src_remove_dual_scripts perl-core/Digest-SHA 5.47 shasum - src_remove_dual_scripts perl-core/CPAN 1.9456 cpan - src_remove_dual_scripts perl-core/CPANPLUS 0.90 cpanp cpan2dist cpanp-run-perl - src_remove_dual_scripts perl-core/Encode 2.39 enc2xs piconv - src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56 instmodsh - src_remove_dual_scripts perl-core/Module-Build 0.3603 config_data - src_remove_dual_scripts perl-core/Module-CoreList 2.38 corelist - src_remove_dual_scripts perl-core/PodParser 1.37 pod2usage podchecker podselect - src_remove_dual_scripts perl-core/Test-Harness 3.17 prove - src_remove_dual_scripts perl-core/podlators 2.3.1 pod2man pod2text + src_remove_dual perl-core/Archive-Tar 1.760.0 ptar ptardiff ptargrep + src_remove_dual perl-core/Digest-SHA 5.610.0 shasum + src_remove_dual perl-core/CPAN 1.960.0 cpan + src_remove_dual perl-core/CPANPLUS 0.910.300 cpanp cpan2dist + src_remove_dual_file perl-core/CPANPLUS 0.910.300 /usr/bin/cpanp-run-perl + src_remove_dual perl-core/Encode 2.420.0 enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 6.570.500_rc instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 2.221.0 xsubpp + src_remove_dual perl-core/JSON-PP 2.271.50 json_pp + src_remove_dual perl-core/Module-Build 0.380.0 config_data + src_remove_dual perl-core/Module-CoreList 2.490.100-rc corelist + src_remove_dual perl-core/PodParser 1.370.0 pod2usage podchecker podselect + src_remove_dual perl-core/Test-Harness 3.230.0 prove + src_remove_dual perl-core/podlators 2.4.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 2.4.0 /usr/share/man/man1/perlpodstyle.1 +} + +pkg_pretend() { + check_rebuild } pkg_setup() { @@ -80,8 +91,8 @@ pkg_setup() { LIBPERL="libperl$(get_libname ${MY_PV} )" PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}" ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}" - SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}" - SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}" + SITE_LIB="/usr/local/$(get_libdir)/perl5/${MY_PV}" + SITE_ARCH="/usr/local/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}" VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}" VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}" @@ -94,6 +105,11 @@ pkg_setup() { ewarn "that compile against perl. You use threading at " ewarn "your own discretion. " fi + check_rebuild + dual_scripts +} + +check_rebuild() { if has_version "<dev-lang/perl-${SHORT_PV}" ; then echo "" ewarn "UPDATE THE PERL MODULES:" @@ -115,7 +131,6 @@ pkg_setup() { ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" fi fi - dual_scripts } src_prepare_update_patchlevel_h() { @@ -130,15 +145,15 @@ src_prepare() { EPATCH_SOURCE="${WORKDIR}/perl-patch" \ EPATCH_SUFFIX="diff" \ EPATCH_FORCE="yes" \ - EPATCH_OPTS+=-p1 \ + EPATCH_OPTS="-p1" \ epatch src_prepare_update_patchlevel_h # pod/perltoc.pod fails # lib/ExtUtils/t/Embed.t fails - ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) - ln -s ${LIBPERL} libperl$(get_libname ) + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die } myconf() { @@ -217,7 +232,7 @@ src_configure() { if [[ -n ${PERL_OLDVERSEN} ]] ; then local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done ) - myconf -Dinc_version_list="$inclist" + myconf -Dinc_version_list="${inclist}" fi [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" @@ -265,11 +280,6 @@ src_configure() { "${myconf[@]}" || die "Unable to configure" } -src_compile() { - # bug 331113 - emake -j1 || die "emake failed" -} - src_test() { if [[ ${EUID} == 0 ]] ; then ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." @@ -284,26 +294,22 @@ src_install() { local i local coredir="${ARCH_LIB}/CORE" -# # Fix for "stupid" modules and programs -# dodir ${SITE_ARCH} ${SITE_LIB} -# keepdir "${VENDOR_ARCH}" #338802 for enc2xs - local installtarget=install if use build ; then installtarget=install.perl fi - make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}" + emake DESTDIR="${D}" ${installtarget} rm -f "${D}"/usr/bin/perl - ln -s perl${MY_PV} "${D}"/usr/bin/perl + ln -s perl${MY_PV} "${D}"/usr/bin/perl || die - dolib.so "${D}"/${coredir}/${LIBPERL} || die - dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die - dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die - rm -f "${D}"/${coredir}/${LIBPERL} - dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL} - dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV}) - dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname) + dolib.so "${D}"${coredir}/${LIBPERL} + rm -f "${D}"${coredir}/${LIBPERL} + ln -sf ${LIBPERL} "${D}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ${LIBPERL} "${D}"/usr/$(get_libdir)/libperl$(get_libname) || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${D}"${coredir}/${LIBPERL} || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${D}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${D}"${coredir}/libperl$(get_libname) || die rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages" @@ -325,7 +331,7 @@ src_install() { # ( use berkdb && has_version '=sys-libs/db-1*' ) || # find "${D}" -name "*NDBM*" | xargs rm -f - dodoc Changes* README AUTHORS || die + dodoc Changes* README AUTHORS if use doc ; then # HTML Documentation @@ -352,8 +358,8 @@ pkg_postinst() { if [[ "${ROOT}" = "/" ]] ; then local INC DIR file - INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }') - ebegin "Removing old .ph files" + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }') + einfo "Removing old .ph files" for DIR in ${INC} ; do if [[ -d "${DIR}" ]] ; then for file in $(find "${DIR}" -name "*.ph" -type f ) ; do @@ -368,11 +374,12 @@ pkg_postinst() { find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null fi done - if ! use build ; then - ebegin "Generating ConfigLocal.pm (ignore any error)" - enc2xs -C - fi - ebegin "Converting C header files to the corresponding Perl format (ignore any error)" +# if ! use build ; then +# ebegin "Generating ConfigLocal.pm (ignore any error)" +# enc2xs -C +# fi + + einfo "Converting C header files to the corresponding Perl format (ignore any error)" pushd /usr/include >/dev/null h2ph -Q -a -d ${ARCH_LIB} \ asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \ @@ -419,42 +426,71 @@ cleaner_msg() { eerror "" } -src_remove_dual_scripts() { +src_remove_dual_file() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + alternatives_auto_makesym "${i}" "${i}-[0-9]*" + done + ;; + setup) + for i in "$@" ; do + if [[ -f ${ROOT}${i} && ! -h ${ROOT}${i} ]] ; then + has_version ${pkg} && ewarn "You must reinstall ${pkg} !" + break + fi + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${D}"${i} ]] ; then + use build || ewarn "${i} does not exist!" + continue + fi + mv "${D}"${i}{,-${ver}-${P}} || die + done + ;; + esac +} +src_remove_dual_man() { local i pkg ver ff pkg="$1" ver="$2" shift 2 - if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then - for i in "$@" ; do - alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*" - if [[ ${i} != cpanp-run-perl ]] ; then - ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*` - ff=${ff##*.1} - alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*" - fi - done - elif has "${EBUILD_PHASE:-none}" "setup" ; then - for i in "$@" ; do - if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then - has_version ${pkg} && ewarn "You must reinstall $pkg !" - break - fi - done - else - for i in "$@" ; do - if ! [[ -f "${D}"/usr/bin/${i} ]] ; then - use build || ewarn "/usr/bin/${i} does not exist!" - continue - fi - mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die - if [[ -f ${D}/usr/share/man/man1/${i}.1 ]] ; then - mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die - else - echo "/usr/share/man/man1/${i}.1 does not exist!" - fi - done - fi + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + ff=`echo "${ROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*` + ff=${ff##*${i#${i%.[0-9]}}} + alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*" + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${D}"${i} ]] ; then + use build || ewarn "${i} does not exist!" + continue + fi + mv "${D}"${i} "${D}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die + done + ;; + esac +} + +src_remove_dual() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + for i in "$@" ; do + src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}" + src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1" + done } src_remove_extra_files() { @@ -498,6 +534,7 @@ src_remove_extra_files() { .${PRIV_LIB}/ExtUtils/MM_Unix.pm .${PRIV_LIB}/ExtUtils/MY.pm .${PRIV_LIB}/ExtUtils/MakeMaker.pm + .${PRIV_LIB}/ExtUtils/MakeMaker/Config.pm .${PRIV_LIB}/ExtUtils/Manifest.pm .${PRIV_LIB}/ExtUtils/Miniperl.pm .${PRIV_LIB}/ExtUtils/Mkbootstrap.pm @@ -630,7 +667,7 @@ src_remove_extra_files() { # Remove empty directories find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null #for f in ${MINIMAL_PERL_INSTALL} ; do - # [[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL" + # [[ -e ${f} ]] || ewarn "${f} unused in MINIMAL_PERL_INSTALL" #done popd > /dev/null } |