commit: dd56d20d780ebe8f5fcc007d4f54cd5f1c1095bf
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 09:52:13 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 09:52:13 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=dd56d20d
dev-lang/perl: sync with main repo, drop perl-5.18.
dev-lang/perl/files/eblits/common-v50160001.eblit | 2 +-
...mmon-v50160001.eblit => common-v50240001.eblit} | 2 +-
.../perl/files/eblits/pkg_postinst-v50160001.eblit | 2 +-
.../perl/files/eblits/pkg_postinst-v50240001.eblit | 36 ++++++++++++
.../perl/files/eblits/pkg_postrm-v50160001.eblit | 2 +-
.../perl/files/eblits/pkg_postrm-v50240001.eblit | 7 +++
.../perl/files/eblits/pkg_setup-v50160001.eblit | 2 +-
...p-v50160001.eblit => pkg_setup-v50240001.eblit} | 24 ++++----
.../files/eblits/src_configure-v50180002.eblit | 55 ++++++++++++++----
...0180002.eblit => src_configure-v50240001.eblit} | 55 ++++++++++++++----
.../perl/files/eblits/src_install-v50160001.eblit | 2 +-
.../perl/files/eblits/src_install-v50200001.eblit | 2 +-
...v50200001.eblit => src_install-v50240001.eblit} | 2 +-
.../perl/files/eblits/src_prepare-v50160001.eblit | 2 +-
...v50160001.eblit => src_prepare-v50240001.eblit} | 4 +-
.../perl/files/eblits/src_test-v50160001.eblit | 2 +-
.../{perl-5.20.2-r1.ebuild => perl-5.24.0.ebuild} | 66 +++++++++++-----------
17 files changed, 189 insertions(+), 78 deletions(-)
diff --git a/dev-lang/perl/files/eblits/common-v50160001.eblit
b/dev-lang/perl/files/eblits/common-v50160001.eblit
index e108d2a..2a8d815 100644
--- a/dev-lang/perl/files/eblits/common-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/common-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/common-v50160001.eblit,v 1.1
2012/06/05 17:52:35 tove Exp $
+# $Id$
src_remove_dual_file() {
local i pkg ver
diff --git a/dev-lang/perl/files/eblits/common-v50160001.eblit
b/dev-lang/perl/files/eblits/common-v50240001.eblit
similarity index 92%
copy from dev-lang/perl/files/eblits/common-v50160001.eblit
copy to dev-lang/perl/files/eblits/common-v50240001.eblit
index e108d2a..2a8d815 100644
--- a/dev-lang/perl/files/eblits/common-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/common-v50240001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/common-v50160001.eblit,v 1.1
2012/06/05 17:52:35 tove Exp $
+# $Id$
src_remove_dual_file() {
local i pkg ver
diff --git a/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
b/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
index ad743bc..cc864d0 100644
--- a/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_postinst-v50160001.eblit,v
1.1 2012/06/05 17:52:35 tove Exp $
+# $Id$
eblit-perl-pkg_postinst() {
dual_scripts
diff --git a/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit
b/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit
new file mode 100644
index 0000000..2603ef4
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postinst-v50240001.eblit
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+eblit-perl-pkg_postinst() {
+ dual_scripts
+
+ if [[ "${ROOT}" = "/" ]] ; then
+ local INC DIR file
+ 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
+ rm -f "${file}"
+ einfo "<< ${file}"
+ done
+ fi
+ done
+ # Silently remove the now empty dirs
+ for DIR in ${INC} ; do
+ if [[ -d "${DIR}" ]] ; then
+ find "${DIR}" -depth -type d -print0 | xargs -0
-r rmdir &> /dev/null
+ fi
+ done
+
+# einfo "Converting C header files to the corresponding Perl
format (ignore any error)"
+# # Prefix note: unprefixed as this is all kernel/libc stuff that
we never provide
+# pushd /usr/include >/dev/null
+# h2ph -Q -a -d "${EPREFIX}"${ARCH_LIB} \
+# asm/termios.h syscall.h syslimits.h syslog.h
sys/ioctl.h \
+# sys/socket.h sys/time.h wait.h sysexits.h
+# popd >/dev/null
+
+ fi
+}
diff --git a/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
b/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
index a4d5ad6..02b5944 100644
--- a/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_postrm-v50160001.eblit,v
1.1 2012/06/05 17:52:35 tove Exp $
+# $Id$
eblit-perl-pkg_postrm(){
dual_scripts
diff --git a/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit
b/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit
new file mode 100644
index 0000000..ed98a86
--- /dev/null
+++ b/dev-lang/perl/files/eblits/pkg_postrm-v50240001.eblit
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+eblit-perl-pkg_postrm(){
+ dual_scripts
+}
diff --git a/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
b/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
index f8d01f8..a7b734f 100644
--- a/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v
1.2 2013/11/22 08:56:13 haubi Exp $
+# $Id$
eblit-perl-pkg_setup() {
case ${CHOST} in
diff --git a/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
b/dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit
similarity index 71%
copy from dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
copy to dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit
index f8d01f8..9ce8e99 100644
--- a/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/pkg_setup-v50240001.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/pkg_setup-v50160001.eblit,v
1.2 2013/11/22 08:56:13 haubi Exp $
+# $Id$
eblit-perl-pkg_setup() {
case ${CHOST} in
@@ -33,12 +33,10 @@ eblit-perl-pkg_setup() {
if use ithreads ; then
echo ""
- ewarn "THREADS WARNING:"
- ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
- ewarn "interpreter-level threading enabled."
- ewarn "Threading is not supported by all applications "
- ewarn "that compile against perl. You use threading at "
- ewarn "your own discretion. "
+ ewarn "THREADS WARNING"
+ ewarn "PLEASE NOTE: You are compiling ${MY_P} with
interpreter-level threading enabled."
+ ewarn "Threading is not supported by all applications that
compile against perl. You"
+ ewarn "use threading at your own discretion."
fi
check_rebuild
dual_scripts
@@ -48,13 +46,12 @@ check_rebuild() {
if has_version "<dev-lang/perl-${SHORT_PV}" ; then
echo ""
ewarn "UPDATE THE PERL MODULES:"
- ewarn "After updating dev-lang/perl you must reinstall"
- ewarn "the installed perl modules."
+ ewarn "After updating dev-lang/perl the installed Perl modules
will"
+ ewarn "have to be re-installed. In most cases, this is done
automatically"
+ ewarn "by the package manager, but you should still call
perl-cleaner to"
+ ewarn "make sure your system is consistent."
ewarn "Use: perl-cleaner --all"
elif has_version dev-lang/perl ; then
- # doesnot work
- #if ! has_version dev-lang/perl[ithreads=,debug=] ; then
- #if ! has_version dev-lang/perl[ithreads=] || ! has_version
dev-lang/perl[debug=] ; then
if ( use ithreads && ! has_version dev-lang/perl[ithreads] )
|| \
( ! use ithreads && has_version dev-lang/perl[ithreads] )
|| \
( use debug && ! has_version dev-lang/perl[debug] )
|| \
@@ -67,4 +64,3 @@ check_rebuild() {
fi
fi
}
-
diff --git a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
index 7a2460c..05fa86b 100644
--- a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
+++ b/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
@@ -1,6 +1,6 @@
# 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_configure-v50180002.eblit,v
1.3 2014/09/26 11:00:50 grobian Exp $
+# $Id$
myconf() {
# the myconf array is declared in src_configure
@@ -74,8 +74,10 @@ eblit-perl-src_configure() {
[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
- # Make sure we can do the final link #523730
- [[ ${CHOST} == *-darwin* ]] && myconf "-Dld=$(tc-getCC)"
+ # Make sure we can do the final link #523730, need to set deployment
+ # target to override hardcoded 10.3 which breaks on modern OSX
+ [[ ${CHOST} == *-darwin* ]] && \
+ myconf "-Dld=env
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
# Prefix: the host system needs not to follow Gentoo multilib stuff,
and in
# Prefix itself we don't do multilib either, so make sure perl can find
@@ -90,10 +92,6 @@ eblit-perl-src_configure() {
# Use all host paths that might contain useful stuff, the hook
above will filter out bad choices.
local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64
/lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
myconf "-Dlibpth=${EPREFIX}/$(get_libdir)
${EPREFIX}/usr/$(get_libdir) ${paths}"
-
- # Configure checks for /system/lib/libandroid.so to override
linux into linux-android,
- # which is not intended for Gentoo
- sed -i "/libandroid.so/d" Configure || die "sed failed"
elif [[ $(get_libdir) != "lib" ]] ; then
# We need to use " and not ', as the written config.sh use ' ...
myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir)
/usr/$(get_libdir)"
@@ -109,6 +107,46 @@ eblit-perl-src_configure() {
myconf -Dnoextensions="${disabled_extensions}"
+ 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 \
-des \
-Duseshrplib \
@@ -146,8 +184,5 @@ eblit-perl-src_configure() {
-Dinstallusrbinperl='n' \
-Ud_csh \
-Uusenm \
- -Dsh="${EPREFIX}"/bin/sh \
- -Dtargetsh="${EPREFIX}"/bin/sh \
- -Dsysroot="${EROOT}" \
"${myconf[@]}" || die "Unable to configure"
}
diff --git a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
b/dev-lang/perl/files/eblits/src_configure-v50240001.eblit
similarity index 74%
copy from dev-lang/perl/files/eblits/src_configure-v50180002.eblit
copy to dev-lang/perl/files/eblits/src_configure-v50240001.eblit
index 7a2460c..05fa86b 100644
--- a/dev-lang/perl/files/eblits/src_configure-v50180002.eblit
+++ b/dev-lang/perl/files/eblits/src_configure-v50240001.eblit
@@ -1,6 +1,6 @@
# 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_configure-v50180002.eblit,v
1.3 2014/09/26 11:00:50 grobian Exp $
+# $Id$
myconf() {
# the myconf array is declared in src_configure
@@ -74,8 +74,10 @@ eblit-perl-src_configure() {
[[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
- # Make sure we can do the final link #523730
- [[ ${CHOST} == *-darwin* ]] && myconf "-Dld=$(tc-getCC)"
+ # Make sure we can do the final link #523730, need to set deployment
+ # target to override hardcoded 10.3 which breaks on modern OSX
+ [[ ${CHOST} == *-darwin* ]] && \
+ myconf "-Dld=env
MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)"
# Prefix: the host system needs not to follow Gentoo multilib stuff,
and in
# Prefix itself we don't do multilib either, so make sure perl can find
@@ -90,10 +92,6 @@ eblit-perl-src_configure() {
# Use all host paths that might contain useful stuff, the hook
above will filter out bad choices.
local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64
/lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib"
myconf "-Dlibpth=${EPREFIX}/$(get_libdir)
${EPREFIX}/usr/$(get_libdir) ${paths}"
-
- # Configure checks for /system/lib/libandroid.so to override
linux into linux-android,
- # which is not intended for Gentoo
- sed -i "/libandroid.so/d" Configure || die "sed failed"
elif [[ $(get_libdir) != "lib" ]] ; then
# We need to use " and not ', as the written config.sh use ' ...
myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir)
/usr/$(get_libdir)"
@@ -109,6 +107,46 @@ eblit-perl-src_configure() {
myconf -Dnoextensions="${disabled_extensions}"
+ 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 \
-des \
-Duseshrplib \
@@ -146,8 +184,5 @@ eblit-perl-src_configure() {
-Dinstallusrbinperl='n' \
-Ud_csh \
-Uusenm \
- -Dsh="${EPREFIX}"/bin/sh \
- -Dtargetsh="${EPREFIX}"/bin/sh \
- -Dsysroot="${EROOT}" \
"${myconf[@]}" || die "Unable to configure"
}
diff --git a/dev-lang/perl/files/eblits/src_install-v50160001.eblit
b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
index d31e90e..aa90fae 100644
--- a/dev-lang/perl/files/eblits/src_install-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_install-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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-v50160001.eblit,v
1.3 2013/03/14 12:46:31 tove Exp $
+# $Id$
eblit-perl-src_install() {
local i
diff --git a/dev-lang/perl/files/eblits/src_install-v50200001.eblit
b/dev-lang/perl/files/eblits/src_install-v50200001.eblit
index 1df4296..fafff82 100644
--- a/dev-lang/perl/files/eblits/src_install-v50200001.eblit
+++ b/dev-lang/perl/files/eblits/src_install-v50200001.eblit
@@ -1,6 +1,6 @@
# 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 $
+# $Id$
eblit-perl-src_install() {
local i
diff --git a/dev-lang/perl/files/eblits/src_install-v50200001.eblit
b/dev-lang/perl/files/eblits/src_install-v50240001.eblit
similarity index 92%
copy from dev-lang/perl/files/eblits/src_install-v50200001.eblit
copy to dev-lang/perl/files/eblits/src_install-v50240001.eblit
index 1df4296..fafff82 100644
--- a/dev-lang/perl/files/eblits/src_install-v50200001.eblit
+++ b/dev-lang/perl/files/eblits/src_install-v50240001.eblit
@@ -1,6 +1,6 @@
# 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 $
+# $Id$
eblit-perl-src_install() {
local i
diff --git a/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
b/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
index 075e576..a12b773 100644
--- a/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit,v
1.1 2012/06/05 17:52:35 tove Exp $
+# $Id$
src_prepare_update_patchlevel_h() {
# Copied and modified from debian:
diff --git a/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
b/dev-lang/perl/files/eblits/src_prepare-v50240001.eblit
similarity index 93%
copy from dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
copy to dev-lang/perl/files/eblits/src_prepare-v50240001.eblit
index 075e576..5387d4b 100644
--- a/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_prepare-v50240001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_prepare-v50160001.eblit,v
1.1 2012/06/05 17:52:35 tove Exp $
+# $Id$
src_prepare_update_patchlevel_h() {
# Copied and modified from debian:
@@ -66,5 +66,7 @@ eblit-perl-src_prepare() {
ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die
ln -s ${LIBPERL} libperl$(get_libname ) || die
fi
+
+ default
}
diff --git a/dev-lang/perl/files/eblits/src_test-v50160001.eblit
b/dev-lang/perl/files/eblits/src_test-v50160001.eblit
index 86acdc4..9e241ec 100644
--- a/dev-lang/perl/files/eblits/src_test-v50160001.eblit
+++ b/dev-lang/perl/files/eblits/src_test-v50160001.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-lang/perl/files/eblits/src_test-v50160001.eblit,v
1.1 2012/06/05 17:52:35 tove Exp $
+# $Id$
eblit-perl-src_test() {
if [[ ${EUID} == 0 ]] ; then
diff --git a/dev-lang/perl/perl-5.20.2-r1.ebuild
b/dev-lang/perl/perl-5.24.0.ebuild
similarity index 51%
rename from dev-lang/perl/perl-5.20.2-r1.ebuild
rename to dev-lang/perl/perl-5.24.0.ebuild
index 43247b6..53bf104 100644
--- a/dev-lang/perl/perl-5.20.2-r1.ebuild
+++ b/dev-lang/perl/perl-5.24.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib
multiprocessing prefix
+inherit eutils alternatives flag-o-matic toolchain-funcs multilib
multiprocessing
-PATCH_VER=2
+PATCH_VER=1
-PERL_OLDVERSEN="5.20.0 5.20.1"
-MODULE_AUTHOR=SHAY
+PERL_OLDVERSEN=""
+MODULE_AUTHOR=RJBS
SHORT_PV="${PV%.*}"
MY_P="perl-${PV/_rc/-RC}"
@@ -21,13 +21,13 @@ 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
+
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 ~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"
+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="
@@ -43,27 +43,28 @@ 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 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.201.502.140 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
+ 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.800.0 enc2xs
piconv
+ src_remove_dual perl-core/ExtUtils-MakeMaker 7.100.100_rc
instmodsh
+ src_remove_dual perl-core/ExtUtils-ParseXS 3.310.0 xsubpp
+ src_remove_dual perl-core/IO-Compress 2.69.0
zipdetails
+ src_remove_dual perl-core/JSON-PP 2.273.0 json_pp
+ src_remove_dual perl-core/Module-CoreList 5.201.605.60 corelist
+ src_remove_dual perl-core/Pod-Parser 1.630.0
pod2usage podchecker podselect
+ src_remove_dual perl-core/Pod-Perldoc 3.250.200_rc perldoc
+ src_remove_dual perl-core/Test-Harness 3.360.0 prove
+ src_remove_dual perl-core/podlators 4.70.0 pod2man
pod2text
+ src_remove_dual_man perl-core/podlators 4.70.0
/usr/share/man/man1/perlpodstyle.1
}
# eblit-include [--skip] <function> [version]
@@ -101,26 +102,25 @@ eblit-run() {
eblit-run-maybe eblit-$1-post
}
-#src_unpack() { eblit-run src_unpack v50160001 ; }
-src_prepare() {
- eblit-run src_prepare v50160001
- epatch "${FILESDIR}"/${PN}-cwd-prefix.patch
- eprefixify dist/PathTools/Cwd.pm
-}
-src_configure() { eblit-run src_configure v50180002 ; }
+src_prepare() { eblit-run src_prepare v50240001 ; }
+
+src_configure() { eblit-run src_configure v50240001 ; }
+
#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 ; }
+
+src_install() { eblit-run src_install v50240001 ; }
# 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"
+ e="${FILESDIR}/eblits/pkg_${x}-v50240001.eblit"
if [[ -e ${e} ]] ; then
. "${e}"
- eval "pkg_${x}() { eblit-run pkg_${x} v50160001 ; }"
+ eval "pkg_${x}() { eblit-run pkg_${x} v50240001 ; }"
fi
done
