Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/, dev-libs/re2/files/
Date: Sat, 05 Sep 2020 02:04:36
Message-Id: 1599271362.7b25d9653f562a75ea7da7f7002bbea507193aa5.floppym@gentoo
1 commit: 7b25d9653f562a75ea7da7f7002bbea507193aa5
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Fri Sep 4 08:00:00 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 5 02:02:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b25d965
7
8 dev-libs/re2: Delete old versions (<0.2020.06.01).
9
10 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 dev-libs/re2/Manifest | 3 --
14 .../files/0.2020.05.01-test-memory-budget.patch | 27 -----------
15 dev-libs/re2/re2-0.2019.12.01.ebuild | 52 --------------------
16 dev-libs/re2/re2-0.2020.04.01.ebuild | 52 --------------------
17 dev-libs/re2/re2-0.2020.05.01.ebuild | 55 ----------------------
18 5 files changed, 189 deletions(-)
19
20 diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
21 index 60f6f3e8389..c4f509f017c 100644
22 --- a/dev-libs/re2/Manifest
23 +++ b/dev-libs/re2/Manifest
24 @@ -1,6 +1,3 @@
25 -DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
26 -DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
27 -DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
28 DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
29 DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103
30 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
31
32 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
33 deleted file mode 100644
34 index 3e62934153c..00000000000
35 --- a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
36 +++ /dev/null
37 @@ -1,27 +0,0 @@
38 -From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001
39 -From: Paul Wankadia <junyer@××××××.com>
40 -Date: Sun, 10 May 2020 07:12:35 -0700
41 -Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory.
42 -
43 -Fixes #256.
44 -
45 -Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8
46 -Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150
47 -Reviewed-by: Paul Wankadia <junyer@××××××.com>
48 ----
49 - re2/testing/compile_test.cc | 2 +-
50 - 1 file changed, 1 insertion(+), 1 deletion(-)
51 -
52 -diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
53 -index 4598aa64..2096e2f0 100644
54 ---- a/re2/testing/compile_test.cc
55 -+++ b/re2/testing/compile_test.cc
56 -@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) {
57 - "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$",
58 - Regexp::LikePerl, NULL);
59 - EXPECT_TRUE(re != NULL);
60 -- Prog* prog = re->CompileToProg(920);
61 -+ Prog* prog = re->CompileToProg(850);
62 - // If the memory budget has been exhausted, compilation should fail
63 - // and return NULL instead of trying to do anything with NoMatch().
64 - EXPECT_TRUE(prog == NULL);
65
66 diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
67 deleted file mode 100644
68 index 0bc9c4a592b..00000000000
69 --- a/dev-libs/re2/re2-0.2019.12.01.ebuild
70 +++ /dev/null
71 @@ -1,52 +0,0 @@
72 -# Copyright 1999-2020 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=7
76 -
77 -inherit multilib-minimal toolchain-funcs
78 -
79 -# Different date format used upstream.
80 -RE2_VER=${PV#0.}
81 -RE2_VER=${RE2_VER//./-}
82 -
83 -DESCRIPTION="An efficient, principled regular expression library"
84 -HOMEPAGE="https://github.com/google/re2"
85 -SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
86 -
87 -LICENSE="BSD"
88 -# NOTE: Always run libre2 through abi-compliance-checker!
89 -# https://abi-laboratory.pro/tracker/timeline/re2/
90 -SONAME="gentoo-2019-01-01"
91 -SLOT="0/${SONAME}"
92 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
93 -IUSE="icu"
94 -
95 -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
96 -DEPEND="${RDEPEND}"
97 -BDEPEND="icu? ( virtual/pkgconfig )"
98 -
99 -S="${WORKDIR}/re2-${RE2_VER}"
100 -
101 -DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
102 -HTML_DOCS=( doc/syntax.html )
103 -
104 -src_prepare() {
105 - default
106 - grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
107 - if use icu; then
108 - sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
109 - fi
110 - multilib_copy_sources
111 -}
112 -
113 -src_configure() {
114 - tc-export AR CXX NM
115 -}
116 -
117 -multilib_src_compile() {
118 - emake SONAME="${SONAME}"
119 -}
120 -
121 -multilib_src_install() {
122 - emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
123 -}
124
125 diff --git a/dev-libs/re2/re2-0.2020.04.01.ebuild b/dev-libs/re2/re2-0.2020.04.01.ebuild
126 deleted file mode 100644
127 index ef410cbb6a4..00000000000
128 --- a/dev-libs/re2/re2-0.2020.04.01.ebuild
129 +++ /dev/null
130 @@ -1,52 +0,0 @@
131 -# Copyright 1999-2020 Gentoo Authors
132 -# Distributed under the terms of the GNU General Public License v2
133 -
134 -EAPI=7
135 -
136 -inherit multilib-minimal toolchain-funcs
137 -
138 -# Different date format used upstream.
139 -RE2_VER=${PV#0.}
140 -RE2_VER=${RE2_VER//./-}
141 -
142 -DESCRIPTION="An efficient, principled regular expression library"
143 -HOMEPAGE="https://github.com/google/re2"
144 -SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
145 -
146 -LICENSE="BSD"
147 -# NOTE: Always run libre2 through abi-compliance-checker!
148 -# https://abi-laboratory.pro/tracker/timeline/re2/
149 -SONAME="6"
150 -SLOT="0/${SONAME}"
151 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
152 -IUSE="icu"
153 -
154 -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
155 -DEPEND="${RDEPEND}"
156 -BDEPEND="icu? ( virtual/pkgconfig )"
157 -
158 -S="${WORKDIR}/re2-${RE2_VER}"
159 -
160 -DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
161 -HTML_DOCS=( doc/syntax.html )
162 -
163 -src_prepare() {
164 - default
165 - grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
166 - if use icu; then
167 - sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
168 - fi
169 - multilib_copy_sources
170 -}
171 -
172 -src_configure() {
173 - tc-export AR CXX NM
174 -}
175 -
176 -multilib_src_compile() {
177 - emake SONAME="${SONAME}"
178 -}
179 -
180 -multilib_src_install() {
181 - emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
182 -}
183
184 diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
185 deleted file mode 100644
186 index aca5fc3509c..00000000000
187 --- a/dev-libs/re2/re2-0.2020.05.01.ebuild
188 +++ /dev/null
189 @@ -1,55 +0,0 @@
190 -# Copyright 1999-2020 Gentoo Authors
191 -# Distributed under the terms of the GNU General Public License v2
192 -
193 -EAPI=7
194 -
195 -inherit multilib-minimal toolchain-funcs
196 -
197 -# Different date format used upstream.
198 -RE2_VER=${PV#0.}
199 -RE2_VER=${RE2_VER//./-}
200 -
201 -DESCRIPTION="An efficient, principled regular expression library"
202 -HOMEPAGE="https://github.com/google/re2"
203 -SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
204 -
205 -LICENSE="BSD"
206 -# NOTE: Always run libre2 through abi-compliance-checker!
207 -# https://abi-laboratory.pro/tracker/timeline/re2/
208 -SONAME="7"
209 -SLOT="0/${SONAME}"
210 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
211 -IUSE="icu"
212 -
213 -RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
214 -DEPEND="${RDEPEND}"
215 -BDEPEND="icu? ( virtual/pkgconfig )"
216 -
217 -S="${WORKDIR}/re2-${RE2_VER}"
218 -
219 -DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
220 -HTML_DOCS=( doc/syntax.html )
221 -
222 -src_prepare() {
223 - local PATCHES=(
224 - "${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
225 - )
226 - default
227 - grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
228 - if use icu; then
229 - sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
230 - fi
231 - multilib_copy_sources
232 -}
233 -
234 -src_configure() {
235 - tc-export AR CXX NM
236 -}
237 -
238 -multilib_src_compile() {
239 - emake SONAME="${SONAME}"
240 -}
241 -
242 -multilib_src_install() {
243 - emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
244 -}