gentoo auto-resync : 12:04:2025 - 08:44:02

8 files changed, 158 insertions, 33 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c1bf77dbd711..b50c71922026 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 5bff79698d4a..e0adf454b320 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -22,6 +22,7 @@ DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69
 DIST abseil-cpp-20240722.1.tar.gz 2242894 BLAKE2B fc20e3bb734ae17cd7d808cdf08e624a511d77255d17023104d3f3a5ad4844bc0b0618a9792a06492da5287f4f5cd8151ebbf4ab7c703c62d9fcdc955928b944 SHA512 6062a10220d1250127e2216cea65833f10f37459331254b59df437b5061af81a9645cab39479700cf1843ef7dee51fe125241b0ecb9f715705a45dce4ffae89e
 DIST abseil-cpp-20250127.0-PR1834.patch 968 BLAKE2B b563725afcae9fcbddde9aef1e492ed9ca13201a3cb817044c2fa62a8d47d79600a2b1cb6018bb12a21a27fe765ab4a6f1b43239401d97962fd794520cff3ded SHA512 28bd3cea659ba400da928d8ce2bdf6a8dd25a3991abdca74b6cf7893e0ac206eb95b6f94beeb0a02516b4403da20e088e42553705c024f5f5730281248c2acaf
 DIST abseil-cpp-20250127.0.tar.gz 2267275 BLAKE2B 70fa05a0db91b9e7ccf9f2828a7bf4b7fe6d7177b5f2d17b2f2f6f2a5e83289674d624fa7983410713a2d62b1025a5b5d957f1ba11e01cb727fc771ce76bc914 SHA512 2a021faad807ee3e23548716ffa4785dc2409edbb4be676cc4bc01d47885760de340f0a4afdcbf0aaa835affd6d78f7bc319bbf7d337dbc30e7a559d0088e4bd
+DIST abseil-cpp-20250127.1.tar.gz 2267282 BLAKE2B 61a6f0340c3883f097c56161d67f0046398513ef716d33a7b26e55e33032262f2e5f02c678318688f7f72a5eea7a88b37abf6d2f84e52626a258c497bea80a83 SHA512 8312acf0ed74fa28c6397f3e41ada656dbd5ca2bf8db484319d74b144ad19c0ebdc77f7f03436be6c6ca1cde706b9055079233cf0d6b5ada4ca48406f8a55dd8
 DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e
 DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954
 DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb
@@ -31,10 +32,11 @@ EBUILD abseil-cpp-20230125.2.ebuild 1693 BLAKE2B ad84c9a1b9b5983029aa5978f1fefc1
 EBUILD abseil-cpp-20230125.3-r4.ebuild 1711 BLAKE2B 801637ded0d238591b0f6fc581e9640424def79d6a5c6414060254e105ef0fda1ea15815f25b23b0894c67fc0132e9ec1aaf1af10823df38f6b653499221c05d SHA512 81bb4091ffe42841581d2bca66528d23ca831ff4fc1b0fd76c6f8ba16dbadab558be4b9772af802a799ea9d50089e3150009b32fb62b23b5c298111ce30c73d2
 EBUILD abseil-cpp-20230125.3-r5.ebuild 1764 BLAKE2B 8c2ec49ea1596ad8f971414d06d8d957e1eebf26858868e95ec82fab990174817e21530aa0969aef024297819fe24658f7a07ad6cf5c336e120e88d961b878f8 SHA512 b685bcd81ee099888290d7111d4ddd7cd413cb191a59667dc5c2a57b1e2f0358525c8f3c222a24b7fce0a66e17da88020d97e26e5900d91b95ce1abbe597cf2a
 EBUILD abseil-cpp-20230802.0-r4.ebuild 2020 BLAKE2B c29d5683173e4f720a799446bac5ec041985e633a70f1c239edc7c54dffb4b9fcafec366ace8fe3c62a686b4f2dde58313500dffdd024b08af54b45cf661edd6 SHA512 f05658f83346bccbc0e0fc86ccd3750f8ddef863328308d6bf5fe4f03a5e1316e1b4a3231218f3a7094a959ba74b7dce32b136602a505091c2b607707d060073
-EBUILD abseil-cpp-20230802.3.ebuild 2156 BLAKE2B bf1f6ef63f38a71fe6fd0d36330b2609a2fdae6b912ce17671d12cb8230524796b49b6520b6cb7697aa7894407ea2e9fc60d29fcbd1652d407204cd3a20b3c17 SHA512 30cba932014f03c08e9934f3a9fd4ef15dbd0f870469e27d5e488154696353ab74aff6bacc24bd4d2f8da83baf0946234d136648d4a387950e2e5dc699239f47
+EBUILD abseil-cpp-20230802.3.ebuild 2249 BLAKE2B 6ab2de423106912da071570b297ee10139493d7ce84b9f695e449ed499e470f691e5757c2563fc408e0fca86837094daf4d9295e56f25ce8e73781399ebbfade SHA512 892d111f7b227ef420fd261ed6330da0be32cb2d934c144fad7c6052137d22942b09819a92ec1e33c1f32f9b61e589b40406c9186a8f832da14540ed1e575f09
 EBUILD abseil-cpp-20240116.2-r4.ebuild 2054 BLAKE2B 4c3d16b79cdb84a2e40f8640dba22887be98d6b4e02733812fca4a07192380dcb57111c30dc2f15c0f560d4817e341de7bc26b6acd70aceafb532c078775cf90 SHA512 cbace15d0e28c45c88e9d833df30d53ad746f41be878110205f6faf221d45f906b20da97275ace060654fdfa3cbe836b6fad2ab22c186e66d7c016184a41244f
-EBUILD abseil-cpp-20240116.3.ebuild 2194 BLAKE2B 4b1b33394542a5549d41ccbb9d0b726935c2b519e1167beeffd4098f28893da20c7500c536935e1b86366d76480491a4119977faf7c59558222de27d1df98d7c SHA512 72b7caff9b133ac49bbfdabdbfe5e109335b40d2eb695f69aa24ef26a2015091786f6584ff9f3058648a632e95c68dfdf7ff60cefb241994976c05736b98ff99
+EBUILD abseil-cpp-20240116.3.ebuild 2287 BLAKE2B aa322795ace8b19f3419c6b8aa61cea01e52ec28c985f080fa336f94c38199e343b346ea3a01220a2f517b0f42c5e4643864ae21dc2e7c6822fe0c327d750470 SHA512 cb90b011a67a7dad404fc85e0cc47f689045cb6c9155631be2d790f45c04c99d14335df32e82ad9d2406842d115432c81341a5e369e7fa650d0df974047e8636
 EBUILD abseil-cpp-20240722.0-r1.ebuild 2019 BLAKE2B 5a8147f4ac0caf7bd564974e6ac80593c716c8a36de2b2bef02cb66662581f11690bd8e95937980e9836c60fc875d5d3b90dab6c7f281e8a93a29df73154b813 SHA512 f2263734c9e3f6b26a0775de3e7f9e70dd54c66d6d1acf7b300c7b31f762f973a1006a08aa96f950128c686acac7ba74b749a6079b67a295bc6a7f8775f6d6ac
-EBUILD abseil-cpp-20240722.1.ebuild 1973 BLAKE2B ff5921ec65ccf3c01e0ecc6c8aaecfce870977f06c15d1787eb939e4ffcc72cdd364ed23c166b0b2935252a67ddf63449602456aa6b625ae7839e96d73c1a966 SHA512 83c67e389dae155fdd55b46b3e4a8df459f9bfccc3c6d625a4803d045f03c169654682d1291fb88c14e3dab5e132f3e0ac0d5035947531acdde9c4eca4f31ce3
-EBUILD abseil-cpp-20250127.0.ebuild 2107 BLAKE2B f3bf7169bab176cc823fccfecadde9ee0785a08285b5c1be830ba349619eac0d34eea623dae8ad2e5e080a989ab3a5d73f065d058b23d7d3439fad509e92900f SHA512 afead762bb7949f7242d2146eca4c60ff136118b75d05e190fd5041d0779f201bdac329a07e95692715cd5bf02f3bcd54746118922c500882a1ff8f90680a170
-MISC metadata.xml 511 BLAKE2B 368361dc6f2e55afb5af3623635272b5a7ec9444a09e7fd0be2879a7dfa2e168c0a1b994d84878a6cd422423103f317b20b543aa11ca00656199e2d3a3a4bad7 SHA512 fc164cafaca7a59e4891a1f5c7f93f790c4b163c0310cbb915f9450de023296d8ed440a89a51230aa9869c70ed55a2b1c54ca3579761cd880df9bccbbde801fd
+EBUILD abseil-cpp-20240722.1.ebuild 2065 BLAKE2B 1704219bac91be9def55d3a9b29a904d6e7f71f64d16e7aff6bd1375ac1e5c289d81b2bce9dad93df22aad4d184c677b51eae6c6acec955bbc903c51f35bfc94 SHA512 9db79d3a805b178cab3ca8ddd8d0d178ae7eb8fc45cb1edca649e9785825d7d9873cfe16338ac2659dadc16f058f6398386b2fe588b53d29a4616c0ff67bfa23
+EBUILD abseil-cpp-20250127.0.ebuild 2189 BLAKE2B 3b8fdb2d168adf2b6fe7ed1f79c6c1286d997a9a7da9346b7a8cfd4b1297c66df063d0c898c73172de608ed766692e4b96e8e6d103b31abce9d651c4c7a88c30 SHA512 fb57502f85b1f2b7723a77a9e869daaa25d1a23b133a98d01d27206ba07ea8b07c60ae4a7e6af951bcf50d991bf0004780a4b78a712e9f558dea37898c59dd1a
+EBUILD abseil-cpp-20250127.1.ebuild 2189 BLAKE2B 3b8fdb2d168adf2b6fe7ed1f79c6c1286d997a9a7da9346b7a8cfd4b1297c66df063d0c898c73172de608ed766692e4b96e8e6d103b31abce9d651c4c7a88c30 SHA512 fb57502f85b1f2b7723a77a9e869daaa25d1a23b133a98d01d27206ba07ea8b07c60ae4a7e6af951bcf50d991bf0004780a4b78a712e9f558dea37898c59dd1a
+MISC metadata.xml 630 BLAKE2B b8718de25104713db8aa224e08f073fcb5fc01026071e0381b0cd74c8caa29f6d69cd5b33d9ff2baef72046c1fb52c084d65cd3c7fc77580cd4630fde278bfd1 SHA512 da7e3e9e13068400b220d73c1f2623877aabaec0b465d2fd80814b4b1468294b142d1c89d44f6f7dfa0dfe0033ba7c7c26c3919555dbe288a5ccdc1e780a977c
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
index dd1810a5fe1a..020e26fc0ec0 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.3.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
+IUSE="test test-helpers"
 
 RDEPEND="
-	test? (
+	test-helpers? (
 		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
 	)
 "
@@ -45,6 +45,7 @@ src_prepare() {
 	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
 
 	# un-hardcode abseil compiler flags
+	# 942192
 	sed -i \
 		-e '/"-maes",/d' \
 		-e '/"-msse4.1",/d' \
@@ -63,14 +64,18 @@ multilib_src_configure() {
 		# We use -std=c++14 here so that abseil-cpp's string_view is used
 		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
 		-DCMAKE_CXX_STANDARD=14
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
+
+		-DABSL_ENABLE_INSTALL="yes"
+		-DABSL_USE_EXTERNAL_GOOGLETEST="yes"
+		-DABSL_PROPAGATE_CXX_STD="yes"
+
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
+		-DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
-	# intentional use, it uses both variables for tests.
+	# intentional use, it requires both variables for tests.
+	# (BUILD_TESTING AND ABSL_BUILD_TESTING)
 	if use test; then
 		mycmakeargs+=(
 			-DBUILD_TESTING="yes"
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
index 9f5cd6299aed..e99a4b190279 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.3.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="test"
+IUSE="test test-helpers"
 
 RDEPEND="
-	test? (
+	test-helpers? (
 		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
 	)
 "
@@ -45,6 +45,7 @@ src_prepare() {
 	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
 
 	# un-hardcode abseil compiler flags
+	# 942192
 	sed -i \
 		-e '/"-maes",/d' \
 		-e '/"-msse4.1",/d' \
@@ -63,14 +64,18 @@ multilib_src_configure() {
 		# We use -std=c++14 here so that abseil-cpp's string_view is used
 		# See the discussion in https://github.com/gentoo/gentoo/pull/32281.
 		-DCMAKE_CXX_STANDARD=14
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
+
+		-DABSL_ENABLE_INSTALL="yes"
+		-DABSL_USE_EXTERNAL_GOOGLETEST="yes"
+		-DABSL_PROPAGATE_CXX_STD="yes"
+
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
+		-DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
-	# intentional use, it uses both variables for tests.
+	# intentional use, it requires both variables for tests.
+	# (BUILD_TESTING AND ABSL_BUILD_TESTING)
 	if use test; then
 		mycmakeargs+=(
 			-DBUILD_TESTING="yes"
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
index 980635fdd36e..420b0a925935 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240722.1.ebuild
@@ -14,10 +14,10 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="test"
+IUSE="test test-helpers"
 
 RDEPEND="
-	test? (
+	test-helpers? (
 		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
 	)
 "
@@ -44,6 +44,7 @@ src_prepare() {
 	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
 
 	# un-hardcode abseil compiler flags
+	# 942192
 	sed -i \
 		-e '/"-maes",/d' \
 		-e '/"-msse4.1",/d' \
@@ -59,14 +60,17 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
+		-DABSL_ENABLE_INSTALL="yes"
+		-DABSL_USE_EXTERNAL_GOOGLETEST="yes"
+		-DABSL_PROPAGATE_CXX_STD="yes"
+
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
+		-DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
-	# intentional use, it uses both variables for tests.
+	# intentional use, it requires both variables for tests.
+	# (BUILD_TESTING AND ABSL_BUILD_TESTING)
 	if use test; then
 		mycmakeargs+=(
 			-DBUILD_TESTING="yes"
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
index 896be16ff5ca..481480e5aadd 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.0.ebuild
@@ -18,10 +18,10 @@ SRC_URI="
 LICENSE="Apache-2.0"
 SLOT="0/${PV:2:4}.$(ver_cut 2).0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
-IUSE="test"
+IUSE="test test-helpers"
 
 RDEPEND="
-	test? (
+	test-helpers? (
 		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
 	)
 "
@@ -60,14 +60,17 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-DABSL_ENABLE_INSTALL=TRUE
-		-DABSL_USE_EXTERNAL_GOOGLETEST=ON
-		-DABSL_PROPAGATE_CXX_STD=TRUE
+		-DABSL_ENABLE_INSTALL="yes"
+		-DABSL_USE_EXTERNAL_GOOGLETEST="yes"
+		-DABSL_PROPAGATE_CXX_STD="yes"
+
 		# TEST_HELPERS needed for protobuf (bug #915902)
-		-DABSL_BUILD_TEST_HELPERS="$(usex test)"
+		-DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
 		-DABSL_BUILD_TESTING="$(usex test)"
 	)
-	# intentional use, it uses both variables for tests.
+	# intentional use, it requires both variables for tests.
+	# (BUILD_TESTING AND ABSL_BUILD_TESTING)
 	if use test; then
 		mycmakeargs+=(
 			-DBUILD_TESTING="yes"
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild
new file mode 100644
index 000000000000..481480e5aadd
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20250127.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake-multilib python-any-r1
+
+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
+	https://github.com/abseil/abseil-cpp/commit/f004e6c0a9a25e16fd2a1ae671a9cacfa79625b4.patch
+		-> ${PN}-20250127.0-PR1834.patch
+"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV:2:4}.$(ver_cut 2).0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="test test-helpers"
+
+RDEPEND="
+	test-helpers? (
+		dev-cpp/gtest:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
+	"${FILESDIR}/${PN}-20240722.0-lto-odr.patch"
+	"${FILESDIR}/${PN}-20240722.0-ciso646-cxx17.patch"
+	"${DISTDIR}/${PN}-20250127.0-PR1834.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	use ppc && eapply "${FILESDIR}/${PN}-atomic.patch"
+
+	# un-hardcode abseil compiler flags
+	# 942192
+	sed -i \
+		-e '/NOMINMAX/d' \
+		absl/copts/copts.py || die
+
+	# now generate cmake files
+	python_fix_shebang absl/copts/generate_copts.py
+	absl/copts/generate_copts.py || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DABSL_ENABLE_INSTALL="yes"
+		-DABSL_USE_EXTERNAL_GOOGLETEST="yes"
+		-DABSL_PROPAGATE_CXX_STD="yes"
+
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS="$(usex test-helpers)"
+
+		-DABSL_BUILD_TESTING="$(usex test)"
+	)
+	# intentional use, it requires both variables for tests.
+	# (BUILD_TESTING AND ABSL_BUILD_TESTING)
+	if use test; then
+		mycmakeargs+=(
+			-DBUILD_TESTING="yes"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	if ! use amd64; then
+		CMAKE_SKIP_TESTS=(
+			absl_symbolize_test
+		)
+
+		if use ppc; then
+			CMAKE_SKIP_TESTS+=(
+				absl_failure_signal_handler_test
+			)
+		fi
+	else
+		if ! multilib_is_native_abi; then
+			CMAKE_SKIP_TESTS+=(
+				absl_hash_instantiated_test
+			)
+		fi
+	fi
+
+	cmake_src_test
+}
diff --git a/dev-cpp/abseil-cpp/metadata.xml b/dev-cpp/abseil-cpp/metadata.xml
index 16dd7edb45a5..be95e3ba574c 100644
--- a/dev-cpp/abseil-cpp/metadata.xml
+++ b/dev-cpp/abseil-cpp/metadata.xml
@@ -13,4 +13,7 @@
 	<upstream>
 		<remote-id type="github">abseil/abseil-cpp</remote-id>
 	</upstream>
+	<use>
+		<flag name="test-helpers">Build libraries that you can use to write tests against Abseil code.</flag>
+	</use>
 </pkgmetadata>