gentoo resync : 05.12.2021

5 files changed, 90 insertions, 2 deletions

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index ef31e2b9699c..0455dc474895 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,12 +1,16 @@
 AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3
+AUX abseil-cpp-20210324.1-glibc-2.34.patch 720 BLAKE2B d24511a6b929d8bc15fce316f46ce6a3f8686357f72d97f2ebc8365ac04cc93afbf801c24ad8a488a4cbefa615ddc3141ccd25890b005bfba8e53e45276ec664 SHA512 05e53e5175328c2907a346ed01163bf8d0c6d51ffb85c58aeed507ca10444fde29adc86dfd259f9cbaafa35aa6723f531fdf05749b6c1248f094ed672d74fa14
 AUX include_limits.patch 310 BLAKE2B 42e5ba8bfe63f12128c0cc31cf2a535bed86925dddf37cf4e5f974c0e039f95d6740dce301004e097cf2f4cbc4eb0e1dea05afd1fbd720cdcbfc0a7c2325be25 SHA512 7909eda4244fa205f540ed4b279af0231834157f5389bbb42bb2510a1df0c7ce2e48604c98740e82cbf1cfcc3dea4a36e1c90b66b779f234991254f15f73288b
 DIST abseil-cpp-20200225.2.tar.gz 1679650 BLAKE2B bbadb2b86fd390f51322e687526c72a3b13caff6391974462a1146cc563616ce479330336a489a71e27b143e7cbea6695fc12c91fb721185a5116b3a6c5506b1 SHA512 75a607dee825e83c10dcd5e509515461f1b12c4aca861e4739ac4d41357b8e893dbfbe33873aa5c05463dde0891dedd7535af2ec59f173de29488e1b1321b335
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.1.tar.gz 1774134 BLAKE2B 8dd42b3d60a38995eeeeb72ba8aaa367c3caff118d88069dba9df24b155318ffd6c4e289c263346899bf7fc0bf6e8332380407a8a93c77f8cade0e8e74743b84 SHA512 fe593ed98eeea5461abca95ebb9dd3f7e8eedaa15e009f776945fdbb6ed489c61966611c1c72558d2ccdd541b952a345e51885d522ff29542cbcc837cf565866
 DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
+DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
 DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
+DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 EBUILD abseil-cpp-20200225.2-r1.ebuild 1371 BLAKE2B 12b6b1be611e1d35877e68b0e17f32a1fb39ba9e9e1d73938e00fd949ca73f2df42024954dae12eeddf60f4efedadf1b824fdb14a685f9469dc4d0e539b14e00 SHA512 bd9496152e6844562b011f38833ab204bf1e28adc4d12e2e23e9fb8106e806327d3c6de03058eee5cd51753b4fc9c6e5fac83cc51ed78965dd5f4c908c6f8791
-EBUILD abseil-cpp-20200923.3.ebuild 1977 BLAKE2B ef17c3577458836d9f6503691ce4b67102a32dbb661fb33532180a120538dcba59af29b1146401928eab55a59a7333c176fae55e19509249456b0cb73a49f194 SHA512 50a0a8631a37f186364b413dc7ed9b728483361325c0453dae7c9eca5ae3e1a694289feca051d48994161fa93a732651270dd81edbe41cf166052a5f8aa9f84b
-EBUILD abseil-cpp-20210324.1.ebuild 1886 BLAKE2B d6febb034da61816a2b16e7348f5d6aa9fed91c2bdd14a49ce04b4280236a87eec67ad0e5457e1721ff635e79147f876db274cca05f856932f7705cedbf61874 SHA512 eece97f84aac1db70180d382cdac79baa8156256213e84a0ed90958c39337b7fb9517a9d5aeb05f2fb8d45d1c99df87be43df4bd141aedf92ce9de09b5af1be3
+EBUILD abseil-cpp-20200923.3.ebuild 2026 BLAKE2B 9dffa70b9c9fcaa4c20fa06d6c775d52d35919690619ebc24d4b35da1502f587cdece1bc2f6532c2246210216082d0e6c21b9620acb3161abde70d3ccb8b6689 SHA512 6e3a4125ed1320e938f373607c25fe8823323d13ae031256e615cf5d0a547fb39c4fc6269091d21efa3905adad9002869fed7b74e61324ff9d8a8530a807f807
+EBUILD abseil-cpp-20210324.1.ebuild 1935 BLAKE2B 0973f4be9298ef454978bf8d4a80a9f944b2a6e35d8c2b95f982267eae3ba1d6109d9a71ec620e06a20147a64ada2492d0ba52726072459635d6fad9757389be SHA512 b6a6e0013168b2b7c3121ea1106dd3e1b5f0f3f911209dd65e8cc8c8bad92eccd3d55f389449d273d9896ffa64b2fa8919c084f03abe1442551e9dc46422cbc7
 EBUILD abseil-cpp-20210324.2.ebuild 1894 BLAKE2B a548727f6b94a323a4afc6b0d1c1ccbeb94bf54f836faceba153774895efb2a2aff0cfe9dc308062c02b385b2d182d6db85f96e09c8b0207ebfa4f8c867264ff SHA512 65a92c92e8f74f0a31bab9f3358cb4619d986fea314daa94066743c754248e94c84e5f88c8423856d63c51355ee228ad63b00330063763f07371851fa44be766
+EBUILD abseil-cpp-20211102.0.ebuild 1607 BLAKE2B 913a8e620bc40c7cfa55e89cb85379d59ef41e7f8f589b150a737194203c7b06c67d6692e63b39f69d551408547734520a70f442c854041858c113d92b151684 SHA512 7a3e3fd50d55c17f6d2eb77aa0582b10d6556b36b5a0b2c13d41726968478e5ecd871fb6e95a3e55f527e1c0da65eb19e5e21a34d62bc2d855198ed2d5d2774d
 MISC metadata.xml 357 BLAKE2B 3137dd5248b0a7df5b0bf1af9c410cc5a8af300142d18d9d4110a74452f4b1a5f263dd1748a7b88eef0b1548b7203dc12c2678c6d07673f6766fdbc8a1297813 SHA512 3134c17c0f83d8ad16f081c506fd1f3e3ff06f1a2b615d56c4f05456c971acf8568768c2ed443f3a35725dd19f8d42076957fe2d25d049de277dea55903ea2ed
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
index 40f5fbae8e28..788d8cd9c0a4 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20200923.3.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+	"${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
 )
 
 src_prepare() {
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
index 2414ecd661e2..087d0e5ce2b8 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20210324.1.ebuild
@@ -36,6 +36,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20200923-arm_no_crypto.patch"
+	"${FILESDIR}/${PN}-20210324.1-glibc-2.34.patch"
 )
 
 src_prepare() {
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
new file mode 100644
index 000000000000..fc4916e27e71
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1
+
+# yes, it needs SOURCE, not just installed one
+# and no, 1.11.0 is not enough
+GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a"
+GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz"
+
+DESCRIPTION="Abseil Common Libraries (C++), LTS Branch"
+HOMEPAGE="https://abseil.io"
+SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )"
+
+LICENSE="
+	Apache-2.0
+	test? ( BSD )
+"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# un-hardcode abseil compiler flags
+	sed -i \
+		-e '/"-maes",/d' \
+		-e '/"-msse4.1",/d' \
+		-e '/"-mfpu=neon"/d' \
+		-e '/"-march=armv8-a+crypto"/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+
+	if use test; then
+		sed -i 's/-Werror//g' \
+			"${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL=TRUE
+		-DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}"
+		-DCMAKE_CXX_STANDARD=17
+		-DABSL_PROPAGATE_CXX_STD=TRUE
+		$(usex test -DBUILD_TESTING=ON '') #intentional usex
+	)
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch
new file mode 100644
index 000000000000..99b868d3101f
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20210324.1-glibc-2.34.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/823990
+https://github.com/abseil/abseil-cpp/commit/a9831f1cbf93fb18dd951453635f488037454ce9.patch
+--- a/absl/debugging/failure_signal_handler.cc
++++ b/absl/debugging/failure_signal_handler.cc
+@@ -136,7 +136,8 @@ static bool SetupAlternateStackOnce() {
+ #else
+   const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
+ #endif
+-  size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
++  size_t stack_size =
++      (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
+     defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
+   // Account for sanitizer instrumentation requiring additional stack space.