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 3E21B1382C5 for ; Mon, 14 Dec 2020 23:00:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84F6BE090E; Mon, 14 Dec 2020 23:00:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A148E090E for ; Mon, 14 Dec 2020 23:00:41 +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 0F1073412DA for ; Mon, 14 Dec 2020 23:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A40152 for ; Mon, 14 Dec 2020 23:00:38 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1607986828.0cd3b9d029b36e2f679143bbd9901c9493746390.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/cddlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/cddlib/cddlib-094m-r1.ebuild X-VCS-Directories: sci-libs/cddlib/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0cd3b9d029b36e2f679143bbd9901c9493746390 X-VCS-Branch: master Date: Mon, 14 Dec 2020 23:00:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 81150796-5855-4aa1-bab3-6ba2beb5e4fe X-Archives-Hash: 613c48a79761e194ffa8c81a677c1e2b commit: 0cd3b9d029b36e2f679143bbd9901c9493746390 Author: Michael Orlitzky gentoo org> AuthorDate: Mon Dec 14 14:39:18 2020 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Mon Dec 14 23:00:28 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd3b9d0 sci-libs/cddlib: make MY_PV assignment more reliable. François Bissey came up with a better way (using bash substrings) to compute MY_PV from PV in these ebuilds. It won't work forever, but it should be OK for a few more versions, and the failure mode is nicer than the present one of silently downloading the wrong version. Bug: https://bugs.gentoo.org/759520 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Michael Orlitzky gentoo.org> sci-libs/cddlib/cddlib-094m-r1.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sci-libs/cddlib/cddlib-094m-r1.ebuild b/sci-libs/cddlib/cddlib-094m-r1.ebuild index 0bacae1be5c..6dc83abed74 100644 --- a/sci-libs/cddlib/cddlib-094m-r1.ebuild +++ b/sci-libs/cddlib/cddlib-094m-r1.ebuild @@ -3,9 +3,10 @@ EAPI=7 -# This should have been dealt with versionator in the direction -# 0.94x -> 094x - now we are screwed. -MY_PV="0.94m" +# This can't work forever; but for now, it's better than hard-coding the +# correct version string. +MY_PV="${PV:0:1}.${PV:1}" + MY_P="${PN}-${MY_PV}" DESCRIPTION="C library implementing the Double Description Method" HOMEPAGE="https://www.inf.ethz.ch/personal/fukudak/cdd_home/"