gentoo auto-resync : 15:10:2024 - 04:04:09

7 files changed, 101 insertions, 99 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 0bbf55017769..53933d52f0cc 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,8 @@
-DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
+AUX gtest-1.15.2-fix-gtest_help_test.patch 545 BLAKE2B 2190dfba1b5f7ec54e18633a0f89ab9a98784f243b1b26daaebffadb55fcc863adaa7eb714202250034cede801c8f9bcf402683d2bf35c5f6ab13401ae4d7455 SHA512 66a7cb06ce56635f963db21637d5b5cf8a0671b0ae7594f63f7fc1e2dad99816459516d6e14a794fd026b82ffd2735eebe5501aaaa5a6b6c63f176447fd672fb
+AUX gtest-find-re2-with-pkgconfig.patch 891 BLAKE2B 5fc210c1ddff06e94493c0adc59d8db557606475aeb7c557ff98406850cedd1562d78f0f26d0a6c570e811a5a38218256c502bdaac6673a2b59293299e247eea SHA512 6625f1a8cbc59187aa5526c1a55f5851253de90744bcc14c3f5e2360ab1cd3be921893c5c90e3fc0eaadaafb446728ab6bc3f5ae456158e0f4b5dc84438df88d
 DIST gtest-1.14.0.tar.gz 867764 BLAKE2B c457f55ac572b9fb1553eee3df7eeeaf1e7dd2c3d747dd5e90dd279038fa5c71bb7b7d9ba1cf7e6143898b2a1d24d100584bd2a48ded41a426870c4825eec1b2 SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c
-EBUILD gtest-1.13.0.ebuild 1864 BLAKE2B ffbff14affae137f9aee93bebf3e72b700b8af149b430543b0c21a2c06656f3c0084e4c5f1540e505c7b9422cf415ea24a8f94efc91bb462642d64ebc45e6109 SHA512 d599096c90d486baa02e29aea7c1af279183a865d18df1b0b79556b45f74965003b6c80953227b91f6f864d4c036f3e06848e97df5dbaadd7a83183b238771dc
+DIST gtest-1.15.2.tar.gz 872667 BLAKE2B 2525d7a8572364cc2c2c129197201fc31e3cb4aadf4be37a995447a9b8e393205628e666dd190dca9a169b693883a5a2a5cafd6432cc3d1263a0c834ff8cf121 SHA512 9046841044a2bf7edfd96854ad9c44ffae4fcb9fb59a075b367507c0762a98eb32cb6968d46663228272e26321e96f4dd287c95baa22c6af9bad902b8b6ede4e
 EBUILD gtest-1.14.0-r1.ebuild 1995 BLAKE2B ee3fac63616ad3179d8f0c7fc1ab035a294c8840fe2c3ac6d88199b3472dd9d14082b367a34d430da2c3c3b47c3440cc5f5fd5fc99ad6381b133c931580c43bb SHA512 74d78336494d57b67d2ba22aefeecdfd7cf78353ea135c2b2b1e6d023c1ea417725ccbf0f5a226f187ecf9bfc3ae54bd2db125a7f8d25d70cf8e2326d9db062c
-EBUILD gtest-1.14.0.ebuild 1749 BLAKE2B 042a0ce1623fb1738352c9d5b5aee2bf3ab5f390dea14dfe0af27a2d8b79cfb5fb47ae0239657e5a20cbc15256efae57fe3f30cc90b978d1a500d7b62c2e69e9 SHA512 c099afd9d7282d19c5da16f9e9ea08475d648c336ed5e9be84e49845d6e62f68d1b74405f2776cffd571d61c97126c0090f40bda5a7a4bdc694d995bf45c3168
-EBUILD gtest-9999.ebuild 1990 BLAKE2B bd63b9a51f052209f6e4658008c093597a0bddfbc75f3e078c244f10b043519f1b8e9eeb464737cc93eec4ba1538e7a3207ef8af087f0972b598ce2ff05eabb0 SHA512 a17e6f16a0b05f24552367f14eba0959f58dd476ff441f0d830b3112e0627c09fb9f53fbb93693ccf16e360ad0acc7b155b3f109d8fffb00eb9dd46d8ae512bb
-MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
+EBUILD gtest-1.15.2.ebuild 2258 BLAKE2B ff37b84c1d7bf056b90a2779740793da1631b50fee6fa3d98e03eef3deac3d8549acf38e5159c1fbb578e0e21ae09247cb881ec6fb694e1cd19e87a1e90e36d9 SHA512 7f7cb15f4790692637978f46537fdba2e6caadf4db45030ef93bb384b94ea2e13d7fa605be757368a0bcefff36b6b3136327b380c834e6024f7fa26fa63b4082
+EBUILD gtest-9999.ebuild 2258 BLAKE2B ff37b84c1d7bf056b90a2779740793da1631b50fee6fa3d98e03eef3deac3d8549acf38e5159c1fbb578e0e21ae09247cb881ec6fb694e1cd19e87a1e90e36d9 SHA512 7f7cb15f4790692637978f46537fdba2e6caadf4db45030ef93bb384b94ea2e13d7fa605be757368a0bcefff36b6b3136327b380c834e6024f7fa26fa63b4082
+MISC metadata.xml 699 BLAKE2B dd19af9dbf315b62e6519246f338d1d281056f88aa06872578562cafe2019525aba5b6fc6eb0b74960c67a505272ea0e704a2eca382941f6f8ea6a5b2bb2d891 SHA512 8d7483d9a0085c5aa04abe858a56952decdcbd2cae2642c000077d60167f0f0a15c588158d64cafa999afbcd8d3677458075026e5f4c3d531631974611362c59
diff --git a/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch b/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch
new file mode 100644
index 000000000000..1ba087a53e39
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.15.2-fix-gtest_help_test.patch
@@ -0,0 +1,17 @@
+Similar to the bazel build, gtest is supposed to pass --has_absl_flags to
+gtest_help_test if building with abseil support but neglects to.
+
+--- a/googletest/CMakeLists.txt
++++ b/googletest/CMakeLists.txt
+@@ -293,7 +293,11 @@
+   py_test(googletest-filter-unittest)
+ 
+   cxx_executable(gtest_help_test_ test gtest_main)
++  if(NOT GTEST_HAS_ABSL)
+   py_test(gtest_help_test)
++  else()
++  py_test(gtest_help_test --has_absl_flags)
++  endif()
+ 
+   cxx_executable(googletest-list-tests-unittest_ test gtest)
+   py_test(googletest-list-tests-unittest)
diff --git a/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch b/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch
new file mode 100644
index 000000000000..3a78ae15cac3
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-find-re2-with-pkgconfig.patch
@@ -0,0 +1,32 @@
+dev-libs/re2 is built with a Makefile which doesn't install any cmake modules.
+For now, use pkgconfig.
+
+Bug: https://bugs.gentoo.org/940734
+Signed-off-by: Peter Levine <plevine457@gmail.com>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,7 +25,9 @@
+     find_package(absl REQUIRED)
+   endif()
+   if(NOT TARGET re2::re2)
+-    find_package(re2 REQUIRED)
++    find_package(PkgConfig REQUIRED)
++    pkg_check_modules(re2 REQUIRED IMPORTED_TARGET re2)
++    add_library(re2::re2 ALIAS PkgConfig::re2)
+   endif()
+ endif()
+ 
+--- a/googletest/cmake/Config.cmake.in
++++ b/googletest/cmake/Config.cmake.in
+@@ -6,7 +6,9 @@
+ endif()
+ if (@GTEST_HAS_ABSL@)
+   find_dependency(absl)
+-  find_dependency(re2)
++  find_package(PkgConfig)
++  pkg_check_modules(re2 IMPORTED_TARGET re2)
++  add_library(re2::re2 ALIAS PkgConfig::re2)
+ endif()
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
diff --git a/dev-cpp/gtest/gtest-1.13.0.ebuild b/dev-cpp/gtest/gtest-1.13.0.ebuild
deleted file mode 100644
index da5e784b43e0..000000000000
--- a/dev-cpp/gtest/gtest-1.13.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/googletest"
-else
-	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		SRC_URI="https://github.com/google/googletest/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz"
-		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 ~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"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-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
-		-DINSTALL_GTEST=ON
-
-		# tests
-		-Dgmock_build_tests=$(usex test)
-		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_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
-
-	newdoc googletest/README.md README.googletest.md
-	newdoc googlemock/README.md README.googlemock.md
-
-	use doc && dodoc -r docs/.
-
-	if use examples; then
-		docinto examples
-		dodoc googletest/samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.14.0.ebuild b/dev-cpp/gtest/gtest-1.15.2.ebuild
index e0b2f35af40c..f7916479456c 100644
--- a/dev-cpp/gtest/gtest-1.14.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.15.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python3_{10..13} )
 
-inherit cmake-multilib python-any-r1
+inherit cmake-multilib flag-o-matic python-any-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -29,34 +29,51 @@ HOMEPAGE="https://github.com/google/googletest"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="abseil doc examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
+DEPEND="abseil? (
+	dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]
+	dev-libs/re2:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# Exclude tests that fail with FEATURES="usersandbox"
+CMAKE_SKIP_TESTS=( "googletest-(death-test|port)-test" )
+
+PATCHES=(
+	"${FILESDIR}"/gtest-find-re2-with-pkgconfig.patch
+	"${FILESDIR}"/gtest-1.15.2-fix-gtest_help_test.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
 multilib_src_configure() {
+	if use arm && [[ $(tc-is-softfloat) =~ (softfp)|(no) ]]; then
+		replace-flags -O* -O1 # bug #925093
+	fi
+
 	local mycmakeargs=(
 		-DBUILD_GMOCK=ON
 		-DINSTALL_GTEST=ON
+		-DGTEST_HAS_ABSL=$(usex abseil)
 
 		# tests
 		-Dgmock_build_tests=$(usex test)
 		-Dgtest_build_tests=$(usex test)
 	)
-	use test && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	if use test; then
+		if use x86 || use x86-linux; then
+			append-cxxflags -ffloat-store # bug #905007
+		fi
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
 
 	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 be39799c270c..f7916479456c 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -21,7 +21,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"
@@ -29,10 +29,22 @@ HOMEPAGE="https://github.com/google/googletest"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc examples test"
+IUSE="abseil doc examples test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( ${PYTHON_DEPS} )"
+DEPEND="abseil? (
+	dev-cpp/abseil-cpp:=[${MULTILIB_USEDEP}]
+	dev-libs/re2:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+# Exclude tests that fail with FEATURES="usersandbox"
+CMAKE_SKIP_TESTS=( "googletest-(death-test|port)-test" )
+
+PATCHES=(
+	"${FILESDIR}"/gtest-find-re2-with-pkgconfig.patch
+	"${FILESDIR}"/gtest-1.15.2-fix-gtest_help_test.patch
+)
 
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
@@ -46,6 +58,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GMOCK=ON
 		-DINSTALL_GTEST=ON
+		-DGTEST_HAS_ABSL=$(usex abseil)
 
 		# tests
 		-Dgmock_build_tests=$(usex test)
@@ -61,11 +74,6 @@ multilib_src_configure() {
 	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/metadata.xml b/dev-cpp/gtest/metadata.xml
index 2a73b6d6508d..982d3d7ce6b4 100644
--- a/dev-cpp/gtest/metadata.xml
+++ b/dev-cpp/gtest/metadata.xml
@@ -9,6 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="abseil">
+			Build with functionality provided by <pkg>dev-cpp/abseil-cpp</pkg> and <pkg>dev-libs/re2</pkg>
+		</flag>
+	</use>
 	<upstream>
 		<doc lang="en">https://github.com/google/googletest/tree/HEAD/docs</doc>
 		<remote-id type="github">google/googletest</remote-id>