commit: 31be046e359c79da7d29d5905d62fc79294ec6a3
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 20:36:10 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 20:37:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31be046e
dev-lang/perl: Update 5.26.9999 to 5.25.12 internally
Package-Manager: Portage-2.3.4, Repoman-2.3.2
dev-lang/perl/Manifest | 2 +-
dev-lang/perl/perl-5.26.9999.ebuild | 22 ++++++++++++----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index af07577f554..b376eb0f168 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -8,7 +8,7 @@ DIST perl-5.24.1-patches-2.tar.xz 21124 SHA256
6b00ee799d0d2b88e641eb49800d0f756
DIST perl-5.24.1-patches-3.tar.xz 24012 SHA256
b8f8164c1fb34c5db82d9f16c5330cdb2d56e283562dd2d684c2abc26e58bf83 SHA512
1af59b80fca8317fe8df171eba6fcc0830c65f94ad7f73bac611877afdd6e5dfe9ce7c67205a860703fcf6c5b87ba14a0163196e1b833a20562525d06b26b6f3
WHIRLPOOL
9d1f7d3050f544d04e413e1c6c4a8cc6bc593a8250dbf45fb166cf92060ea8bb8e4b09bb73a686cce8101395a04c853842588c1c223c903c5b74cedaf68c5d18
DIST perl-5.24.1.tar.xz 11569284 SHA256
03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f SHA512
9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c
WHIRLPOOL
26d401f03af54ba61ea8e761f483f3d374737660fa4beaa3bd77951c0f920f88f9e47f327754c32d4c3c49557882a2a531b9eebef420ad6155d62423f7753406
DIST perl-5.25.11-patches-1.tar.xz 16776 SHA256
43dda2f9a20b44442d25caa733ba94acb0c48b26e8201b3f8fa3d2be24a6667e SHA512
ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036
WHIRLPOOL
98681898039e1bcc3e9a33498a8b7b8b3f24cc4c49396b33dfd04a853c329323ad47081d64da61ba2880fbd3505e10ffe90367dffa8005bda86c4f114b283934
-DIST perl-5.25.11.tar.xz 11960840 SHA256
f77e8e230b0405990f96d31a00fb9849a19de526cb3cb6c20603dc17d87f420c SHA512
1ca2ba2b6495ec1871f1d2a506344d8fe5fe725789a1afb6447392dbf81a8abc9c9646590d22552b33a08ee8ec5ede1646192483d8ad41f27bd45df3940602a3
WHIRLPOOL
f952f38a4ea9ba2a3b4232e134e8287a29e9b89d878f176d8828967419a798e7ffecf558b043b99201244b8d1be3e93c0f3743992bcad9ee71f5409b1e65db03
+DIST perl-5.25.12.tar.xz 11967584 SHA256
dae4822ad2d245108c5d34f11749c199ff614c2e66afd411992d70aaca5331e8 SHA512
4ca3decfe184903c49130768f0385d3055065e1797a02971f09d8828d48dfd37cd1c47681e1da1a3d72336a817623abdd2e39deb58da7bc3bf6c1f5ce28b9999
WHIRLPOOL
b84a7881baf4e011690dcbabc842205431057031ed504d7fe1f55b3498bcda2b0d4e35788ed3f01807d09c16f4ad33eab2af50dceadb4765b5f785a47b4bc646
DIST perl-cross-1.1.1.tar.gz 88283 SHA256
8ee72f39119b342f3b911266e5c965914a44a484fd18d9c444d106aca4dd7abc SHA512
8ad958d08d8e7ff2b80333959544aaf0e83a74f2e34c9e8aca543052d039c0f4b00cda694ee940874b192b0d83656a9f6854ebbf2c444b212ba9d4417c576591
WHIRLPOOL
e6739ca8fc4dcafa14a20585d75931cf6b6a98fad9c732312d15507b29b926452668afc4f27f2b6c5bb6faa623fc506538a53ed9d303d21897f42d47c26e4924
DIST perl-cross-1.1.3.tar.gz 93856 SHA256
181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d SHA512
d1ea6ab8a431f831ec9c4c6b71a238a66f021f5610505ebb48c3b0d0b8c9afb0fcb8050779abe1a126afdd92e65f8c86e134832b45a0a6c26ca4b46735e3021d
WHIRLPOOL
f7313b859031d13516193a88a70fff845987eea93eab3d0d3bac6f3b47c781324acddeed72d6cef8c7d8ee06c8ca5f59a10560b20a53575ffdfd2ce36272a723
DIST perl-cross-1.1.4.tar.gz 94623 SHA256
c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57 SHA512
3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79
WHIRLPOOL
c4a150cf15d067cd58db63dae01bbe810808888477f9a2bfcd8557b2eeee097bbf93509bb9128feef84e8a2913724a82de0accc3b9c5d65207ee9dcd2989fe51
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild
b/dev-lang/perl/perl-5.26.9999.ebuild
index 62d914d8c9a..cca25d8713d 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -15,19 +15,21 @@ if [[ "${PV##*.}" == "9999" ]]; then
# Include more versions for blead releases
# for circular reasons
# Greatest first, don't include yourself
- PERL_BIN_OLDVERSEN=""
- PERL_OLDVERSEN="5.24.2 5.24.1 5.24.0 5.22.3 5.22.2 5.22.1 5.22.0"
- DIST_VERSION=5.25.11
+ PERL_BIN_OLDVERSEN="5.25.11"
+ PERL_OLDVERSEN="5.25.11 5.24.2 5.24.1 5.24.0 5.22.3 5.22.2 5.22.1
5.22.0"
+ DIST_VERSION=5.25.12
SHORT_PV="${DIST_VERSION%.*}"
MY_P="perl-${DIST_VERSION/_rc/-RC}"
+ PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}"
MY_PV="${DIST_VERSION%_rc*}"
else
- PERL_BIN_OLDVERSEN=""
+ PERL_BIN_OLDVERSEN="5.25.11"
# Compat reasons
- PERL_OLDVERSEN=""
+ PERL_OLDVERSEN="5.25.11"
# First 2 digits only
SHORT_PV="${PV%.*}"
MY_P="perl-${PV/_rc/-RC}"
+ PATCH_BASE="${MY_P}-patches-${PATCH_VER}"
MY_PV="${PV%_rc*}"
fi
@@ -36,9 +38,9 @@ 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/${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/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
https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz
"
HOMEPAGE="http://www.perl.org/";
@@ -304,7 +306,7 @@ src_prepare_dynamic() {
src_prepare() {
local patch
EPATCH_OPTS+=" -p1"
- einfo "Applying patches from ${MY_P}-${PATCH_VER} ..."
+ einfo "Applying patches from ${PATCH_BASE} ..."
while read patch ; do
EPATCH_SINGLE_MSG=" ${patch} ..."
epatch "${WORKDIR}"/patches/${patch}
@@ -396,7 +398,7 @@ src_configure() {
if [[ -n ${PERL_OLDVERSEN} ]] ; then
local inclist=$(
for v in ${PERL_OLDVERSEN}; do
- has "${v}" "${PERL_BIN_OLDVERSEN}" && echo -n
"${v}/${myarch}${mythreading} ";
+ has "${v}" ${PERL_BIN_OLDVERSEN} && echo -n
"${v}/${myarch}${mythreading} ";
echo -n "${v} ";
done )
myconf -Dinc_version_list="${inclist}"
