re2: upgraded package to upstream
Upgraded dev-libs/re2 to version 0.2020.05.01 on amd64, arm
BUG=chromium:1090300
TEST=cros_run_unit_tests for package,cq passed
Change-Id: Id720bc896600c418ef9a3016eaff44883d695b9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2224811
Reviewed-by: Stuart Langley <slangley@chromium.org>
Commit-Queue: Jim Pollock <jmpollock@google.com>
Auto-Submit: Jim Pollock <jmpollock@google.com>
Tested-by: Jim Pollock <jmpollock@google.com>
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index ef8cdfd..055a23f 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1 +1 @@
-DIST re2-2018-10-01.tar.gz 391254 SHA256 a31397714a353587413d307337d0b58f8a2e20e2b9d02f2e24e3463fa4eeda81 SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be WHIRLPOOL 705ebc0c6cb6b7f60b99d0729b1f4d71b6dec748d7a62fcd06133266765c60c9eef6f8aeef881f78ef4812e63e3a3bf263e29afb2d64c35eabc77c55c28f5fa2
+DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
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
new file mode 100644
index 0000000..3e62934
--- /dev/null
+++ b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
@@ -0,0 +1,27 @@
+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 05cb128..97fe53e 100644
--- a/dev-libs/re2/metadata.xml
+++ b/dev-libs/re2/metadata.xml
@@ -1,8 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://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">
+ <email>arfrever.fta@gmail.com</email>
+ <name>Arfrever Frehtes Taifersar Arahesis</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">google/re2</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
similarity index 85%
rename from dev-libs/re2/re2-0.2018.10.01.ebuild
rename to dev-libs/re2/re2-0.2020.05.01.ebuild
index d76c08a..504d933 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.05.01.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit multilib-minimal toolchain-funcs
@@ -16,7 +16,7 @@
LICENSE="BSD"
# NOTE: Always run libre2 through abi-compliance-checker!
# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="gentoo-2017-03-01"
+SONAME="7"
SLOT="0/${SONAME}"
KEYWORDS="*"
IUSE="icu"
@@ -31,8 +31,11 @@
HTML_DOCS=( doc/syntax.html )
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
+ )
default
- grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+ grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
if use icu; then
sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
fi
diff --git a/metadata/md5-cache/dev-libs/re2-0.2018.10.01 b/metadata/md5-cache/dev-libs/re2-0.2020.05.01
similarity index 84%
rename from metadata/md5-cache/dev-libs/re2-0.2018.10.01
rename to metadata/md5-cache/dev-libs/re2-0.2020.05.01
index 9a1cf7b..0c6017a 100644
--- a/metadata/md5-cache/dev-libs/re2-0.2018.10.01
+++ b/metadata/md5-cache/dev-libs/re2-0.2020.05.01
@@ -1,13 +1,14 @@
+BDEPEND=icu? ( virtual/pkgconfig )
DEFINED_PHASES=compile configure install prepare test
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
DESCRIPTION=An efficient, principled regular expression library
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/google/re2
IUSE=icu abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64
KEYWORDS=*
LICENSE=BSD
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] )
-SLOT=0/gentoo-2017-03-01
-SRC_URI=https://github.com/google/re2/archive/2018-10-01.tar.gz -> re2-2018-10-01.tar.gz
+SLOT=0/7
+SRC_URI=https://github.com/google/re2/archive/2020-05-01.tar.gz -> re2-2020-05-01.tar.gz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
-_md5_=5e6899f49ce5397b1a0eb534ed7fac40
+_md5_=c8e2df8617c9a96e1ba599fc597b0b81
