From 792b7175549cadf6db76cb1c7cfc9a53a70a479a Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 6 Feb 2018 14:08:22 -0600
Subject: main/gtest: modernise, Py2->3, fix license, no tests

---
 main/gtest/APKBUILD | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'main')

diff --git a/main/gtest/APKBUILD b/main/gtest/APKBUILD
index b7cecb1936..ec7db8f406 100644
--- a/main/gtest/APKBUILD
+++ b/main/gtest/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gtest
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
 url="https://github.com/google/googletest"
 arch="all"
-license="BSD"
+options="!check"  # No test suite.
+license="BSD-3-Clause"
 depends="libgcc bash"
-depends_dev="python2 cmake"
+depends_dev="python3 cmake"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
@@ -22,32 +23,26 @@ build() {
 	cd build
 
 	cmake -DBUILD_SHARED_LIBS=ON \
-	      -DCMAKE_SKIP_RPATH=ON ../ || return 1
-	make || return 1
+	      -DCMAKE_SKIP_RPATH=ON ../
+	make
 }
 
 package() {
 	cd "$builddir"
 	for dir in usr/lib usr/include/gtest/internal/custom usr/share/licenses/gtest\
 			usr/src/gtest/cmake usr/src/gtest/src; do
-		install -d -m 0755 "$pkgdir"/"$dir" || return 1
+		install -d -m 0755 "$pkgdir"/"$dir"
 	done
-	install -m 0644 build/googlemock/gtest/libgtest*.so "$pkgdir"/usr/lib || return 1
+	install -m 0644 build/googlemock/gtest/libgtest*.so "$pkgdir"/usr/lib
 
-	install -m 0644 googletest/include/gtest/*.h "$pkgdir"/usr/include/gtest \
-		|| return 1
+	install -m 0644 googletest/include/gtest/*.h "$pkgdir"/usr/include/gtest
 	install -m 0644 googletest/include/gtest/internal/*.h \
-		"$pkgdir"/usr/include/gtest/internal/ || return 1
+		"$pkgdir"/usr/include/gtest/internal/
 	install -m 0644 googletest/include/gtest/internal/custom/*.h \
-		"$pkgdir"/usr/include/gtest/internal/custom/ || return 1
-	install -m 0644 googletest/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/ \
-		|| return 1
-	install -m 0644 googletest/CMakeLists.txt "$pkgdir"/usr/src/gtest/ \
-		|| return 1
-	install -m 0644 googletest/cmake/* "$pkgdir"/usr/src/gtest/cmake/ \
-		|| return 1
+		"$pkgdir"/usr/include/gtest/internal/custom/
+	install -m 0644 googletest/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/
+	install -m 0644 googletest/CMakeLists.txt "$pkgdir"/usr/src/gtest/
+	install -m 0644 googletest/cmake/* "$pkgdir"/usr/src/gtest/cmake/
 }
 
-md5sums="16877098823401d1bf2ed7891d7dce36  release-1.8.0.tar.gz"
-sha256sums="58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8  release-1.8.0.tar.gz"
 sha512sums="1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d  release-1.8.0.tar.gz"
-- 
cgit v1.2.3