From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99F9E139694 for ; Thu, 1 Jun 2017 10:07:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF0B821C054; Thu, 1 Jun 2017 10:07:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF6A821C054 for ; Thu, 1 Jun 2017 10:07:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC4EB341748 for ; Thu, 1 Jun 2017 10:07:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0D34745D for ; Thu, 1 Jun 2017 10:07:36 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1496311534.dc99dec2fc77a3d51ee158943a282d58e5b00c2f.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/perl-5.24.1-r2.ebuild dev-lang/perl/perl-5.26.0.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: dc99dec2fc77a3d51ee158943a282d58e5b00c2f X-VCS-Branch: master Date: Thu, 1 Jun 2017 10:07:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 02829351-88c4-4496-8db8-1211a01da4d4 X-Archives-Hash: 7cfc81a9c6e2f4ffa81b268a79ed996b commit: dc99dec2fc77a3d51ee158943a282d58e5b00c2f Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Jun 1 10:05:01 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Thu Jun 1 10:05:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc99dec2 dev-lang/perl: Require newer File::Path, bug 620304 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{perl-5.26.0.ebuild => perl-5.24.1-r2.ebuild} | 140 ++++++++------------- dev-lang/perl/perl-5.26.0.ebuild | 3 +- 2 files changed, 56 insertions(+), 87 deletions(-) diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.24.1-r2.ebuild similarity index 82% copy from dev-lang/perl/perl-5.26.0.ebuild copy to dev-lang/perl/perl-5.24.1-r2.ebuild index a029104e4dc..c5dcac0f524 100644 --- a/dev-lang/perl/perl-5.26.0.ebuild +++ b/dev-lang/perl/perl-5.24.1-r2.ebuild @@ -5,55 +5,31 @@ EAPI=6 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing -PATCH_VER=1 +PATCH_VER=3 CROSS_VER=1.1.4 -PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}" - -DIST_AUTHOR=XSAWYERX - -# Greatest first, don't include yourself -# Devel point-releases are not ABI-intercompatible, but stable point releases are -# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions -PERL_BIN_OLDVERSEN="" -# Don't add more -RC values, its historical bungling -PERL_OLDVERSEN="5.26.0-RC1 5.25.12 5.25.11 5.24.2 5.24.1 5.24.0 5.22.3 5.22.2 5.22.1 5.22.0" -if [[ "${PV##*.}" == "9999" ]]; then - DIST_VERSION=5.26.0 -else - DIST_VERSION="${PV/_rc/-RC}" -fi -SHORT_PV="${DIST_VERSION%.*}" -# Even numbered major versions are ABI intercompatible -# Odd numbered major versions are not -if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then - SUBSLOT="${DIST_VERSION%-RC*}" -else - SUBSLOT="${DIST_VERSION%.*}" -fi -# Used only in tar paths -MY_P="perl-${DIST_VERSION}" -# Used in library paths -MY_PV="${DIST_VERSION%-RC*}" + +PERL_OLDVERSEN="5.24.0" +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.xz - mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz - https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz - mirror://gentoo/${PATCH_BASE}.tar.xz - https://dev.gentoo.org/~kentnl/distfiles/${PATCH_BASE}.tar.xz + mirror://cpan/authors/id/${MODULE_AUTHOR:0:1}/${MODULE_AUTHOR:0:2}/${MODULE_AUTHOR}/${MY_P}.tar.xz + https://github.com/gentoo-perl/perl-patchset/releases/download/${MY_P}-patches-${PATCH_VER}/${MY_P}-patches-${PATCH_VER}.tar.xz + mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.xz + https://dev.gentoo.org/~kentnl/distfiles/${MY_P}-patches-${PATCH_VER}.tar.xz https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz " HOMEPAGE="http://www.perl.org/" LICENSE="|| ( Artistic GPL-1+ )" -SLOT="0/${SUBSLOT}" - -if [[ "${PV##*.}" != "9999" ]]; then +SLOT="0/${SHORT_PV}" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - IUSE="berkdb debug doc gdbm ithreads" RDEPEND=" @@ -67,30 +43,31 @@ DEPEND="${RDEPEND} " PDEPEND=" >=app-admin/perl-cleaner-2.5 + >=virtual/perl-File-Path-2.130.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness " -# bug 390719, bug 523624 +# bug 390719, bug 523624, bug 620304 # 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.240.0 ptar ptardiff ptargrep - src_remove_dual perl-core/CPAN 2.180.0 cpan - src_remove_dual perl-core/Digest-SHA 5.960.0 shasum - src_remove_dual perl-core/Encode 2.880.0 enc2xs piconv - src_remove_dual perl-core/ExtUtils-MakeMaker 7.240.0 instmodsh - src_remove_dual perl-core/ExtUtils-ParseXS 3.340.0 xsubpp - src_remove_dual perl-core/IO-Compress 2.74.0 zipdetails - src_remove_dual perl-core/JSON-PP 2.274.0.200_rc json_pp - src_remove_dual perl-core/Module-CoreList 5.201.705.300 corelist + src_remove_dual perl-core/Archive-Tar 2.40.100_rc ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.110.100_rc cpan + src_remove_dual perl-core/Digest-SHA 5.950.100_rc shasum + src_remove_dual perl-core/Encode 2.800.100_rc enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 7.100.200_rc instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 3.310.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.69.1_rc zipdetails + src_remove_dual perl-core/JSON-PP 2.273.0.100_rc json_pp + src_remove_dual perl-core/Module-CoreList 5.201.701.142.400_rc corelist src_remove_dual perl-core/Pod-Parser 1.630.0 pod2usage podchecker podselect - src_remove_dual perl-core/Pod-Perldoc 3.280.0 perldoc - src_remove_dual perl-core/Test-Harness 3.380.0 prove - src_remove_dual perl-core/podlators 4.90.0 pod2man pod2text - src_remove_dual_man perl-core/podlators 4.90.0 /usr/share/man/man1/perlpodstyle.1 + src_remove_dual perl-core/Pod-Perldoc 3.250.300_rc perldoc + src_remove_dual perl-core/Test-Harness 3.360.100_rc 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 } check_rebuild() { @@ -280,35 +257,10 @@ done < "${WORKDIR}"/patches/series > "${S}/${patchoutput}" echo "${patchoutput}" >> "${S}/MANIFEST" } -src_prepare_perlcross() { - cp -a ../perl-cross-${CROSS_VER}/* . || die - - sed -i \ - -e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \ - cnf/diffs/perl5-${PV}/makemaker-test.patch || die - - sed -i \ - -e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \ - -e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \ - cnf/diffs/perl5-${PV}/customized.patch || die - - sed -i \ - -e 's|^lib/unicore/CombiningClass.pl pod/perluniprops.pod:|lib/unicore/CombiningClass.pl pod/perluniprops.pod: $(CONFIGPM)|' \ - Makefile || die - - # bug 604072 - MAKEOPTS+=" -j1" - export MAKEOPTS -} -src_prepare_dynamic() { - ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die - ln -s ${LIBPERL} libperl$(get_libname ) || die -} - src_prepare() { local patch EPATCH_OPTS+=" -p1" - einfo "Applying patches from ${PATCH_BASE} ..." + einfo "Applying patches from ${MY_P}-${PATCH_VER} ..." while read patch ; do EPATCH_SINGLE_MSG=" ${patch} ..." epatch "${WORKDIR}"/patches/${patch} @@ -316,9 +268,31 @@ src_prepare() { src_prepare_update_patchlevel_h - tc-is-cross-compiler && src_prepare_perlcross + if tc-is-cross-compiler; then + cp -a ../perl-cross-${CROSS_VER}/* . || die + + sed -i \ + -e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \ + cnf/diffs/perl5-${PV}/makemaker-test.patch || die + + sed -i \ + -e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \ + -e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \ + cnf/diffs/perl5-${PV}/customized.patch || die + + sed -i \ + -e 's|^lib/unicore/CombiningClass.pl pod/perluniprops.pod:|lib/unicore/CombiningClass.pl pod/perluniprops.pod: $(CONFIGPM)|' \ + Makefile || die - tc-is-static-only || src_prepare_dynamic + # bug 604072 + MAKEOPTS+=" -j1" + export MAKEOPTS + fi + + if ! tc-is-static-only ; then + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die + fi if use gdbm; then sed -i "s:INC => .*:INC => \"-I${EROOT}usr/include/gdbm\":g" \ @@ -398,11 +372,7 @@ src_configure() { fi if [[ -n ${PERL_OLDVERSEN} ]] ; then - local inclist=$( - for v in ${PERL_OLDVERSEN}; do - has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n "${v}/${myarch}${mythreading} "; - echo -n "${v} "; - done ) + local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done ) myconf -Dinc_version_list="${inclist}" fi @@ -441,8 +411,6 @@ src_configure() { myconf -Dnoextensions="${disabled_extensions}" - [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly - [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF} # allow fiddling via EXTRA_ECONF, bug 558070 eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})" diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild index a029104e4dc..ab697c5c3dc 100644 --- a/dev-lang/perl/perl-5.26.0.ebuild +++ b/dev-lang/perl/perl-5.26.0.ebuild @@ -68,10 +68,11 @@ DEPEND="${RDEPEND} PDEPEND=" >=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.400-r2 + >=virtual/perl-File-Path-2.130.0 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness " -# bug 390719, bug 523624 +# bug 390719, bug 523624, bug 620304 # virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker S="${WORKDIR}/${MY_P}"