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

[Mike Frysinger]

commit:     05d4203bd3dd733cf76364fdb013a6b9eeef8b6b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 09:11:10 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 09:11:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d4203b

dev-cpp/gtest: merge live git ebuild w/releases & fix building w/latest git

 dev-cpp/gtest/gtest-9999.ebuild | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 47a3ca79f6e..a4ab55ca6f1 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,16 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
-inherit git-r3 python-any-r1 cmake-multilib
+inherit python-any-r1 cmake-multilib
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/google/googletest"
+else
+	SRC_URI="https://github.com/google/googletest/archive/release-${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-release-${PV}
+fi
 
 DESCRIPTION="Google C++ Testing Framework"
 HOMEPAGE="https://github.com/google/googletest"
-EGIT_REPO_URI="https://github.com/google/googletest.git"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,8 +28,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-fix-py-tests.patch
-	"${FILESDIR}"/${P}-fix-gcc6-undefined-behavior.patch
+	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
 )
 
 pkg_setup() {