re2: upgraded package to upstream
Upgraded dev-libs/re2 to version 0.2021.11.01 on amd64, arm, arm64
BUG=b:217607887
TEST=FEATURES=test emerge-drallion dev-libs/re2
Change-Id: I2eb02a1a87ea657bb01180f9207ab1f9fc02f0de
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3442913
Tested-by: Henry Yang <yanghenry@google.com>
Reviewed-by: Michael Pishchagin <mblsha@google.com>
Reviewed-by: Jim Pollock <jmpollock@chromium.org>
Commit-Queue: Henry Yang <yanghenry@google.com>
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 055a23f..a850b85 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1 +1,2 @@
-DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
+DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
+DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
diff --git a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
deleted file mode 100644
index 3e62934..0000000
--- a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@google.com>
-Date: Sun, 10 May 2020 07:12:35 -0700
-Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory.
-
-Fixes #256.
-
-Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8
-Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150
-Reviewed-by: Paul Wankadia <junyer@google.com>
----
- re2/testing/compile_test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
-index 4598aa64..2096e2f0 100644
---- a/re2/testing/compile_test.cc
-+++ b/re2/testing/compile_test.cc
-@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) {
- "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$",
- Regexp::LikePerl, NULL);
- EXPECT_TRUE(re != NULL);
-- Prog* prog = re->CompileToProg(920);
-+ Prog* prog = re->CompileToProg(850);
- // If the memory budget has been exhausted, compilation should fail
- // and return NULL instead of trying to do anything with NoMatch().
- EXPECT_TRUE(prog == NULL);
diff --git a/dev-libs/re2/metadata.xml b/dev-libs/re2/metadata.xml
index 97fe53e..d37b24f 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>chromium@gentoo.org</email>
<name>Chromium in Gentoo Project</name>
</maintainer>
- <maintainer type="person">
+ <maintainer type="person" proxied="yes">
<email>arfrever.fta@gmail.com</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
</maintainer>
diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2021.11.01.ebuild
similarity index 78%
rename from dev-libs/re2/re2-0.2020.05.01.ebuild
rename to dev-libs/re2/re2-0.2021.11.01.ebuild
index 504d933..f5a513a 100644
--- a/dev-libs/re2/re2-0.2020.05.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.11.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,14 +16,14 @@
LICENSE="BSD"
# NOTE: Always run libre2 through abi-compliance-checker!
# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="7"
+SONAME="9"
SLOT="0/${SONAME}"
KEYWORDS="*"
IUSE="icu"
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
S="${WORKDIR}/re2-${RE2_VER}"
@@ -31,9 +31,6 @@
HTML_DOCS=( doc/syntax.html )
src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
- )
default
grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
if use icu; then
@@ -43,13 +40,13 @@
}
src_configure() {
- tc-export AR CXX NM
+ tc-export AR CXX
}
multilib_src_compile() {
- emake SONAME="${SONAME}"
+ emake SONAME="${SONAME}" shared
}
multilib_src_install() {
- emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+ emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
}
