gentoo resync : 12.05.2022

4 files changed, 6 insertions, 87 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 708fe5a96fd9..6eafdc2c1f5a 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,7 +1,5 @@
-AUX gtest-1.10.0_p20200702-increase-clone-stack-size.patch 570 BLAKE2B dc6e87cc33314fa15b0bdf78baf6672915befe2c14c695681701975dfb3d6572b2254596789dc1cc2010db2bd391e1d26f17a3a83d6c3aa96a9252a0fd1ea3d5 SHA512 406f1f6e900b0fe2c042cb6d219f20586058e1e7e1af38ffa7059f0d5e6b24cebb7b034237d154d9669a9a860497a36b3c7a0308a0698af23bb07cb29cf38851
-DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+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
-EBUILD gtest-1.10.0_p20200702.ebuild 1833 BLAKE2B 68116cb37b4f39dc0c8d2b1d7132c905c207a04b22af6c3c921882f877b85eeb0c6d734905ad4da1837abc5fa952340c666072fe3d25ad5a190f5587f80e4a6d SHA512 cbd8d53c88e299235cff7c7e1517b40d8a1ce03dd099511357677797a3826b82edd011153314e2518e87a15ef0cbf5bd7331081f981f6621695d4c4f5051a3e2
-EBUILD gtest-1.11.0.ebuild 1890 BLAKE2B 7d27c3ca1d3cfcbdcdc5d8730d48c6f1a75e1a8de89ebaeb93d6a14e70aea59c11641fa8f7e4f6eb039b7bdf23bb8080cd9ab2a0ffde4f61fb64ef57fe937103 SHA512 84a857c4a5d1e4eee302e2fe055740ee57474136a9a7d003417d214117ce8803b0229b73691e17703f8c62871f11e74b1d9af6c9127de5400ec370993a6ca5e2
+EBUILD gtest-1.11.0.ebuild 1897 BLAKE2B 43a23aecd23edeae15270486d794428bb94ce2b419412d76f31666ec190c4839b0614f9431c8e8f005f0128885bd38b3e28f82dcd280c3fb43068ab9790cc616 SHA512 9d6da775fd0d39ea025852e34a4521a1dfb35a28a1263363404cc572e576c3c779f34351e8f37551a3e36b405e26c62765f7a3bce0e3485c1b2bbec97bb6fc7c
 EBUILD gtest-9999.ebuild 1898 BLAKE2B 79ce4ea6d5691411bea3f6b18d890e323040948e3b34c9bf538cad4d666efed3741b6114d5b36bc2190ae155cc18a16c50d98acf17a96328a66eb7c375c2e56c SHA512 7c9ab9fd7d1491bc36032df95b952f0d5cb53742df962fb7c270fc30886b3db9ce317123231344078e8db600c8335f9a4f542426daa5840eb7a22bd517fd3448
 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
index 3e06777ac9a9..0c47681ba347 100644
--- 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
@@ -1,4 +1,5 @@
 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
@@ -7,7 +8,7 @@ Bug: https://bugs.gentoo.org/692464
    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() * 10);
++    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.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
deleted file mode 100644
index 58067c7a096b..000000000000
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-any-r1
-
-GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/google/googletest"
-else
-	if [[ -z ${GOOGLETEST_COMMIT} ]]; then
-		URI_PV=v${MY_PV:-${PV}}
-	else
-		URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
-	fi
-	SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S="${WORKDIR}"/googletest-${MY_PV}
-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} )"
-
-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
-		-DINSTALL_GTEST=ON
-
-		# tests
-		-Dgmock_build_tests=$(usex test)
-		-Dgtest_build_tests=$(usex test)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake_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-1.11.0.ebuild b/dev-cpp/gtest/gtest-1.11.0.ebuild
index 7d212e72266b..b2c3ebbb46e6 100644
--- a/dev-cpp/gtest/gtest-1.11.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ else
 			-> ${P}.tar.gz"
 		S="${WORKDIR}"/googletest-${GOOGLETEST_COMMIT}
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Google C++ Testing Framework"