gtest, bump version (#4528)

dev-libs/gtest/gtest-1.10.0.recipe

@@ -12,17 +12,15 @@ Features:
 * Various options for running the tests
 * XML test report generation"
 HOMEPAGE="https://github.com/google/googletest"
-COPYRIGHT="2008-2018 Google Test developers"
+COPYRIGHT="2008-2019 Google Test developers"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-srcGitRev="ea31cb15f0c2ab9f5f5b18e82311eb522989d747"
-SOURCE_URI="https://github.com/google/googletest/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="41a782bacfed269409e533599f2272910e6c7ccd0c3d03f9694c693916070180"
-SOURCE_FILENAME="googletest-$portVersion-$srcGitRev.tar.gz"
-SOURCE_DIR="googletest-$srcGitRev"
-PATCHES="gtest-$portVersion.patchset"
+SOURCE_URI="https://github.com/google/googletest/archive/release-$portVersion.tar.gz"
+CHECKSUM_SHA256="9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb"
+SOURCE_FILENAME="googletest-release-$portVersion.tar.gz"
+SOURCE_DIR="googletest-release-$portVersion"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -56,7 +54,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python2
+	cmd:python3.7
 	"
 
 defineDebugInfoPackage gtest$secondaryArchSuffix \
@@ -72,7 +70,6 @@ BUILD()
 	cmake .. $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE='Release' \
 		-DBUILD_SHARED_LIBS:BOOL=ON
-
 	make $jobArgs
 }
 
@@ -86,12 +83,15 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$libDir/cmake
 }
 
 TEST()
 {
-	#test needs to be enabled during build (fails on 6 out of 18)
+#	test needs to be enabled in (BUILD)
+#	-Dgtest_build_tests=ON (1 tests failed out of 43, but crashes during tests)
+#	-Dgmock_build_tests=ON (fails during BUILD)
 	cd build
 	make test
 }

dev-libs/gtest/gtest-1.8.0.recipe

@@ -1,88 +0,0 @@
-SUMMARY="C++ test framework"
-DESCRIPTION="C++ testing utility
-Features:
-* An xUnit test framework
-* Test discovery
-* A rich set of assertions
-* User-defined assertions
-* Death tests
-* Fatal and non-fatal failures
-* Value-parameterized tests
-* Type-parameterized tests
-* Various options for running the tests
-* XML test report generation"
-HOMEPAGE="https://github.com/google/googletest/"
-COPYRIGHT="2008-2016 Google Test developers"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/google/googletest/archive/release-$portVersion.tar.gz"
-CHECKSUM_SHA256="58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8"
-SOURCE_DIR="googletest-release-$portVersion"
-
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
-
-PROVIDES="
-	gtest$secondaryArchSuffix = $portVersion
-	lib:libgmock$secondaryArchSuffix = $portVersion
-	lib:libgmock_main$secondaryArchSuffix = $portVersion
-	lib:libgtest$secondaryArchSuffix = $portVersion
-	lib:libgtest_main$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	gtest${secondaryArchSuffix}_devel = $portVersion
-	devel:libgmock$secondaryArchSuffix = $portVersion
-	devel:libgmock_main$secondaryArchSuffix = $portVersion
-	devel:libgtest$secondaryArchSuffix = $portVersion
-	devel:libgtest_main$secondaryArchSuffix = $portVersion
-	"
-REQUIRES_devel="
-	gtest$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	mkdir -p build && cd build
-
-	cmake $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE='Release' \
-		-DBUILD_SHARED_LIBS:BOOL=ON \
-		..
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mkdir -p $includeDir
-	mv $prefix/include/* $includeDir/
-	rm -rf $prefix/include/
-
-	prepareInstalledDevelLibs libgmock libgmock_main libgtest libgtest_main
-
-	# devel package
-	packageEntries devel \
-		$developDir
-}
-
-TEST()
-{
-	cd build
-	make test
-}

dev-libs/gtest/patches/gtest-1.9.0~git.patchset

@@ -1,45 +0,0 @@
-From 8a4c29465dd405c956f67c495acf67b9f6b98d62 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 18 Mar 2018 13:46:10 +0100
-Subject: create empty prefix variable for pkg-config
-
-
-diff --git a/googlemock/cmake/gmock.pc.in b/googlemock/cmake/gmock.pc.in
-index c441642..b0a946f 100644
---- a/googlemock/cmake/gmock.pc.in
-+++ b/googlemock/cmake/gmock.pc.in
-@@ -1,3 +1,4 @@
-+prefix=@PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
-diff --git a/googlemock/cmake/gmock_main.pc.in b/googlemock/cmake/gmock_main.pc.in
-index c377dba..9108e6c 100644
---- a/googlemock/cmake/gmock_main.pc.in
-+++ b/googlemock/cmake/gmock_main.pc.in
-@@ -1,3 +1,4 @@
-+prefix=@PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
-diff --git a/googletest/cmake/gtest.pc.in b/googletest/cmake/gtest.pc.in
-index e7967ad..4055a96 100644
---- a/googletest/cmake/gtest.pc.in
-+++ b/googletest/cmake/gtest.pc.in
-@@ -1,3 +1,4 @@
-+prefix=@PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
-diff --git a/googletest/cmake/gtest_main.pc.in b/googletest/cmake/gtest_main.pc.in
-index fe25d9c..f862028 100644
---- a/googletest/cmake/gtest_main.pc.in
-+++ b/googletest/cmake/gtest_main.pc.in
-@@ -1,3 +1,4 @@
-+prefix=@PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
--- 
-2.16.2
-