gentoo auto-resync : 19:02:2025 - 00:15:15

3 files changed, 115 insertions, 0 deletions

diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 6496358dcca0..c05ee88c8aab 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,7 +1,9 @@
+AUX re2-2024.07.02_optional-benchmark.patch 2244 BLAKE2B a3e0856e0d11ed31b4abac8cbb918a2be3d5d2d9046fe86c0df46c35a80e94121cd944bb2902e5ac78e03b32ee5e03ac91439d99bc1d624b977cead4592340b2 SHA512 47bf835b23e1a187bece585d0dd996b63eb3c20f67cdc27eaa86459e3abd3eca216c26fe62a962ba7054792c3a259eea080c7ed81f2cab8eab1e44ea6c908d60
 DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 DIST re2-2022-12-01.tar.gz 382554 BLAKE2B f3b3f00e4a991db90695510a8820493c42605ce91278c3e7e5de9f0736b8d7b627921672905d4404a252425f619c8d27f81b05f4d69f33d4c23225ac0c44fe2e SHA512 783f856e6556ce60f0e9a15b2366cb4df21ca019cdc85ef7ad47a11d0345935300dede5da61892bdc77d2642da82ddc81b6670049eb87f357a64a9c684140ec9
 DIST re2-2024-07-02.tar.gz 390672 BLAKE2B 86b915dc0b8e68b35fd0ed20bedd5e9c5781826442f332d115166a9a70f34b7e9b4ef60206264035b82652230d42a3c6aa2b91a774fca3b1e415ce65ace2ae96 SHA512 3776383355ccfdec85e0cdfb3ce980c6ecb3c336d603dd34c0a547c7c06a6243947a13cb352372335edac12d4f28cf1b7a51d034f5b34db3e46cbcac5e3f7479
 EBUILD re2-0.2022.06.01.ebuild 1353 BLAKE2B 77b4bc83b35006208480b1e46b1ec935bbdceceeaa967bd671a4c2c24e79598b75968f18d1dee39bd131f0f3698bd67acbb19429e7dd6e49e0110d2f4367e2c3 SHA512 9446c0b67873ea7d0433279c2e5e11c9c9d590f5cbf87b4c3fda7577bc62ddd89e4c08828be1bb9b7d11b5baed19afb8c16eae5093e6e59acad52c3369868568
 EBUILD re2-0.2022.12.01.ebuild 1353 BLAKE2B 3c28a0b44229708276cc0b2364e77b8ecfd4fee6b32159599e934e47377f7a6d0f0ed378cdc2dde997970074682108dfbe31481b15e43407ae478a2088465aee SHA512 89878bf4505faa20da73138c205962fe9cb6c5cac12d5530b8514c987177b8c1a87ddfafad1eb91351ae32fc986da06d3e9b6abff5e2039b173e1076cbeade23
 EBUILD re2-0.2024.07.02-r1.ebuild 1803 BLAKE2B ca14b9135696eeaebbaa1b99f9f0e6f4e445787560d71f07e45b76019b11ea9e9684f2a0af5f82fc5b2bd481b8df06f04f16b29478146ad369bf752352e869c5 SHA512 64463c27da635c1504f7b469e22ada63475f6b2d6597b223134904cb348d8ffe72d76f193fdad432460eaee132216a2e09bdbae54f981395ed7ed59c2b023606
+EBUILD re2-2024.07.02.ebuild 1106 BLAKE2B f862732d48383bb26878b02805c478c155a7ddd45c188b12e02ca32d06c40d05d32609cc3ded898612dffb482ccfd08996d1ed05b3c45060225fb7b502a8941b SHA512 032b71ab08683e9ab2d38f199d5278bb7addb233376adcca1ba1b748a820a0e346e7c8d8a3e82a9212c31367c8c4e0e4f7a5c26bfcf7aba59113946dba569aa4
 MISC metadata.xml 703 BLAKE2B e1b025447de661823b20426ea9ced01a41d1897ce037d3feaad1042f5717b319121ee54a77cbff831fe9c868131c4b1548850fa94d590d990e4c97c4bba8ff25 SHA512 83ed980012d4f0ee055f14d9c64a32a30f83ea685a8822dbc185e1f328a7a04bf54df95dac53c1d5d85dd14ee040a5dd43dac30e671285da75a38ba511f5c009
diff --git a/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch b/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch
new file mode 100644
index 000000000000..65edc800705e
--- /dev/null
+++ b/dev-libs/re2/files/re2-2024.07.02_optional-benchmark.patch
@@ -0,0 +1,63 @@
+https://code-review.googlesource.com/c/re2/+/63530
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 14 Jan 2025 12:08:26 +0300
+Subject: [PATCH] Make benchmark building optional in cmake
+
+Some Linux distributions only requires testing but not benchmarking.
+Make benchmark optional to exclude excessive dependency on building tests.
+
+Change-Id: I1ce8bd1b4f6132efb295f71d43a77ba36ea58dc5
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,9 @@ option(RE2_BUILD_FRAMEWORK "build RE2 as a framework" OFF)
+ # so we provide an option similar to BUILD_TESTING, but just for RE2.
+ option(RE2_BUILD_TESTING "enable testing for RE2" OFF)
+ 
++# Enable benchmark building.
++option(RE2_BUILD_BENCHMARK "enable benchmark building for RE2" OFF)
++
+ # The pkg-config Requires: field.
+ set(REQUIRES)
+ 
+@@ -167,8 +170,10 @@ if(RE2_BUILD_TESTING)
+   if(NOT TARGET GTest::gtest)
+     find_package(GTest REQUIRED)
+   endif()
+-  if(NOT TARGET benchmark::benchmark)
+-    find_package(benchmark REQUIRED)
++  if(RE2_BUILD_BENCHMARK)
++    if(NOT TARGET benchmark::benchmark)
++      find_package(benchmark REQUIRED)
++    endif()
+   endif()
+ 
+   set(TESTING_SOURCES
+@@ -227,14 +232,16 @@ if(RE2_BUILD_TESTING)
+     add_test(NAME ${target} COMMAND ${target})
+   endforeach()
+ 
+-  foreach(target ${BENCHMARK_TARGETS})
+-    add_executable(${target} re2/testing/${target}.cc)
+-    if(BUILD_SHARED_LIBS AND WIN32)
+-      target_compile_definitions(${target} PRIVATE -DRE2_CONSUME_TESTING_DLL)
+-    endif()
+-    target_compile_features(${target} PUBLIC cxx_std_14)
+-    target_link_libraries(${target} PUBLIC testing benchmark::benchmark_main ${EXTRA_TARGET_LINK_LIBRARIES})
+-  endforeach()
++  if(RE2_BUILD_BENCHMARK)
++    foreach(target ${BENCHMARK_TARGETS})
++      add_executable(${target} re2/testing/${target}.cc)
++      if(BUILD_SHARED_LIBS AND WIN32)
++        target_compile_definitions(${target} PRIVATE -DRE2_CONSUME_TESTING_DLL)
++      endif()
++      target_compile_features(${target} PUBLIC cxx_std_14)
++      target_link_libraries(${target} PUBLIC testing benchmark::benchmark_main ${EXTRA_TARGET_LINK_LIBRARIES})
++    endforeach()
++  endif()
+ endif()
+ 
+ install(TARGETS re2
+-- 
+2.45.2
+
diff --git a/dev-libs/re2/re2-2024.07.02.ebuild b/dev-libs/re2/re2-2024.07.02.ebuild
new file mode 100644
index 000000000000..766cb2a878e2
--- /dev/null
+++ b/dev-libs/re2/re2-2024.07.02.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2012-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MY_PV=${PV//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+# NOTE: Follow SONAME variable in CMakeLists.txt
+SONAME="11"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="icu test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest[${MULTILIB_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20240116.2-r3:=
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+PATCHES=(
+	"${FILESDIR}/re2-2024.07.02_optional-benchmark.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DRE2_BUILD_BENCHMARK=OFF
+		-DRE2_BUILD_TESTING=$(usex test)
+		-DRE2_USE_ICU=$(usex icu)
+	)
+	cmake_src_configure
+}