[gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/files/, dev-libs/re2/

2020-05-23 Thread Mike Gilbert 
commit: a2f96c874b23ad03c613265cf326172a264c3b24
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat May 23 20:16:47 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat May 23 20:16:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f96c87

dev-libs/re2: fix tests on 32-bit platforms

Closes: https://bugs.gentoo.org/724404
Signed-off-by: Mike Gilbert  gentoo.org>

 .../files/0.2020.05.01-test-memory-budget.patch| 27 ++
 dev-libs/re2/re2-0.2020.05.01.ebuild   |  3 +++
 2 files changed, 30 insertions(+)

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 000..3e62934153c
--- /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 
+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 
+---
+ 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[^\\s]+)\\s+(?P[^\\s]+)\\s+(?P.+)$",
+   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/re2-0.2020.05.01.ebuild 
b/dev-libs/re2/re2-0.2020.05.01.ebuild
index c0c9da9e15f..45f70cb1090 100644
--- a/dev-libs/re2/re2-0.2020.05.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.05.01.ebuild
@@ -31,6 +31,9 @@ DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
 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

[gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/files/, dev-libs/re2/

2020-04-02 Thread Mike Gilbert 
commit: 6ae9aca5dc75727fa9bbd4982c91aea2486b3c34
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Thu Apr  2 19:12:41 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Apr  2 19:25:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae9aca5

dev-libs/re2: Delete old versions (<0.2019.12.01).

Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-libs/re2/Manifest   |  7 ---
 dev-libs/re2/files/0.2016.05.01-pkgconfig.patch | 57 -
 dev-libs/re2/re2-0.2016.05.01.ebuild| 47 
 dev-libs/re2/re2-0.2016.11.01-r1.ebuild | 52 --
 dev-libs/re2/re2-0.2017.03.01.ebuild| 52 --
 dev-libs/re2/re2-0.2018.04.01.ebuild| 52 --
 dev-libs/re2/re2-0.2018.10.01.ebuild| 52 --
 dev-libs/re2/re2-0.2019.08.01.ebuild| 52 --
 dev-libs/re2/re2-0.2019.09.01.ebuild| 52 --
 9 files changed, 423 deletions(-)

diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 1dd1c72cb3f..0c8c760f99c 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,8 +1 @@
-DIST re2-2016-05-01.tar.gz 399509 BLAKE2B 
ec7676da99493bb2be56bd661f8f3bd57b123bbdc1f6cc5ccd294a17d819b75f9f505b247e86368735a454417f5df8aa4027c20f0fce129625c14caa166a97ad
 SHA512 
6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14
-DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 
251c45684fa4f3f85e0138c6f788f7a35fbc2ad8766f6a9bc0daf7305ac2140a1102602cf8843242f7a311ec09bf4fe516b605e39e8c857aa2f475783085c231
 SHA512 
1be7d2551737cb9dc1031dac9335f82dfb58f3612bdb745bf6c5121334bf8689bb0564b751c23e4c002478cc46cc237ce4da294090adb983b0c1db25a9fac0a7
-DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 
0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703
 SHA512 
566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
-DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 
629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983
 SHA512 
862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
-DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 
297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e
 SHA512 
91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
-DIST re2-2019-08-01.tar.gz 390891 BLAKE2B 
c663efc729e8cec6f40a29c1c0ca2eeb59e3323ae1adb60b55d017d15d048ac1e329990bf33fac56037b2b03cbe710ec95073a4adc93300a8ae282d4f7e970d8
 SHA512 
e2b8f121f29b9afa5ae3c8f29811a010289279a9edb3761e27b44d903a85b80720a3a59388a4ad75fb687ee1343d25b5a59cdee42282eed30f5fc48b59c70c97
-DIST re2-2019-09-01.tar.gz 391069 BLAKE2B 
79c6985996286bb615079352d4ceb9a10a8fc5a13b496afed8ec6f9cb1b016106bec1ef379789be6bcbee13cc252ae88c301735c4152efe234ed30d88336dccc
 SHA512 
df446a7a00f3e8cd3f09c746ad41a6f58af3da88ab31cf8e2498d26e240bbe1f557f462fb6b10a818c3e00e02ec19dc60ce29eb6c4d61781aeb9b96b4c4e5af9
 DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 
2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba
 SHA512 
cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77

diff --git a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch 
b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
deleted file mode 100644
index 46ec7ca619e..000
--- a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ac62674fa16b5a086f02dd208667ba65e22ec09d Mon Sep 17 00:00:00 2001
-From: Paul Wankadia 
-Date: Mon, 9 May 2016 14:42:37 +1000
-Subject: [PATCH] Plumb more variables from Makefile to re2.pc.
-
-Change-Id: I35509c273b0bd90242db127121c71be1f628c06f
-Reviewed-on: https://code-review.googlesource.com/4710
-Reviewed-by: Paul Wankadia 

- Makefile | 8 +---
- re2.pc   | 6 +++---
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d0e2090..411e551 100644
 a/Makefile
-+++ b/Makefile
-@@ -28,11 +28,9 @@ NMFLAGS?=-p
- # http://www.gnu.org/prep/standards/standards.html
- prefix=/usr/local
- exec_prefix=$(prefix)
--bindir=$(exec_prefix)/bin
- includedir=$(prefix)/include
- libdir=$(exec_prefix)/lib
- INSTALL=install
--INSTALL_PROGRAM=$(INSTALL)
- INSTALL_DATA=$(INSTALL) -m 644
- 
- # ABI version
-@@ -273,7 +271,11 @@ install: obj/libre2.a