gentoo auto-resync : 19:06:2024 - 00:09:54

4 files changed, 98 insertions, 7 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 36795b4ceca7..dd06800a82dc 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,6 +1,7 @@
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 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-1.14.0.ebuild 1755 BLAKE2B bdfa32abc2e9d7d792cb55848d83c6dd04a2d7b64cb1ec4f3c32049836e13d3bdb6aeedf0106c439120e7e7218d83ca49ff93211eeb659549649a31a5a7c0200 SHA512 ba528aeeaf6ee96f4f028bfd938d63429834145b9c32411a3c8412e740ce0a996eb07f519c66e7492fb8c0e70be207bc483b0a8b60ccfeb9a1f77c1f50ce6169
-EBUILD gtest-9999.ebuild 1761 BLAKE2B 8b268bc060b2fbbc35557180b89e53e69a5236013b4f66daf594da236d41d46d228447319314cf2a44262977dfd279ff45424f62a423b8d4293251ddcdfa4c9a SHA512 a6c39e5a2124dabbeffdc448bc584c4fb98b227020d2fc12a9cc29f5a52b44fb2b1ddcd8d2647274d8b15900da5eec4bf231e0623b5d3e1a9ffb383425b2da01
+EBUILD gtest-1.14.0-r1.ebuild 1992 BLAKE2B 2b20026e7f95e0278ad1bb4cf846162fa18a01ac335aaf612514c72da5ad1bc6fb6e12235694b48cceaaac37e6a9516ba8a6975507f2810e268f2c94aeb01fcd SHA512 48cd1d97f023120cef32b237b6aa72d1745a015facc87db8450f049619114e84f5cd6ecb32a6ff72e455ca45768f20f2d5a18d2ae77a67183fac83ba7f26c5b9
+EBUILD gtest-1.14.0.ebuild 1755 BLAKE2B 50437b841c5a62f9f1d39e499bd2190bc0aa2e024fb81e4b834d3c44182e0d349bf8afe07b59a9ebf8ec375c27b234b09572849c34b51f9f7b47400ab7f2c440 SHA512 6888c92fa06a074cc83a8a99b661d2d5db561bd4860e205b10c58d3327eefd7baf5fad8b314f212001df595aa0c225164081420ebd37f6d7423471d9be4a8460
+EBUILD gtest-9999.ebuild 1996 BLAKE2B c42acf93040334dd0300980e64d6ad662b0e33b4147d6e2dc2ec10ca9d618d4b2e21840963c114258579439dc736bf6db2b2d11cd56defb2ea7e27210efbcda3 SHA512 be1189ec0f6e3319d3d7b32208c51e6d4d6b8312750ea2ee0d8438ad61a1a1320302ef60645a6c68526c53bd1cf1cc84bd98869b3e61fa8803876714b18793b8
 MISC metadata.xml 553 BLAKE2B a6d63b3f65e8cc9bf95fb0197c48f6adcca359f118797b0bb6c624d09dd586efe066c990e6cb709d42f8cbf32f67feeccf74b9662d13ddfd57f6b13f199585d3 SHA512 e1edf26c4cf978203c3c6e3fda887923dbf76101860dc8e6a81a7218f88fae0f28d4b78ce6cf34b5d3a61c550e1042d5fb3d3530f88b5277a5b46c8943dc0677
diff --git a/dev-cpp/gtest/gtest-1.14.0-r1.ebuild b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
new file mode 100644
index 000000000000..ae470f21a696
--- /dev/null
+++ b/dev-cpp/gtest/gtest-1.14.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 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_{10..13} )
+
+inherit cmake-multilib flag-o-matic python-any-r1 toolchain-funcs
+
+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 ~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"
+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
+}
+
+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
+
+		# tests
+		-Dgmock_build_tests=$(usex test)
+		-Dgtest_build_tests=$(usex test)
+	)
+	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
+
+	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.14.0.ebuild
index db197bf961d2..307c8242b1c9 100644
--- a/dev-cpp/gtest/gtest-1.14.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_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit cmake-multilib python-any-r1
 
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 5351c69b1cd0..ecb89314e216 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 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_{10..12} )
+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
@@ -39,6 +39,10 @@ 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
@@ -47,7 +51,12 @@ multilib_src_configure() {
 		-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
 }