gentoo auto-resync : 14:07:2024 - 12:27:13

5 files changed, 122 insertions, 2 deletions

diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest
index 87e4a01b9ad0..d269d37a6827 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -3,6 +3,7 @@ AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0ed
 AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53
 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867
 AUX abseil-cpp-20230125.2-musl-1.2.4.patch 2203 BLAKE2B 74ebf85e5f35de255fbf5a757655fedd8f5821558ecf700fcc06e30950ce4bb802ca2431cf8b15d05ddc3a7bf2818eec49bf38c2e33d033df0c2973983340ed4 SHA512 404a3c25135573292cbe90f3fb459172a936abc2ec4739e57b8a1dac300a3e0b848ba18aaab5f6dfd12315de736175b962174022a7969149221bf595738bebb1
+AUX abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch 2148 BLAKE2B 978304f3ff8f46ac8fcd7c708f464cacf657f5f4f76a5bab5c4db6e14dcde0bbc7b2ae03c8b74a527218eab737cbacb9219b1a87ee2af8dde8795d3c1b43c7af SHA512 c94ba837440e2c49f3703492f0eb51c7f1930d8d700660d6db56985ad05fe61d3c97656ba8e0a818b843f04c939bdeb4134005420ad561068c52f64ee481f091
 AUX abseil-cpp-20230802.0-sdata-tests.patch 1541 BLAKE2B ae6cebeefc794e89101bd4d0a3a1c022e651dfdb312401fbbf035f6c2afbde8162c132f692e89a075cb1811ae9e0708652c469107047cba49618c0ef752eb108 SHA512 bda7cec902c1f71173b4e7bf2e35c3fffc5de216dc84680e9a0de56b1bb5b9ea4f50cb603e690275e1fc9e2fcbc8ad998a8dadb655fb96d28a651ac80bc2f764
 AUX abseil-cpp-random-tests.patch 660 BLAKE2B 60ef86170310b6ababed9f07fc2e40ca12b278f2202de3d1ae3f028eb081b3de0ba6e245211457e0c2d764142916c2a3c7a46c813ba2bc5536c50edebaf4c3f6 SHA512 d2356539fb38a16cc52cd11106d87613c46a4757827bdea22f4a42f5ea7d557387477ce17a20fa54051488f66b1e628be9e539948cdb1e87970174d3894b1d80
 DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf
@@ -18,6 +19,7 @@ EBUILD abseil-cpp-20211102.0-r2.ebuild 1812 BLAKE2B 3e8b5486a5b9817c089cae614e17
 EBUILD abseil-cpp-20220623.1.ebuild 1732 BLAKE2B 8134bcb040be826b4f153afddc4c3aae86fd9d773afbf08b50bba323c0d067fd034c92fde3f9c15f73366e910f3641512e81cefa04bc5a9f2830d06e4b8ac3f5 SHA512 ac7802104eb66d08fdcc5904d1d9644ea1511c1f1d8bda2ba8931af6aa56ce5917d59bbb9e68354b8c4d1c38cba1507cb27420e681e3679c88d3bc9538b0e19e
 EBUILD abseil-cpp-20230125.2.ebuild 1693 BLAKE2B ad84c9a1b9b5983029aa5978f1fefc14700c1ffdfd4edf4a4cf2ff782d25cc339b2354a293c51d8853a6a2e0107ed3f7ea8e32685663ad760fc0245c7a4ac79c SHA512 6fe0f3a491f71fcd954201653fcf329385c738a7e43cb18adf802dc2f10c27ceb7c87e8e5303d20cce07dc1f905a5e094d6979a615b14b4cdb0cce5880b1a467
 EBUILD abseil-cpp-20230125.3-r3.ebuild 1640 BLAKE2B 534ee2c085dfb77471eb34a47491abff5a64aafc6052b3875645ed3e490acd0719855f79bc098bd9107ecc5bce406789804825a88f046d3cb47db83be1a7120d SHA512 55d1a88de4c1474c9b5e03e144a874bf15fb5f9b198a188f267d1290d9f92b7ba47106751d0ba6993b87436c49aa2a744d82edd32ee1235e21f6140c57289245
-EBUILD abseil-cpp-20230802.0-r2.ebuild 1647 BLAKE2B 02b204dc37f8efbe4baf8b43268e191325d37610eb5ece67d6ffcd4d0f249043baa9928024abf17424d0c8c7fd0adc8811e0a493bb26e0a37bafec4a8076cc25 SHA512 1b98fb0c0dde809a22eb459188acc18e99464082592a37a357b132ed9817fd7c8470ae390814174b713630a99c736ca84564fbe0e8650c15d4622c39bf461d8b
-EBUILD abseil-cpp-20240116.2-r2.ebuild 1647 BLAKE2B 02b204dc37f8efbe4baf8b43268e191325d37610eb5ece67d6ffcd4d0f249043baa9928024abf17424d0c8c7fd0adc8811e0a493bb26e0a37bafec4a8076cc25 SHA512 1b98fb0c0dde809a22eb459188acc18e99464082592a37a357b132ed9817fd7c8470ae390814174b713630a99c736ca84564fbe0e8650c15d4622c39bf461d8b
+EBUILD abseil-cpp-20230125.3-r4.ebuild 1713 BLAKE2B 1ab709d5aa35d36cc6cb1f64ec1e6ab370971df0a7468303c6b71185f6ef2f69580ce797909d5927fa77a1daa88028130d6a1de40fc5b512aca8c2bd26c07abb SHA512 fc99dc540a83bd6e95e6847d1dae1d8a883d130bd15090c1894cc3ce065d6fac9d2b4fa68fdf84f607b7407ab983186e73d91ee9909d44d4e37615c25789a9be
+EBUILD abseil-cpp-20230802.0-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
+EBUILD abseil-cpp-20240116.2-r3.ebuild 1718 BLAKE2B 1a46df3f2b8631c4cc5da5697494999329b85a0469e64f00ff2103425218086c7317594c2d4ae7e49e91fc1e636b782490825c94a01155d0bc4f72bff6e2a72b SHA512 bdbb13ac0faa4ccf7f7a41579311a65853916e7d533a107a84506dcc5463621ba5cc1ebcd1a41e01da5621c98ac4aaae0803175b0a74a02fc8af547afd8d9cbe
 MISC metadata.xml 250 BLAKE2B f2e7e5ef7661a51822a5d563f7a835c3606c9bbb9688d599637e0950aa68dbacd67592a8c5306528653dd2b5f7100dc6f5e6ac69c5d7bf9777b12c984b53304c SHA512 99565f4efff02cf80efcaa76ad9247db3c0de6f855f37337579cfcd6e01f72a6e176d5e69ef1a1d338afee6a07c1620273fe56af046a60f195de4d8894a8d7f9
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
new file mode 100644
index 000000000000..87f1b86c7690
--- /dev/null
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV%%.*}.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	test? (
+		sys-libs/timezone-data
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218
+	"${FILESDIR}"/${PN}-random-tests.patch #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
+)
+
+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
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# 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
+		# TEST_HELPERS needed for protobuf (bug #915902)
+		-DABSL_BUILD_TEST_HELPERS=ON
+		-DABSL_BUILD_TESTING=$(usex test ON OFF)
+		$(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests.
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
index 9a9c217bda00..dc13dfe5045f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
 	"${FILESDIR}/${PN}-random-tests.patch" #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
 )
 
 src_prepare() {
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
index 9a9c217bda00..dc13dfe5045f 100644
--- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r2.ebuild
+++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${PN}-20230802.0-sdata-tests.patch"
 	"${FILESDIR}/${PN}-random-tests.patch" #935417
+	"${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337
 )
 
 src_prepare() {
diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
new file mode 100644
index 000000000000..1fa00d9ff622
--- /dev/null
+++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch
@@ -0,0 +1,49 @@
+Bug: https://bugs.gentoo.org/934337

+From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch

+From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001

+From: Derek Mauro <dmauro@google.com>

+Date: Fri, 3 May 2024 09:14:22 -0700

+Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations

+ of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are

+ available.

+

+GCC 14 and Clang 19 adds these new builtins. The g-suffix is for

+"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for

+"short". GCC never implemented the short versions and #1664 reports

+GCC 14 (pre-release) gives an error here, although this may be a

+pre-release bug.

+

+Fixes #1664

+

+PiperOrigin-RevId: 630408249

+Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc

+---

+ absl/numeric/internal/bits.h | 8 ++++++--

+ 1 file changed, 6 insertions(+), 2 deletions(-)

+

+diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h

+index bfef06bce1f..0917464d6ad 100644

+--- a/absl/numeric/internal/bits.h

++++ b/absl/numeric/internal/bits.h

+@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) {

+ 

+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int

+ CountLeadingZeroes16(uint16_t x) {

+-#if ABSL_HAVE_BUILTIN(__builtin_clzs)

++#if ABSL_HAVE_BUILTIN(__builtin_clzg)

++  return x == 0 ? 16 : __builtin_clzg(x);

++#elif ABSL_HAVE_BUILTIN(__builtin_clzs)

+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)

+                 "__builtin_clzs does not take 16-bit arg");

+   return x == 0 ? 16 : __builtin_clzs(x);

+@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) {

+ 

+ ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int

+ CountTrailingZeroesNonzero16(uint16_t x) {

+-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)

++#if ABSL_HAVE_BUILTIN(__builtin_ctzg)

++  return __builtin_ctzg(x);

++#elif ABSL_HAVE_BUILTIN(__builtin_ctzs)

+   static_assert(sizeof(unsigned short) == sizeof(x),  // NOLINT(runtime/int)

+                 "__builtin_ctzs does not take 16-bit arg");

+   return __builtin_ctzs(x);