gentoo resync : 29.12.2022

4 files changed, 101 insertions, 2 deletions

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 09bb08a204c2..7e39c9e71f6e 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,6 +1,7 @@
 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 abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2439 BLAKE2B 7640ea553046a8935b173d2043dbf2cd0fc26c4918fed0387f8cfdb924a897dba6b25165d154a9bc351d44dd01b971cbbe2705745eaecc432beee32030fa66df SHA512 ab0461284e0e3a1e40a3bf727d52ca6a6fa77b1cb36565cd7466aaba8064522195f0e22217603f4ceb304eb75170418e3fcb5e3a114c58aab29f46a33ad1f99d
+AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 866 BLAKE2B 18c6ebc915080d4851a13763c30f9e3edc8224640546ac0b4cbc26671498bca2b69f55628ec889b00be76ba7a6246684c6273eaf00a967b96faa42c6882afa2b SHA512 b56cd0bd7accd243c0a8b0b759fb1e0c51e6167d8a9882513ed2b21760414b3f3dd329f5965f4c914b16f6d2a2ebe5c34b469401432e2914b5a10316f86a6be2
 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85
 DIST abseil-cpp-20210324.2.tar.gz 1774172 BLAKE2B f33ebe830bcece41d76c4de8f514e32a2515be8a78b6cc7a8877ba72284be62649e345dea224976e78e8dcf7fd957e249c92f7c89e92ae44e984fe294df711fc SHA512 7b935f0f2787a81438f30072f2191138ce3c099e4b22addfbe8ebe579d906604bc6ab03f054d3d6917a08ef5cb7a4371c1a501a7dfbc15c50301261dbf5f6e27
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
@@ -8,6 +9,7 @@ DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 EBUILD abseil-cpp-20200923.3.ebuild 2026 BLAKE2B 9dffa70b9c9fcaa4c20fa06d6c775d52d35919690619ebc24d4b35da1502f587cdece1bc2f6532c2246210216082d0e6c21b9620acb3161abde70d3ccb8b6689 SHA512 6e3a4125ed1320e938f373607c25fe8823323d13ae031256e615cf5d0a547fb39c4fc6269091d21efa3905adad9002869fed7b74e61324ff9d8a8530a807f807
 EBUILD abseil-cpp-20210324.2.ebuild 1891 BLAKE2B da7b42a49acb82ceb39e7e5906b4da251bc9e6a8ddc8cb0159a75da8780b2cdc3c904417880126092f85cf730a73a92356d170d8e643cc1693c4eb95af692df5 SHA512 4105a51bc824f32e8f122df992cc370d3ef5541f06e77b13eafe2cf5dd0a9387a0aa81c7b86cec90df0321d70c8f4bd6f766d13a0f12379a29410d16c4ad8f75
-EBUILD abseil-cpp-20211102.0-r1.ebuild 1678 BLAKE2B 515f893fe2d8f3e601ee73507d06e454d34d9ef13ec37f8c6fb9af6ae23a54e959b8f2be6009084b006acddcf1dc2bc6471ffca6ad249e2a949f3adc4c49d24e SHA512 a0cec1b50c94cf30378ddc23337ffe52ea28d0336d277ad76b5fab0990971aac10e6bcfc693088108665a8b270634889ae09093ba65752d5e8a39991b82ddc87
+EBUILD abseil-cpp-20211102.0-r1.ebuild 1683 BLAKE2B 95170555f232caedb95c9fc7131210c00514c2afb77cbfa538da16b7b0a941b493f2ce5ad830f655fa560f54996bba987fbc74ac175d74591529ce6c966f491b SHA512 bf1c666228340f858d0b61aa81d6257035a78f856c586f2939351923f378499cec985b758265e41d1db6766ad0a687620997c3091755939596bb55769716bda0
+EBUILD abseil-cpp-20211102.0-r2.ebuild 1745 BLAKE2B c0bb4accd08bb770e55a81577f46f5ef9fdec51b0c1e7ded722ef6b2ce8cf7c73e8df1275832f8e072363e4b9a4c58007f5b25731bb484bd51f68499a6da90c4 SHA512 142b587671e34ff1fe852b6e18077e14d10bc61bc7714033ab806d467ed6d9d7630e8bac9a5d373ab3034866a90865be7c1dba1f8844f93eab7392eb38d789b1
 EBUILD abseil-cpp-20211102.0.ebuild 1603 BLAKE2B 5a8596e862086722f997f8db73df24135108b0b80fe169e8f970814894f66c186deb3a893377244dda4acd5f81392a4bd4e24b90ebc87039cbe0d6c8dac8db90 SHA512 9471e131323b7173e225231a0aa0841daea2f5700bfb6441406b81d7789946c09e3f77059d87008e2f7d70bed647fd09055dfa2305e34c28df422c24d9027cdc
 MISC metadata.xml 357 BLAKE2B 3137dd5248b0a7df5b0bf1af9c410cc5a8af300142d18d9d4110a74452f4b1a5f263dd1748a7b88eef0b1548b7203dc12c2678c6d07673f6766fdbc8a1297813 SHA512 3134c17c0f83d8ad16f081c506fd1f3e3ff06f1a2b615d56c4f05456c971acf8568768c2ed443f3a35725dd19f8d42076957fe2d25d049de277dea55903ea2ed
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
index 9873c85b8ee8..f2535818dcfc 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r1.ebuild
@@ -22,7 +22,7 @@ LICENSE="
 	test? ( BSD )
 "
 SLOT="0/${PV%%.*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="test"
 
 DEPEND=""
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
new file mode 100644
index 000000000000..a987d852dee3
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( sys-libs/timezone-data )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch"
+	"${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch"
+)
+
+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-20211102.0-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
new file mode 100644
index 000000000000..59efc0f321e3
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h
+index a11336b..e1596b1 100644
+--- a/absl/strings/internal/string_constant.h
++++ b/absl/strings/internal/string_constant.h
+@@ -35,12 +35,18 @@ namespace strings_internal {
+ // below.
+ template <typename T>
+ struct StringConstant {
++ private:
++  static constexpr bool ValidateConstant(absl::string_view view) {
++    return view.empty() || 2 * view[0] != 1;
++  }
++
++public:
+   static constexpr absl::string_view value = T{}();
+   constexpr absl::string_view operator()() const { return value; }
+ 
+   // Check to be sure `view` points to constant data.
+   // Otherwise, it can't be constant evaluated.
+-  static_assert(value.empty() || 2 * value[0] != 1,
++  static_assert(ValidateConstant(value),
+                 "The input string_view must point to constant data.");
+ };
+