[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     914b9ce29b05dad0d192297d3225a130b1b7ac61
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Oct  5 17:25:47 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <plevine457 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13174
Signed-off-by: Joonas Niilola <juippis <AT> 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