dev-lang/perl: migrate workaround for broken configure script to latest version

3 files changed, 175 insertions, 4 deletions

diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index c14d03e..24a27e3 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,2 +1,4 @@
 DIST perl-5.22.1-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fabb6dcd779c7458a05a73aae51ecc1508 SHA512 2a0a74c935273ae3eafaebc6ed20c730a49f542433d899d51baaa3c3e7a291974fcef734d6320895811b4a6944c4e36b2a01400ed751a11c5d3edd6491bbf41b WHIRLPOOL 58888d5c3d35a217e9f61ee9f1406ea5383d192b0875dc736f124613056f71837d84346431127be3c56ae780394aa86cd18d9fad9740e7970e704beb5d2bf112
 DIST perl-5.22.1.tar.bz2 13696599 SHA256 e98e4075a3167fa40524abe447c30bcca10c60e02a54ee1361eff278947a1221 SHA512 4da26b1d3d8525c58677abd2c5c354ccaa4b1b260ebe7dfe379d51a5da00ac7ae06cb668011faac2aaf56229fd22b275c13a74c8c9dbc59cc155a36c0e7e8355 WHIRLPOOL 03d8a050421f1f1899ad8b195d61d0cc55ce061b39ab4dab41b0fbb079a4871d76e968943b83e8165f2f4d1fa42bc87e1c6780aeae1ccc22a720115dfddf17cb
+DIST perl-5.22.2-patches-1.tar.xz 19920 SHA256 c128b4d1575f3bcf1952a1526b5725fabb6dcd779c7458a05a73aae51ecc1508 SHA512 2a0a74c935273ae3eafaebc6ed20c730a49f542433d899d51baaa3c3e7a291974fcef734d6320895811b4a6944c4e36b2a01400ed751a11c5d3edd6491bbf41b WHIRLPOOL 58888d5c3d35a217e9f61ee9f1406ea5383d192b0875dc736f124613056f71837d84346431127be3c56ae780394aa86cd18d9fad9740e7970e704beb5d2bf112
+DIST perl-5.22.2.tar.bz2 13717881 SHA256 f2322b9b04fe0cdbca9fe755360da04892cb6483d44959457cfebc0bcddc8058 SHA512 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a WHIRLPOOL bdfd1035728619abafeb679cdd3181269a91fad5c30f4995e91d5ae16cb65210ce2c4c47afe85eb192ebde88c0bbc4cd0ed77939acdfd09760b11b57eeace2a6
diff --git a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
index 6e0dcaa..1a28e5a 100644
--- a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
+++ b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
@@ -107,12 +107,49 @@ eblit-perl-src_configure() {
 
 	myconf -Dnoextensions="${disabled_extensions}"
 
-	[[ ${ARCH} == arm* ]] &&  myconf -Ud_longdbl
+#	[[ ${ARCH} == arm* ]] &&  myconf -Ud_longdbl
 
-	use nmext && myconf -Uusenm
+	echo Configuring Perl as follows:
+	echo sh Configure \
+		-des \
+		-Duseshrplib \
+		-Darchname="${myarch}" \
+		-Dcc="$(tc-getCC)" \
+		-Doptimize="${CFLAGS}" \
+		-Dldflags="${LDFLAGS}" \
+		-Dprefix="${EPREFIX}"'/usr' \
+		-Dinstallprefix="${EPREFIX}"'/usr' \
+		-Dsiteprefix="${EPREFIX}"'/usr/local' \
+		-Dvendorprefix="${EPREFIX}"'/usr' \
+		-Dscriptdir="${EPREFIX}"'/usr/bin' \
+		-Dprivlib="${EPREFIX}${PRIV_LIB}" \
+		-Darchlib="${EPREFIX}${ARCH_LIB}" \
+		-Dsitelib="${EPREFIX}${SITE_LIB}" \
+		-Dsitearch="${EPREFIX}${SITE_ARCH}" \
+		-Dvendorlib="${EPREFIX}${VENDOR_LIB}" \
+		-Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \
+		-Dman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \
+		-Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \
+		-Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \
+		-Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \
+		-Dman1ext='1' \
+		-Dman3ext='3pm' \
+		-Dlibperl="${LIBPERL}" \
+		-Dlocincpth="${EPREFIX}"'/usr/include ' \
+		-Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \
+		-Duselargefiles \
+		-Dd_semctl_semun \
+		-Dcf_by='Gentoo' \
+		-Dmyhostname='localhost' \
+		-Dperladmin='root@localhost' \
+		-Dinstallusrbinperl='n' \
+		-Ud_csh \
+		-Uusenm \
+		"${myconf[@]}"
 
 	sh Configure \
-		-O \
 		-des \
 		-Duseshrplib \
 		-Darchname="${myarch}" \
@@ -148,6 +185,6 @@ eblit-perl-src_configure() {
 		-Dperladmin='root@localhost' \
 		-Dinstallusrbinperl='n' \
 		-Ud_csh \
+		-Uusenm \
 		"${myconf[@]}" || die "Unable to configure"
-
 }
diff --git a/dev-lang/perl/perl-5.22.2.ebuild b/dev-lang/perl/perl-5.22.2.ebuild
new file mode 100644
index 0000000..22767c2
--- /dev/null
+++ b/dev-lang/perl/perl-5.22.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
+
+PATCH_VER=1
+
+PERL_OLDVERSEN="5.22.0 5.22.1"
+MODULE_AUTHOR=SHAY
+
+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
+	https://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 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~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
+	virtual/perl-Test-Harness
+"
+# bug 390719, bug 523624
+# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker
+
+S="${WORKDIR}/${MY_P}"
+
+dual_scripts() {
+	src_remove_dual      perl-core/Archive-Tar        2.40.0       ptar ptardiff ptargrep
+	src_remove_dual      perl-core/Digest-SHA         5.950.0       shasum
+	src_remove_dual      perl-core/CPAN               2.110.0        cpan
+	src_remove_dual      perl-core/Encode             2.720.0       enc2xs piconv
+	src_remove_dual      perl-core/ExtUtils-MakeMaker 7.40.100       instmodsh
+	src_remove_dual      perl-core/ExtUtils-ParseXS   3.280.0       xsubpp
+	src_remove_dual      perl-core/IO-Compress        2.68.0        zipdetails
+	src_remove_dual      perl-core/JSON-PP            2.273.0      json_pp
+	src_remove_dual      perl-core/Module-CoreList    5.201.604.290 corelist
+	src_remove_dual      perl-core/Pod-Parser         1.630.0       pod2usage podchecker podselect
+	src_remove_dual      perl-core/Pod-Perldoc        3.250.0       perldoc
+	src_remove_dual      perl-core/Test-Harness       3.350.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_prepare()	{ eblit-run src_prepare   v50160001 ; }
+src_configure()	{
+	eblit-run src_configure v50180002 ;
+	use arm && sed -i \
+		-e "s|d_fork='undef'|d_fork='define'|" \
+		-e "s|d_memcpy='undef'|d_memcpy='define'|" \
+			"${S}"/config.sh
+	use arm64 && sed -i \
+		-e "s|use64bitall='define'|use64bitall='undef'|" \
+		-e "s|use64bitint='define'|use64bitint='undef'|" \
+			"${S}"/config.sh
+}
+#src_compile()	{ eblit-run src_compile   v50160001 ; }
+src_test()		{
+	export NO_GENTOO_NETWORK_TESTS=1;
+	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}-v50220001.eblit"
+	if [[ -e ${e} ]] ; then
+		. "${e}"
+		eval "pkg_${x}() { eblit-run pkg_${x} v50160001 ; }"
+	fi
+done