commit: 22adcbd7407e458623ec65eb4a2f051397aabfd0
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 13:31:38 2017 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Sun May 21 15:04:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22adcbd7
dev-lang/perl: Fix subslot/MY_PV computation from DIST_VERSION
This is a result of the oversight that PV contains _rc and DIST_VERSION
contains -RC, and this leads to the latter leaking into libpaths
and subslots, where it shouldn't.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-lang/perl/perl-5.26.9999.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild
b/dev-lang/perl/perl-5.26.9999.ebuild
index 908abf6dd82..5162f548470 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -15,14 +15,15 @@ DIST_AUTHOR=XSAWYERX
# Devel point-releases are not ABI-intercompatible, but stable point releases
are
# BIN_OLDVERSEN is contains only C-ABI-intercompatible versions
PERL_BIN_OLDVERSEN=""
-PERL_OLDVERSEN="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"
+# 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-RC1
SHORT_PV="${DIST_VERSION%.*}"
# Devel Releases are not ABI-intercompatible
- SUBSLOT="${DIST_VERSION}"
+ SUBSLOT="${DIST_VERSION%-RC*}"
MY_P="perl-${DIST_VERSION/_rc/-RC}"
- MY_PV="${DIST_VERSION%_rc*}"
+ MY_PV="${DIST_VERSION%-RC*}"
else
# First 2 digits only
SHORT_PV="${PV%.*}"
