gentoo auto-resync : 04:09:2023 - 16:21:31

4 files changed, 17 insertions, 43 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 8ba008dfdd2c..72a97d53597b 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,6 @@
-AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 606 BLAKE2B dc5282aca513bcb82e7ed90e432ca1ee758953955a30f1dd17bc0c2f56a46e7ef846c209186e561dfa6d7e7f7541ee03db5b88dcacfac649e0ff2a3f41bd7870 SHA512 01ab820bf5a100905f24be2a9f866b98e9e6a90686ecd0b93a85d42d9290bc6cb74e6fd218e78a48c6dcc69d410fd2dc9ccf7aa50903fe86e7886af1b97c25fa
-DIST gtest-1.11.0.tar.gz 886330 BLAKE2B d11fdd485f292d96508cbc27a9a444ab69b86571cc594298fd3f0e6d4bd8d6ec20dea848fe11be165d34054b2251ad377f0930f852914feaa1416ff156986a9c SHA512 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
-EBUILD gtest-1.11.0.ebuild 1833 BLAKE2B e54375ddddecea71e6cec26ca83d3c251c7b9a280014d174f569a3031d33b91a571174aa377aa469d9e6eb1fcd8092ae7f9eb13bd4ddc56545c1a0d6dfd13ad3 SHA512 cf5128b1ce4f92dd334823be3e11126910ce796e093ed6603b7cb9685e69e99b10fa72e3f47a5192ab376fe3e593c94f669305102e90eb2232d8442f92436199
+DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
 EBUILD gtest-1.13.0.ebuild 1870 BLAKE2B f2ea03a8fa7c5d8c39b4a8af7e1a2ee7871fb0636fa457b1a0b850e0307d0f030228d0c7b60fc5b9545cd412b5b6d2886ccc690977682fbd307ff4bf82967a85 SHA512 4fd2ad52f159021aa883364dc0ec5c65376d6efff0279c9aaf516df5f258678df2c2bc84d5b19d638aa7831138e9af3dbb64ea7f7e80ae09923d02a9445ac4ba
-EBUILD gtest-9999.ebuild 1878 BLAKE2B 1c36f33ddfa5593e13971bf59d6d806f55ab4a095064bf0a63b58b434c361605bcab1ce429ebbba4624b4d32f151143045bc2329ad39e697ad658c8c2efb6905 SHA512 d6f97cb076ad45fb580f3c6be948c6ea1a386c9c56a8cc64878324f1e38a7133700f81607a8aaa44d31449ce64837ac7ebcc52f33b6c0f138d08958765bd922e
+EBUILD gtest-1.14.0.ebuild 1761 BLAKE2B 8b268bc060b2fbbc35557180b89e53e69a5236013b4f66daf594da236d41d46d228447319314cf2a44262977dfd279ff45424f62a423b8d4293251ddcdfa4c9a SHA512 a6c39e5a2124dabbeffdc448bc584c4fb98b227020d2fc12a9cc29f5a52b44fb2b1ddcd8d2647274d8b15900da5eec4bf231e0623b5d3e1a9ffb383425b2da01
+EBUILD gtest-9999.ebuild 1761 BLAKE2B 8b268bc060b2fbbc35557180b89e53e69a5236013b4f66daf594da236d41d46d228447319314cf2a44262977dfd279ff45424f62a423b8d4293251ddcdfa4c9a SHA512 a6c39e5a2124dabbeffdc448bc584c4fb98b227020d2fc12a9cc29f5a52b44fb2b1ddcd8d2647274d8b15900da5eec4bf231e0623b5d3e1a9ffb383425b2da01
 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
deleted file mode 100644
index 0c47681ba347..000000000000
--- a/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug: https://bugs.gentoo.org/692464
-     https://bugs.gentoo.org/834068
-
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1070,7 +1070,7 @@
- 
-   if (!use_fork) {
-     static const bool stack_grows_down = StackGrowsDown();
--    const auto stack_size = static_cast<size_t>(getpagesize() * 2);
-+    const auto stack_size = static_cast<size_t>(getpagesize() * 12);
-     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-     void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
-                              MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.14.0.ebuild
index 0881eaf88cfe..5351c69b1cd0 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.14.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake-multilib python-any-r1
 
@@ -13,15 +13,15 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/google/googletest"
 else
 	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		SRC_URI="https://github.com/google/googletest/archive/refs/tags/release-${PV}.tar.gz
+		SRC_URI="https://github.com/google/googletest/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz"
-		S="${WORKDIR}"/googletest-release-${PV}
+		S="${WORKDIR}"/googletest-${PV}
 	else
 		SRC_URI="https://github.com/google/googletest/archive/${GOOGLETEST_COMMIT}.tar.gz
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -34,21 +34,10 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
-)
-
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	cmake_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
@@ -57,11 +46,17 @@ multilib_src_configure() {
 		# tests
 		-Dgmock_build_tests=$(usex test)
 		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
+	use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+
 	cmake_src_configure
 }
 
+multilib_src_test() {
+	# Exclude tests that fail with FEATURES="usersandbox"
+	cmake_src_test -E "googletest-(death-test|port)-test"
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 1e958926faa8..5351c69b1cd0 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake-multilib python-any-r1
 
@@ -38,13 +38,6 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	cmake_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
@@ -53,8 +46,9 @@ multilib_src_configure() {
 		# tests
 		-Dgmock_build_tests=$(usex test)
 		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
 	)
+	use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+
 	cmake_src_configure
 }