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 6E1C5139694 for ; Sun, 21 May 2017 15:05:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8749721C03E; Sun, 21 May 2017 15:05:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5E27C21C08C for ; Sun, 21 May 2017 15:05:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E527A3416B8 for ; Sun, 21 May 2017 15:05:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57103745F for ; Sun, 21 May 2017 15:05:10 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1495379099.22adcbd7407e458623ec65eb4a2f051397aabfd0.kentnl@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.26.9999.ebuild X-VCS-Directories: dev-lang/perl/ X-VCS-Committer: kentnl X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: 22adcbd7407e458623ec65eb4a2f051397aabfd0 X-VCS-Branch: master Date: Sun, 21 May 2017 15:05:10 +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: 676a0dd3-d85c-4337-9889-9fed57227f41 X-Archives-Hash: 059ee48e91a2d8dd2fedaada5881095e commit: 22adcbd7407e458623ec65eb4a2f051397aabfd0 Author: Kent Fredric gentoo org> AuthorDate: Sun May 21 13:31:38 2017 +0000 Commit: Kent Fredric gentoo 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%.*}"