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 6D86F138335 for ; Wed, 9 Oct 2019 03:19:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22B95E0830; Wed, 9 Oct 2019 03:19:10 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 8BD51E0830 for ; Wed, 9 Oct 2019 03:19:09 +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 DD74234BA98 for ; Wed, 9 Oct 2019 03:19:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1395838 for ; Wed, 9 Oct 2019 03:19:05 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1570591127.914b9ce29b05dad0d192297d3225a130b1b7ac61.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/gtest/gtest-1.10.0.ebuild dev-cpp/gtest/gtest-9999.ebuild X-VCS-Directories: dev-cpp/gtest/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 914b9ce29b05dad0d192297d3225a130b1b7ac61 X-VCS-Branch: master Date: Wed, 9 Oct 2019 03:19:05 +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: 3aee80ea-5ea1-4a85-a49f-17f27fc76fbc X-Archives-Hash: b0f5fa8fe838c7cb30a74f93a381a3b1 commit: 914b9ce29b05dad0d192297d3225a130b1b7ac61 Author: Peter Levine gmail com> AuthorDate: Sat Oct 5 17:25:47 2019 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Oct 9 03:18:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914b9ce2 dev-cpp/gtest: Fix tarball version scheme Upstream has changed tarball names from release-${PV}.tar.gz to v${PV}.tar.gz. To further complicate matters, the tarball for 1.10.0 is v1.10.x.tar.gz. Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Peter Levine gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13174 Signed-off-by: Joonas Niilola gentoo.org> dev-cpp/gtest/gtest-1.10.0.ebuild | 8 +++++--- dev-cpp/gtest/gtest-9999.ebuild | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild index 02ca3c039b1..0611441372a 100644 --- a/dev-cpp/gtest/gtest-1.10.0.ebuild +++ b/dev-cpp/gtest/gtest-1.10.0.ebuild @@ -8,16 +8,18 @@ PYTHON_COMPAT=( python2_7 pypy ) inherit cmake-multilib python-any-r1 +MY_PV=1.10.x + if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/google/googletest" else if [[ -z ${GOOGLETEST_COMMIT} ]]; then - MY_PV=release-${PV} + URI_PV=v${MY_PV:-${PV}} else - MY_PV=${GOOGLETEST_COMMIT} + URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} fi - SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-${MY_PV} fi diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild index 02ca3c039b1..826b660f7bc 100644 --- a/dev-cpp/gtest/gtest-9999.ebuild +++ b/dev-cpp/gtest/gtest-9999.ebuild @@ -13,11 +13,11 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/googletest" else if [[ -z ${GOOGLETEST_COMMIT} ]]; then - MY_PV=release-${PV} + URI_PV=v${MY_PV:-${PV}} else - MY_PV=${GOOGLETEST_COMMIT} + URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}} fi - SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" S="${WORKDIR}"/googletest-${MY_PV} fi