dev-lang/perl: revision bump

4 files changed, 181 insertions, 2 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index e2e04e6..774540b 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/perl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.459 2014/11/29 20:57:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.460 2014/12/19 18:52:46 dilfridge Exp $
+
+*perl-5.20.1-r4 (19 Dec 2014)
+
+  19 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -perl-5.20.1-r2.ebuild, +perl-5.20.1-r4.ebuild,
+  +files/eblits/src_install-v50200001.eblit:
+  Make perl5.20.1 a symlink to perl, not the other way around, bug 527380
 
   29 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-5.18.2-r2.ebuild,
   perl-5.20.1-r2.ebuild, perl-5.20.1-r3.ebuild:
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index c47ce88..8a83e70 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -5,6 +5,7 @@ AUX eblits/pkg_setup-v50160001.eblit 2481 SHA256 534a3980aa8a7c6709d997708f626ea
 AUX eblits/src_configure-v50160001.eblit 4591 SHA256 bdaf3845a0db91c601022ccd4f56f65137d0461440aae0e506b25db462e6228c SHA512 802a4a4eefeec457b120d3e822d09f5cc75fb0aff76d45d439f2c02b21eee609a2a69c86e1325f5ae5437d98014cd65c80db057a7e699d8375416e1e5086d17c WHIRLPOOL 68e83205a145af6a9296db11ca98bde3ed92054a560755b5dabe3aadf1b4a893949a073ffc486bc463fcc262ff28d344eb77dd7bfa17a97e7117c74604bbde9d
 AUX eblits/src_configure-v50180002.eblit 4877 SHA256 fa308d9aec48ea45dd5d8a0f0e1a93b5d9aaa7ff0ccd62865e3f2f9b5eecf39d SHA512 269dc7e37fea85f6881741447d5a3b32327f66be44d61ffc705f74541d4d0ddf1601ef2cf1d98fcf178cceda76795fd6764a8761223f587644f0d518c4f7e2ca WHIRLPOOL f82bfadaa0ef94afd7abaaeeef222f201aafc62836437dd0cc4a60ab1361bc3e15a7f494900d63cba6a3b1a65d726bf1da466d63e267bb860f79797176a69000
 AUX eblits/src_install-v50160001.eblit 2122 SHA256 64a8d7bcfd7757e8f15c28f4457240390f5f0ffff3c8c72c3e01a2612b668cec SHA512 ecea3ae0006fa2b009c15cf7ceca989058738e2e893b053dc0bf904ce17443b7d21ed033f09997535fd86da608d1c95d1b93a55268c06cf164d7894a71616e2c WHIRLPOOL a9c5531a799a3054ff3fd9add4e81e818f6f4d01d4826728274a15d98cee2a20188dee906f565ce4b413813068db4ac347ef7b717cd4b9526f54ba208c309491
+AUX eblits/src_install-v50200001.eblit 1703 SHA256 236acc83017c76008d52294edbc76f8904024a8471ea077a22bb01ba41eb0814 SHA512 a7282636abcbbc9e476ae3d7353a88289733d7fc74807afbb9bee407942487ca057b97e4e49f7b6d3b62741cb2d4a59e4cb6e92f17704be1890b5f3e6ec3111a WHIRLPOOL a5669019b27ea2774dc7961128f964fcd1df03a443fe331e05cc09d33a29c0fec4d43a564579efc695a7582f0ab145eb78eb339ed128eb7700ded8fc231c926c
 AUX eblits/src_prepare-v50160001.eblit 2114 SHA256 dc803c75ffa7194149d7891c90cbdcd56e634afa6d0988db52242c27a6e1df3e SHA512 e6a32a3fd4b1b35ea146aefb67df74517304237d3fede12feaf52a1eed5880c2c15ad3b6bf2eb5bd153c60df5d6e9da583408d469d9014299dd4704e9a65d3db WHIRLPOOL b93e03c60c76a34da9d783bd88b2e0ec6c34c9a3a291973ad856180f4ed7b88ccbdd57fb95227c809c27a8a7537c67bf5ed573f5d7eba35b147ba26242438313
 AUX eblits/src_test-v50160001.eblit 503 SHA256 35a8a1a6f89e351e4587c82ef3c30699f8a37d78570e28510c5e02bc9e352198 SHA512 09c6f1b253119d0ad7f7d698c37d9d1979a67a2866c72677177c47d9e7c413a7588e2e531bb1e9790ce49add618b768a7fa271e05171a3ce73fa4433034f91f7 WHIRLPOOL 9aae83a23fc6246d26729ad940a7a13bb89e3b2223581e34000f8a93470455bc8ca5b71ae47bf5e6809544793fe21f7207beca3681990c849838497f32f08b51
 AUX perl-cwd-prefix.patch 533 SHA256 efe227ad8f93be5e037f1f2cfb42a18845282fe345c969c5aa2772df3729feb4 SHA512 fc51d41295f18c77a9138a50bc4c312bb5fbfbc675b128dd574aee8955fea9453658ac436719f89dd3d9e653aa0a2de9400216f35538c59a795f8607222e4799 WHIRLPOOL dc5755ab9da8e9f00c1903f9d2a2ae217961caf272bf0a58201e7702ad74f49fe80ee3c86a781eff280f3fee324fd709653c9f90c5aa9de2aa3cefac4eda36c7
@@ -24,5 +25,6 @@ DIST perl-5.20.1.tar.bz2 13676155 SHA256 ede5ded37e7fb6139b04728cfca826f17076f98
 EBUILD perl-5.18.2-r2.ebuild 4471 SHA256 5b7a5373e678e819c101136810a0642fc04db5eacba8b5c1d77f0e6bbbe0c095 SHA512 30939b56a72df0c641f1a2b8647f8f2a23d09ecee7917b591821e71745674f615a19230c4a7586b50f513a12364531a5f03634609cd701eca2a1715c6a9e8060 WHIRLPOOL 4caf03ce5252734a061b22d46c960b776369e1d9768b6e8a61e44ec27e5bc693b4dac18b480bb63810803396b0c70a11d8476c242e39cff69950915c945ad412
 EBUILD perl-5.20.1-r2.ebuild 4277 SHA256 dfa445893277333b8ddacb5e537137c158b97a7f6e43064ea0108877d524882a SHA512 c6fdfeba32f2a6bb67a99ebcb910c3f9d0ea21ab1cd021960b47d893b62306cbd385eccce4324fe019cc809e6e367eea517f70217a9f525dc1ad63c495014fbf WHIRLPOOL 31e8e56d90187275e609884cda944e42aaf86d09db1040ed3092951c9fd9602876c0481daea362eea5d4b888c6414e673bb3855bfb817affa2bf72f7737cc05d
 EBUILD perl-5.20.1-r3.ebuild 4263 SHA256 ad32d410c3c798bb42b101e27944df8c7b8304cdda37800467d9fa0a74c688a3 SHA512 1e6a13b4d93bfd6eb27b8b88baaf3f74503cf05264ab00192dbb48ef2c40ec79a0084e0192137b480dd272622296b2514b6f2d0a5035428562702dcb9d808ed8 WHIRLPOOL 7eb45eca009fad17535ed0ef6bf32143356cf8523bccc9ba3015f969f3f5c251bc46b2b5f0e790a4ddc0fdf87acf953cbc56dc7537afbe4e4157c4b3ee23b8c8
-MISC ChangeLog 86649 SHA256 00e3354d5938e08bb7c015db051a61533d6e659760d169125aefb17f9b9d11c3 SHA512 5eafc530f90880176026cebf02f9fb8421cdbcdb58a501ac0cc0fcbd92015d5110e76833a30c129cd213a81f954dfa8bb949848f1c101b8da431924c2e288821 WHIRLPOOL 2fa60b08ce41749a995e82c5924fdfd7474c2422f30aef7d4d3438ea546e32c311e05933ae557bedfd99233be27e7c7a2e10d15b0597c1912c56839aae5b06ed
+EBUILD perl-5.20.1-r4.ebuild 4263 SHA256 33fcf1dbb05e065c0442cef0f9e7f5f3028a522fca9cca2c6b5304ae8ce20ded SHA512 14c336f8343c3077d4773ca19c4ba2dda1ef99b791a93fc5162b195ea385aef1b655d5442f350c6c3347c718ba5a7e30abea5b0cb56760f0434a1189194eed88 WHIRLPOOL 8a7a75f4f26cbe52ecfb3376b3063db76d04d01357fede7f3c00eab5dad907a1f7cbaa1370c5a549d3bc87af09839132d501b71a38e18703b422f617e9d2f8bd
+MISC ChangeLog 86907 SHA256 b73149be2af10d27628c745907a2b0648f934f6eba893041cdc34a7ea051dbf7 SHA512 544c3dad283664a391fba74684bd2a2f136365944c3d8121f8c9c7ce153eb39c3ad7857549be95631ef40647d9bda9604e7a770b01576d222a9412843b02b539 WHIRLPOOL c14eaff1cb0a5697adefa68af16c08c5872a356cc44d5ec3a67aaa34b47d824d9e84eff8b81f682fd226dc8a0a603c7a23a82ca48b450710cc09a260c81decca
 MISC metadata.xml 257 SHA256 94d99e58fcedfe7951797e5cbd70790c21b87c1e07a7003f650632bb0a4f2300 SHA512 caf80fd9d8931ab6d476afc21fcc840894cdb4cf548d196958321a0ba09ab83ff98de3f8b5f01701f8101fd0ec0fcfc35ae6e572aa8ef499b106c3ac8cabb769 WHIRLPOOL 7793b51d68b2c56ff1d6029be61fc41007af60c7143e8d82d87891e2863c1978c92d2bc13a0266e4506b69c0012a8555d27ce05061e4ce8c656b32e937badeae
diff --git a/dev-lang/perl/files/eblits/src_install-v50200001.eblit b/dev-lang/perl/files/eblits/src_install-v50200001.eblit
new file mode 100644
index 0000000..1df4296
--- /dev/null
+++ b/dev-lang/perl/files/eblits/src_install-v50200001.eblit
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_install-v50200001.eblit,v 1.1 2014/12/19 18:52:46 dilfridge Exp $
+
+eblit-perl-src_install() {
+	local i
+	local coredir="${ARCH_LIB}/CORE"
+
+	emake DESTDIR="${D}" install
+
+	rm -f "${ED}/usr/bin/perl${MY_PV}"
+	ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die
+
+	if ! tc-is-static-only ; then
+		dolib.so "${ED}"${coredir}/${LIBPERL}
+		rm -f "${ED}"${coredir}/${LIBPERL}
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die
+		ln -sf ../../../../../$(get_libdir)/${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die
+	fi
+
+	rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages"
+
+	# This removes ${D} from Config.pm
+	for i in $(find "${D}" -iname "Config.pm" ) ; do
+		einfo "Removing ${D} from ${i}..."
+		sed -i -e "s:${D}::" "${i}" || die "Sed failed"
+	done
+
+	find "${ED}" -type f -name .packlist -delete || die
+
+	dodoc Changes* README AUTHORS
+
+	if use doc ; then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		LD_LIBRARY_PATH=. ./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${ED}/usr/share/doc/${PF}/html"
+	fi
+
+	[[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local
+
+	dual_scripts
+}
diff --git a/dev-lang/perl/perl-5.20.1-r4.ebuild b/dev-lang/perl/perl-5.20.1-r4.ebuild
new file mode 100644
index 0000000..49a3b94
--- /dev/null
+++ b/dev-lang/perl/perl-5.20.1-r4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.20.1-r4.ebuild,v 1.1 2014/12/19 18:52:46 dilfridge Exp $
+
+EAPI=5
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=2
+
+PERL_OLDVERSEN="5.20.0"
+MODULE_AUTHOR=RJBS
+
+SHORT_PV="${PV%.*}"
+MY_P="perl-${PV/_rc/-RC}"
+MY_PV="${PV%_rc*}"
+
+DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
+
+SRC_URI="
+	mirror://cpan/src/5.0/${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}-patches-${PATCH_VER}.tar.xz
+	http://dev.gentoo.org/~dilfridge/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz
+"
+HOMEPAGE="http://www.perl.org/"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0/${SHORT_PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb debug doc gdbm ithreads"
+
+RDEPEND="
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	!prefix? ( elibc_FreeBSD? ( sys-freebsd/freebsd-mk-defs ) )
+"
+PDEPEND="
+	>=app-admin/perl-cleaner-2.5
+	>=virtual/perl-File-Temp-0.230.400-r2
+	>=virtual/perl-Data-Dumper-2.154.0
+"
+# bug 390719, bug 523624
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        1.960.0      ptar ptardiff ptargrep
+	src_remove_dual      perl-core/Digest-SHA         5.880.0      shasum
+	src_remove_dual      perl-core/CPAN               2.50.0      cpan
+	src_remove_dual      perl-core/Encode             2.600.0      enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 6.980.0      instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.240.0      xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.64.0       zipdetails
+	src_remove_dual      perl-core/JSON-PP            2.272.30      json_pp
+	src_remove_dual      perl-core/Module-Build       0.420.500    config_data
+	src_remove_dual      perl-core/Module-CoreList    5.20.1      corelist
+	src_remove_dual      perl-core/Pod-Parser         1.620.0      pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        3.230.0      perldoc
+	src_remove_dual      perl-core/Test-Harness       3.330.0      prove
+	src_remove_dual      perl-core/podlators          2.5.3        pod2man pod2text
+	src_remove_dual_man  perl-core/podlators          2.5.3        /usr/share/man/man1/perlpodstyle.1
+}
+
+# eblit-include [--skip] <function> [version]
+eblit-include() {
+	local skipable=false
+	[[ $1 == "--skip" ]] && skipable=true && shift
+	[[ $1 == pkg_* ]] && skipable=true
+
+	local e v func=$1 ver=$2
+	[[ -z ${func} ]] && die "Usage: eblit-include <function> [version]"
+	for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
+		e="${FILESDIR}/eblits/${func}${v}.eblit"
+		if [[ -e ${e} ]] ; then
+			. "${e}"
+			return 0
+		fi
+	done
+	${skipable} && return 0
+	die "Could not locate requested eblit '${func}' in ${FILESDIR}/eblits/"
+}
+
+# eblit-run-maybe <function>
+# run the specified function if it is defined
+eblit-run-maybe() {
+	[[ $(type -t "$@") == "function" ]] && "$@"
+}
+
+# eblit-run <function> [version]
+# aka: src_unpack() { eblit-run src_unpack ; }
+eblit-run() {
+	eblit-include --skip common "${*:2}"
+	eblit-include "$@"
+	eblit-run-maybe eblit-$1-pre
+	eblit-${PN}-$1
+	eblit-run-maybe eblit-$1-post
+}
+
+#src_unpack()	{ eblit-run src_unpack    v50160001 ; }
+src_prepare()	{ eblit-run src_prepare   v50160001 ; }
+src_configure()	{ eblit-run src_configure v50180002 ; }
+#src_compile()	{ eblit-run src_compile   v50160001 ; }
+src_test()		{ eblit-run src_test      v50160001 ; }
+src_install()	{ eblit-run src_install   v50200001 ; }
+
+# FILESDIR might not be available during binpkg install
+# FIXME: version passing
+for x in setup {pre,post}{inst,rm} ; do
+	e="${FILESDIR}/eblits/pkg_${x}-v50160001.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} v50160001 ; }"
+	fi
+done