Skip to content

Commit

Permalink
dev-lang/perl: Fix subslot/MY_PV computation from DIST_VERSION
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kentfredric committed May 21, 2017
1 parent b57e85b commit 22adcbd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions dev-lang/perl/perl-5.26.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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%.*}"
Expand Down

0 comments on commit 22adcbd

Please sign in to comment.