gentoo resync : 30.09.2018

7 files changed, 121 insertions, 29 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 86896d0044a4..55afef6bdda5 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,13 +1,16 @@
 AUX configure-fix-pthread-linking.patch 3142 BLAKE2B 8bf1e9b7845330138684068ea1ba98ef9941e4f9a8d8517598fc48fdae984d051745307ac6e74a1fc37a65fd7e473b7526e6dc25dc3334f5b13e8a1a60e7f776 SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016
 AUX gtest-1.8.0-fix-doublefree.patch 4176 BLAKE2B 8488622dab43418cca28fe65b43ba4e022d06e31517748226a61e18c366f33a7b8fb50ba8f0ca7a175774c580e0b356684414856a75d74363c816c5ab9ba2ef3 SHA512 5dc0b987ea9516c4ef0c8e50c58091431606d3555c0f24b2ea5786e47f8497664ca3fb55bb400e07c502319dfbf2d0a09d5121985defd8e8b5e29062a4a51134
+AUX gtest-1.8.0-fix-gcc6-undefined-behavior.patch 665 BLAKE2B 181253b829413cf41001236c4696fd35171345d9a933f62d0903d463e0bcf80004a0124e4c5b5846f40c8cfe70dfccc7488e1840ccf6418d34a461c482db373a SHA512 fc6f11a06f9aa7b1c31f5abbec208704dd0f461fed36d421802843234bb3d9fe3f2e35482629546c1a8585c84fb0850768dd8b63e0f88cfe0508b00278d800cc
 AUX gtest-1.8.0-increase-clone-stack-size.patch 588 BLAKE2B a05c131193a4fa8e585c23b8c664e1e5065bd1c02424c763df64bd2b83c975b33d8a7e6a52a4a094d2304ff96edc4cc72d5bd0c54579546d7d3512164bc18d4a SHA512 ca1e97c48b1f3340ccda093c1bac9b5ddbb84db6e8dd9f6d9da95a0ef105125c9bea34bba359ee473c0b05d7db6a69c2bdde8f1cbb14aeab9d76f83a4cd4b9a4
 AUX gtest-1.8.0-multilib-strict.patch 1126 BLAKE2B 9b7835108dec3c05025762e7161bbc993e77c0ea433ddec465746cc93cd231cbe654a756822d3a0c368497788bb5642b6a490f917736b763f18ed31b8a629558 SHA512 45bb44e3f0743ec0bd9f440585610ed04cbbd8befed398844300e21710b28f755f1775cc005efcdd0b4f6d2ec2200ad2abe98b2c6764400ffa04242fe7ce06fc
-AUX gtest-9999-fix-gcc6-undefined-behavior.patch 665 BLAKE2B 181253b829413cf41001236c4696fd35171345d9a933f62d0903d463e0bcf80004a0124e4c5b5846f40c8cfe70dfccc7488e1840ccf6418d34a461c482db373a SHA512 fc6f11a06f9aa7b1c31f5abbec208704dd0f461fed36d421802843234bb3d9fe3f2e35482629546c1a8585c84fb0850768dd8b63e0f88cfe0508b00278d800cc
+AUX gtest-9999-fix-gcc6-undefined-behavior.patch 463 BLAKE2B d61c3a735ab5ecc8a44b5b7c294a25be86bdfb8bd589df954862b4ddee60f14f04b0b64e4be80b6ed9e191429d640f8fecf4dac3667e9c9d875feb494bd64bce SHA512 8ee1fe3ab2b9352f4a34ea9e2813344eb507a2c7d519d67d647dc511c280f2a4609eccebc2a122d8431989b4a8e43c6cb9c5650877a257681f2d37672f446227
 AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd29878ca16d4187b84a40df4ec3ca216951ab0dfb1a89bebe2da1ad89f975e22ef6cdaced488de72b06953e185fd0d1 SHA512 4a059704303fffe508bd099544caaab5e4c819c978d6c104dce302e82348dd41fd63390459828a5f6161624dfd47aed5dc9cb466d36796904d598e0b10427949
 DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
+DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 EBUILD gtest-1.7.0-r1.ebuild 1249 BLAKE2B e3b607997c3a936ed65ffd668d543e512b3aaab230499d3a209950c0ec753c4778ede5c8c67dfb77ba7bba35550813830daa60e602e19ede1b5b95aa98ff8213 SHA512 8e82ff1bcd3e53edfd9823e90ae13484ace2a649a5ab775998e05b98d7fc7246af2bd11a8bbf74aab8e4cc6b9913c34f019befaeee34778262cf88aa7b9cd2ef
-EBUILD gtest-1.8.0-r1.ebuild 1674 BLAKE2B 0d4cd7279a96426f013fd96c43d7c8613c458585c9e576b19cab9c5ed43572e33ed9190f667f164195a4d4b192924dcb26b97f7365578d6c1e70d6f342c281d3 SHA512 f827c28e93ed16c55cf0e3e8087373170e1d848f163a45e0530580c40780997629a49e534e5f0a399bf6888a92f506bf9730994e774b77a0bcaaa123d215df3a
-EBUILD gtest-1.8.0.ebuild 1637 BLAKE2B 15153bf61b468799c48c25b300794eb3cf93d9751ead2d50d2dda59f09a4c5ea1c6a319083290cb3a93a983ee2552a3162a9c770e724907427533cfd8e7aafd9 SHA512 ac3680806d6e30e926ef29ab24042d419cd4c872b6a7d4d11b75bb50ccf64c6f029b8c59800dd92f3c5e2a8a72b4840277b4750eae8bc46021e44fc95845670b
-EBUILD gtest-9999.ebuild 1826 BLAKE2B 8751e8332d63e36f30d1bc10782c2103e7a40b0f9a454bf29cb92ec92502221cb74aee2158f54b2fb634aa119c6fd1d7faf496fac4569e7ce461205f805123b7 SHA512 9a31a176bba34993a6bbc56dd0cbc0a3b78b293c4d850a0471968c8759fd58a3ebaa1922b2eb293810a697b85894c1daee5d125a42013b6356b9a04596d21114
+EBUILD gtest-1.8.0-r1.ebuild 1675 BLAKE2B f8a6b9b08d866c033a118c8ca3476a8f9498fbf77b5bfa33b426055d33b70cc0edf6ce48eb17bd1e4704a93030809132d13f9a1d8d294974c2382b7888950fa1 SHA512 7907cf89410817ec053db1db83707d5f5885eedd7f64acf3d0861ca27ea701b370402087452dffbeb357b2d174d91d23929abf36f621b3c9082515718f3ab367
+EBUILD gtest-1.8.0.ebuild 1638 BLAKE2B 9b1191e4df593f03d611f3c98cef475aeaa4017b114cef3cdea0be4a8cdc3f146c0d753c9b428cccc70bae96603b0b433f4129721e96aff9ac71297bb082c868 SHA512 4e63602328af1e3bcafbf5b41ea6829cdf31d7670a78ad906522c00f7627642d9a5492da81d9a16c7c581407c8f4dcf05be6bc1e79d9f45cdddde2ce6725caf3
+EBUILD gtest-1.8.1.ebuild 1692 BLAKE2B e7925414d786b5dee7a5ad9a883cccf2f223d20ad2a58afed6a4bdefbdabc114b96c1e9b87d749595ee6681b6772cdebc83db8980b6d9a96395866e8645b5d11 SHA512 e8c4940ba012e5be45bc6fa565a5754774b97de5b86cffdef2b67e7454709c15f189ed9f1a26a2324ebd120019bbd37478400fb43d57f728c7e54815c688644f
+EBUILD gtest-9999.ebuild 1692 BLAKE2B e7925414d786b5dee7a5ad9a883cccf2f223d20ad2a58afed6a4bdefbdabc114b96c1e9b87d749595ee6681b6772cdebc83db8980b6d9a96395866e8645b5d11 SHA512 e8c4940ba012e5be45bc6fa565a5754774b97de5b86cffdef2b67e7454709c15f189ed9f1a26a2324ebd120019bbd37478400fb43d57f728c7e54815c688644f
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
new file mode 100644
index 000000000000..eadfe6197389
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
@@ -0,0 +1,21 @@
+Fix build with GCC 6 due to lifetime issues.
+
+--- a/googletest/src/gtest.cc
++++ b/googletest/src/gtest.cc
+@@ -2654,10 +2654,12 @@
+     test->Run();
+   }
+ 
+-  // Deletes the test object.
+-  impl->os_stack_trace_getter()->UponLeavingGTest();
+-  internal::HandleExceptionsInMethodIfSupported(
+-      test, &Test::DeleteSelf_, "the test fixture's destructor");
++  if (test != NULL) {
++    // Deletes the test object.
++    impl->os_stack_trace_getter()->UponLeavingGTest();
++    internal::HandleExceptionsInMethodIfSupported(
++        test, &Test::DeleteSelf_, "the test fixture's destructor");
++  }
+ 
+   result_.set_elapsed_time(internal::GetTimeInMillis() - start);
+ 
diff --git a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
index eadfe6197389..8dfed46d4585 100644
--- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
+++ b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
@@ -2,19 +2,15 @@ Fix build with GCC 6 due to lifetime issues.
 
 --- a/googletest/src/gtest.cc
 +++ b/googletest/src/gtest.cc
-@@ -2654,10 +2654,12 @@
+@@ -2693,10 +2693,12 @@
      test->Run();
    }
  
--  // Deletes the test object.
--  impl->os_stack_trace_getter()->UponLeavingGTest();
--  internal::HandleExceptionsInMethodIfSupported(
--      test, &Test::DeleteSelf_, "the test fixture's destructor");
 +  if (test != NULL) {
-+    // Deletes the test object.
-+    impl->os_stack_trace_getter()->UponLeavingGTest();
-+    internal::HandleExceptionsInMethodIfSupported(
-+        test, &Test::DeleteSelf_, "the test fixture's destructor");
+     // Deletes the test object.
+     impl->os_stack_trace_getter()->UponLeavingGTest();
+     internal::HandleExceptionsInMethodIfSupported(
+         test, &Test::DeleteSelf_, "the test fixture's destructor");
 +  }
  
    result_.set_elapsed_time(internal::GetTimeInMillis() - start);
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
index 96cb8b936bfb..3fd0d1438bea 100644
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-fix-py-tests.patch
-	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch
 	"${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
 	"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
 	"${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
index 3dbd8e1a06d4..fec38c4bc247 100644
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.8.0.ebuild
@@ -22,7 +22,7 @@ RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-fix-py-tests.patch
-	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
+	"${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch
 	"${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
 	"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
 )
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
new file mode 100644
index 000000000000..7a444173666d
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.8.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit cmake-multilib python-any-r1
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc examples test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+RDEPEND="!dev-cpp/gmock"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
+	"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
+		googletest/cmake/internal_utils.cmake || die "sed failed!"
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GMOCK=ON
+		-DINSTALL_GTEST=ON
+		-DBUILD_SHARED_LIBS=ON
+
+		# tests
+		-Dgmock_build_tests=$(usex test)
+		-Dgtest_build_tests=$(usex test)
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use doc; then
+		docinto googletest
+		dodoc -r googletest/docs/.
+		docinto googlemock
+		dodoc -r googlemock/docs/.
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc googletest/samples/*.{cc,h}
+	fi
+}
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 06c94dbd49af..7a444173666d 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI="6"
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 pypy )
 
-inherit python-any-r1 cmake-multilib
+inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -30,26 +30,24 @@ RDEPEND="!dev-cpp/gmock"
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
 	"${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
-	"${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch
 )
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e '/set(cxx_base_flags /s:-Werror::' \
+		googletest/cmake/internal_utils.cmake || die "sed failed!"
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GMOCK=ON
-		-DBUILD_GTEST=ON
-		-DINSTALL_GMOCK=ON
 		-DINSTALL_GTEST=ON
-		-Dgtest_build_samples=OFF
-		-Dgtest_disable_pthreads=OFF
-
-		# currently only static libs work
-		# due to numerous ODR violations
-		# https://github.com/google/googletest/issues/930
-		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_SHARED_LIBS=ON
 
 		# tests
 		-Dgmock_build_tests=$(usex test)
@@ -64,9 +62,9 @@ multilib_src_install_all() {
 
 	if use doc; then
 		docinto googletest
-		dodoc -r googletest/docs/*
+		dodoc -r googletest/docs/.
 		docinto googlemock
-		dodoc -r googlemock/docs/*
+		dodoc -r googlemock/docs/.
 	fi
 
 	if use examples; then