5 files changed, 96 insertions, 6 deletions
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index c6f53923040b..6ee33dd32645 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,7 @@
 DIST re2-2022-06-01.tar.gz 381032 BLAKE2B a4cf937e0341102a3151cd1741d51cae1bdd8ab589dcd4c9ee2f51ca43b325f7604fd5e6ae85db8ddd8fcca615ade6817a45664a037baf9cd14023ae4c4a46ac SHA512 f3d5f2a3aa5eda74bc8f434d7b000eed8e107c894307a889466a4cb16a15b352a0332e10d80ed603c9e2e38bbcbdf11f15b6953cbdf461cc9fb0560e89a8ceb8
 DIST re2-2022-12-01.tar.gz 382554 BLAKE2B f3b3f00e4a991db90695510a8820493c42605ce91278c3e7e5de9f0736b8d7b627921672905d4404a252425f619c8d27f81b05f4d69f33d4c23225ac0c44fe2e SHA512 783f856e6556ce60f0e9a15b2366cb4df21ca019cdc85ef7ad47a11d0345935300dede5da61892bdc77d2642da82ddc81b6670049eb87f357a64a9c684140ec9
-EBUILD re2-0.2022.06.01.ebuild 1359 BLAKE2B af48e1e56a5487555f37b856ef8a8ef162e1a5cd3dcaf548a51bd85cd1e3297a008a59273cd45456c02de3b0d168dd45b2001c2702be4d23ba95a42113cb5ae8 SHA512 6cbdaa2909149f7e0a503d6f67a32d23e6036df2f253bd82959a06f1031298ca5ff1659f43af81f4ca211b41a355c4f30625afa651241a0c99d095c8ba4b0f02
-EBUILD re2-0.2022.12.01.ebuild 1359 BLAKE2B f08c4dc55dfee1bf06fbbb6c0793c023603668333817dd7fd51cf96961c45b24c58b73211614d507bafe462f4665523d49120d91418270d1c3120d4c4f4d9b34 SHA512 7d97dff11c2c085fde4a39d8c5c53f717e1b2823843ba1a592c616f11e4a06cc82ad69ed2e161f19174d00573e118abc5a39a3d3eeeb74246d53ec6444b7b47a
-MISC metadata.xml 243 BLAKE2B b7207580928a1c8ce0280002fbaeaa31f0c181f0f321a6fc9f6bc8c58ea57dc569ddb4dc04486c6f9e8bc76a98ad4320c555257217f506f25815e105ec7a92ce SHA512 e1973942f324c0f93a547457b2fc3ea06531d077d0c92a10f29989576cb63a70a96ae5a70100e08d17e8c55a0812d905b46f06d6b145c095e301942f8622694c
+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 1797 BLAKE2B 307eee2bf3b461a74b2985b6efd24df4345cfc39190faaa230848771de5e42bc690399056d934443d6d69c4df796ef934d25412e8215fa78ffed76ebefb46227 SHA512 4844c06ad8b8d9b1b63683bd47e9bd8ca00faf7a1e513c45288b93533c1567d69a83b8fb1d47b3f997376217324794415587ad97d11be0ea8865f02c6ed6d911
+MISC metadata.xml 703 BLAKE2B e1b025447de661823b20426ea9ced01a41d1897ce037d3feaad1042f5717b319121ee54a77cbff831fe9c868131c4b1548850fa94d590d990e4c97c4bba8ff25 SHA512 83ed980012d4f0ee055f14d9c64a32a30f83ea685a8822dbc185e1f328a7a04bf54df95dac53c1d5d85dd14ee040a5dd43dac30e671285da75a38ba511f5c009
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index 3924d20eebc1..4d41c8bd3ab2 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>aliaksei.urbanski@gmail.com</email>
+		<name>Aliaksei Urbanski</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="benchmark">Build a benchmark binary, install it as re2-bench</flag>
+		<flag name="test-full">Run additional, quite slow tests</flag>
+	</use>
 	<upstream>
+		<bugs-to>https://github.com/google/re2/issues</bugs-to>
 		<remote-id type="github">google/re2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/re2/re2-0.2022.06.01.ebuild b/dev-libs/re2/re2-0.2022.06.01.ebuild
index f047960b9b5c..19eb4b80b388 100644
--- a/dev-libs/re2/re2-0.2022.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/re2/re2-0.2022.12.01.ebuild b/dev-libs/re2/re2-0.2022.12.01.ebuild
index 2041d1534b5e..1807303d24f5 100644
--- a/dev-libs/re2/re2-0.2022.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2022.12.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="10"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/re2/re2-0.2024.07.02-r1.ebuild b/dev-libs/re2/re2-0.2024.07.02-r1.ebuild
new file mode 100644
index 000000000000..b37f149ffec5
--- /dev/null
+++ b/dev-libs/re2/re2-0.2024.07.02-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2012-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+# Different date format used upstream.
+RE2_VER=${PV#0.}
+RE2_VER=${RE2_VER//./-}
+
+DESCRIPTION="An efficient, principled regular expression library"
+HOMEPAGE="https://github.com/google/re2"
+SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
+S="${WORKDIR}/re2-${RE2_VER}"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+# https://abi-laboratory.pro/tracker/timeline/re2/
+SONAME="11"
+SLOT="0/${SONAME}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="benchmark icu test test-full"
+REQUIRED_USE="
+	test-full? ( test )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	>=dev-cpp/abseil-cpp-20240116.2-r3:=
+	benchmark? ( dev-cpp/benchmark )
+	icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	test? (	dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( README doc/syntax.txt )
+HTML_DOCS=( doc/syntax.html )
+
+src_prepare() {
+	default
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
+	if use icu; then
+		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
+	fi
+	multilib_copy_sources
+}
+
+src_configure() {
+	tc-export AR CXX
+}
+
+multilib_src_compile() {
+	emake SONAME="${SONAME}" shared
+	if multilib_is_native_abi && use benchmark; then
+		emake benchmark
+	fi
+}
+
+multilib_src_test() {
+	if use test-full; then
+		emake shared-bigtest
+	else
+		emake shared-test
+	fi
+}
+
+multilib_src_install() {
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
+	if multilib_is_native_abi && use benchmark; then
+		newbin obj/test/regexp_benchmark re2-bench
+	fi
+}