gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-cpp/gtest: Fix tarball version scheme

Browse Source 
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@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13174
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Peter Levine
2019-10-05 13:25:47 -04:00
committed by Joonas Niilola
parent b9a3725874
commit 914b9ce29b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dev-cpp/gtest/gtest-1.10.0.ebuild
View File

@@ -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

6
dev-cpp/gtest/gtest-9999.ebuild
View File

@@ -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