1 |
commit: f1d80fe234a8ed83671f740e210d0e9d3955ddaf |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 2 18:42:31 2019 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 2 18:42:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d80fe2 |
7 |
|
8 |
dev-libs/grok: remove last rited package |
9 |
|
10 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
11 |
|
12 |
dev-libs/grok/Manifest | 1 - |
13 |
dev-libs/grok/files/0.9.2-Makefile.patch | 65 ---------------------- |
14 |
.../grok/files/0.9.2-build-with-pcre-lt-8.34.patch | 15 ----- |
15 |
dev-libs/grok/files/grok-0.9.2-Makefile.patch | 63 --------------------- |
16 |
.../files/grok-0.9.2-build-with-gperf-3.1.patch | 26 --------- |
17 |
dev-libs/grok/files/grok-0.9.2-libdir.patch | 28 ---------- |
18 |
dev-libs/grok/files/grok-0.9.2-libtirpc.patch | 21 ------- |
19 |
dev-libs/grok/grok-0.9.2-r2.ebuild | 45 --------------- |
20 |
dev-libs/grok/metadata.xml | 8 --- |
21 |
9 files changed, 272 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest |
24 |
deleted file mode 100644 |
25 |
index 4fca8e7b228..00000000000 |
26 |
--- a/dev-libs/grok/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1 +0,0 @@ |
29 |
-DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e |
30 |
|
31 |
diff --git a/dev-libs/grok/files/0.9.2-Makefile.patch b/dev-libs/grok/files/0.9.2-Makefile.patch |
32 |
deleted file mode 100644 |
33 |
index f10531646ad..00000000000 |
34 |
--- a/dev-libs/grok/files/0.9.2-Makefile.patch |
35 |
+++ /dev/null |
36 |
@@ -1,65 +0,0 @@ |
37 |
-diff --git a/grok-0.9.2/Makefile b/grok-0.9.2/Makefile |
38 |
-index adfe869..fdced25 100644 |
39 |
---- a/grok-0.9.2/Makefile |
40 |
-+++ b/grok-0.9.2/Makefile |
41 |
-@@ -25,10 +25,12 @@ else |
42 |
- GPERF?=/usr/bin/gperf |
43 |
- endif |
44 |
- |
45 |
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet |
46 |
-+ |
47 |
- # For linux, we need libdl for dlopen() |
48 |
- # On FreeBSD, comment this line out. |
49 |
- ifeq ($(PLATFORM), GNULinux) |
50 |
--LDFLAGS+=-ldl |
51 |
-+LIBS+=-ldl |
52 |
- endif |
53 |
- |
54 |
- # ############################################# |
55 |
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh) |
56 |
- #CFLAGS+=-g |
57 |
- #LDFLAGS+=-g |
58 |
- |
59 |
--CFLAGS+=-pipe -fPIC -I. -O2 |
60 |
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet |
61 |
-+CFLAGS+=-fPIC -I. |
62 |
- |
63 |
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix) |
64 |
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR)) |
65 |
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag) |
66 |
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB)) |
67 |
- |
68 |
- # Sane includes |
69 |
--CFLAGS+=-I/usr/local/include |
70 |
--LDFLAGS+=-L/usr/local/lib |
71 |
-+#CFLAGS+=-I/usr/local/include |
72 |
-+#LDFLAGS+=-L/usr/local/lib |
73 |
- |
74 |
- # Platform so we know what to dlopen |
75 |
- CFLAGS+=-DPLATFORM_$(PLATFORM) |
76 |
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) |
77 |
- install -m 755 grok $(DESTDIR)$(PREFIX)/bin |
78 |
- install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin |
79 |
- install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib |
80 |
-+ ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1 |
81 |
- for header in $(GROKHEADER); do \ |
82 |
- install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ |
83 |
- done |
84 |
-@@ -162,14 +164,14 @@ cleanver: |
85 |
- # Binary creation |
86 |
- grok: LDFLAGS+=-levent |
87 |
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o |
88 |
-- $(CC) $(LDFLAGS) $^ -o $@ |
89 |
-+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
90 |
- |
91 |
- discogrok: $(GROKOBJ) discover_main.o |
92 |
-- $(CC) $(LDFLAGS) $^ -o $@ |
93 |
-+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
94 |
- |
95 |
- libgrok.$(LIBSUFFIX): |
96 |
- libgrok.$(LIBSUFFIX): $(GROKOBJ) |
97 |
-- $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ |
98 |
-+ $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@ |
99 |
- |
100 |
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX); |
101 |
- ln -s $< $@ |
102 |
|
103 |
diff --git a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch b/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch |
104 |
deleted file mode 100644 |
105 |
index 1593ac30981..00000000000 |
106 |
--- a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch |
107 |
+++ /dev/null |
108 |
@@ -1,15 +0,0 @@ |
109 |
-https://github.com/jordansissel/grok/commit/44ce9372a29319c01d4ac7f24287fb36315e0e34 |
110 |
- |
111 |
---- a/grokre.c |
112 |
-+++ b/grokre.c |
113 |
-@@ -12,8 +12,8 @@ |
114 |
- |
115 |
- /* global, static variables */ |
116 |
- |
117 |
--#define CAPTURE_ID_LEN 4 |
118 |
--#define CAPTURE_FORMAT "%04x" |
119 |
-+#define CAPTURE_ID_LEN 5 |
120 |
-+#define CAPTURE_FORMAT "_%04x" |
121 |
- |
122 |
- /* internal functions */ |
123 |
- static char *grok_pattern_expand(grok_t *grok); //, int offset, int length); |
124 |
|
125 |
diff --git a/dev-libs/grok/files/grok-0.9.2-Makefile.patch b/dev-libs/grok/files/grok-0.9.2-Makefile.patch |
126 |
deleted file mode 100644 |
127 |
index 8d9351c8c0f..00000000000 |
128 |
--- a/dev-libs/grok/files/grok-0.9.2-Makefile.patch |
129 |
+++ /dev/null |
130 |
@@ -1,63 +0,0 @@ |
131 |
---- a/Makefile |
132 |
-+++ b/Makefile |
133 |
-@@ -25,10 +25,12 @@ else |
134 |
- GPERF?=/usr/bin/gperf |
135 |
- endif |
136 |
- |
137 |
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet |
138 |
-+ |
139 |
- # For linux, we need libdl for dlopen() |
140 |
- # On FreeBSD, comment this line out. |
141 |
- ifeq ($(PLATFORM), GNULinux) |
142 |
--LDFLAGS+=-ldl |
143 |
-+LIBS+=-ldl |
144 |
- endif |
145 |
- |
146 |
- # ############################################# |
147 |
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh) |
148 |
- #CFLAGS+=-g |
149 |
- #LDFLAGS+=-g |
150 |
- |
151 |
--CFLAGS+=-pipe -fPIC -I. -O2 |
152 |
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet |
153 |
-+CFLAGS+=-fPIC -I. |
154 |
- |
155 |
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix) |
156 |
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR)) |
157 |
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag) |
158 |
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB)) |
159 |
- |
160 |
- # Sane includes |
161 |
--CFLAGS+=-I/usr/local/include |
162 |
--LDFLAGS+=-L/usr/local/lib |
163 |
-+#CFLAGS+=-I/usr/local/include |
164 |
-+#LDFLAGS+=-L/usr/local/lib |
165 |
- |
166 |
- # Platform so we know what to dlopen |
167 |
- CFLAGS+=-DPLATFORM_$(PLATFORM) |
168 |
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) |
169 |
- install -m 755 grok $(DESTDIR)$(PREFIX)/bin |
170 |
- install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin |
171 |
- install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib |
172 |
-+ ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1 |
173 |
- for header in $(GROKHEADER); do \ |
174 |
- install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ |
175 |
- done |
176 |
-@@ -162,14 +164,14 @@ cleanver: |
177 |
- # Binary creation |
178 |
- grok: LDFLAGS+=-levent |
179 |
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o |
180 |
-- $(CC) $(LDFLAGS) $^ -o $@ |
181 |
-+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
182 |
- |
183 |
- discogrok: $(GROKOBJ) discover_main.o |
184 |
-- $(CC) $(LDFLAGS) $^ -o $@ |
185 |
-+ $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ |
186 |
- |
187 |
- libgrok.$(LIBSUFFIX): |
188 |
- libgrok.$(LIBSUFFIX): $(GROKOBJ) |
189 |
-- $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@ |
190 |
-+ $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@ |
191 |
- |
192 |
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX); |
193 |
- ln -s $< $@ |
194 |
|
195 |
diff --git a/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch b/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch |
196 |
deleted file mode 100644 |
197 |
index 89300eb5f6e..00000000000 |
198 |
--- a/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch |
199 |
+++ /dev/null |
200 |
@@ -1,26 +0,0 @@ |
201 |
-Closes: https://github.com/jordansissel/grok/issues/28 |
202 |
-Closes: https://github.com/jordansissel/grok/issues/29 |
203 |
- |
204 |
---- a/Makefile |
205 |
-+++ b/Makefile |
206 |
-@@ -213,8 +213,8 @@ grok_capture_xdr.h: grok_capture.x |
207 |
- rpcgen -h $< -o $@ |
208 |
- |
209 |
- %.c: %.gperf |
210 |
-- @if $(GPERF) --version | head -1 | egrep -v '3\.[0-9]+\.[0-9]+' ; then \ |
211 |
-- echo "We require gperf version >= 3.0.3" ; \ |
212 |
-+ @if $(GPERF) --version | head -1 | grep --quiet -E '[0-2]\.[0-9]\.[0-9]+|3\.0\.[0-9]+' ; then \ |
213 |
-+ echo "We require gperf version >= 3.1.0" ; \ |
214 |
- exit 1; \ |
215 |
- fi |
216 |
- $(GPERF) $< > $@ |
217 |
---- a/grok_matchconf_macro.h |
218 |
-+++ b/grok_matchconf_macro.h |
219 |
-@@ -19,6 +19,6 @@ struct strmacro { |
220 |
- #endif |
221 |
- |
222 |
- /* this function is generated by gperf */ |
223 |
--const struct strmacro *patname2macro(const char *str, unsigned int len); |
224 |
-+const struct strmacro *patname2macro(const char *str, size_t len); |
225 |
- |
226 |
- #endif /* _GROK_MATCHCONF_MACRO_ */ |
227 |
|
228 |
diff --git a/dev-libs/grok/files/grok-0.9.2-libdir.patch b/dev-libs/grok/files/grok-0.9.2-libdir.patch |
229 |
deleted file mode 100644 |
230 |
index 06b19555cde..00000000000 |
231 |
--- a/dev-libs/grok/files/grok-0.9.2-libdir.patch |
232 |
+++ /dev/null |
233 |
@@ -1,28 +0,0 @@ |
234 |
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile |
235 |
---- grok-0.9.2.orig/Makefile 2018-05-05 17:26:35.451938040 +0200 |
236 |
-+++ grok-0.9.2/Makefile 2018-05-05 17:29:03.414780593 +0200 |
237 |
-@@ -93,12 +93,12 @@ |
238 |
- |
239 |
- install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER) |
240 |
- install -d $(DESTDIR)$(PREFIX)/bin |
241 |
-- install -d $(DESTDIR)$(PREFIX)/lib |
242 |
-+ install -d $(DESTDIR)$(PREFIX)/$(LIBDIR) |
243 |
- install -d $(DESTDIR)$(PREFIX)/include |
244 |
- install -m 755 grok $(DESTDIR)$(PREFIX)/bin |
245 |
- install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin |
246 |
-- install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib |
247 |
-- ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1 |
248 |
-+ install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR) |
249 |
-+ ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX).1 |
250 |
- for header in $(GROKHEADER); do \ |
251 |
- install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \ |
252 |
- done |
253 |
-@@ -109,7 +109,7 @@ |
254 |
- uninstall: |
255 |
- rm -f $(DESTDIR)$(PREFIX)/bin/grok |
256 |
- rm -f $(DESTDIR)$(PREFIX)/bin/discogrok |
257 |
-- rm -f $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX) |
258 |
-+ rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX) |
259 |
- for header in $(GROKHEADER); do \ |
260 |
- rm -f $(DESTDIR)$(PREFIX)/include/$$header; \ |
261 |
- done |
262 |
|
263 |
diff --git a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch |
264 |
deleted file mode 100644 |
265 |
index 9fd09bef825..00000000000 |
266 |
--- a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch |
267 |
+++ /dev/null |
268 |
@@ -1,21 +0,0 @@ |
269 |
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile |
270 |
---- grok-0.9.2.orig/Makefile 2018-05-05 17:22:33.122558130 +0200 |
271 |
-+++ grok-0.9.2/Makefile 2018-05-05 17:24:29.554221133 +0200 |
272 |
-@@ -25,7 +25,7 @@ |
273 |
- GPERF?=/usr/bin/gperf |
274 |
- endif |
275 |
- |
276 |
--LIBS=-lpcre -levent -rdynamic -ltokyocabinet |
277 |
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet -ltirpc |
278 |
- |
279 |
- # For linux, we need libdl for dlopen() |
280 |
- # On FreeBSD, comment this line out. |
281 |
-@@ -55,7 +55,7 @@ |
282 |
- #LDFLAGS+=-L/usr/local/lib |
283 |
- |
284 |
- # Platform so we know what to dlopen |
285 |
--CFLAGS+=-DPLATFORM_$(PLATFORM) |
286 |
-+CFLAGS+=-DPLATFORM_$(PLATFORM) -I$(EPREFIX)/usr/include/tirpc |
287 |
- # Uncomment to totally disable logging features |
288 |
- #CFLAGS+=-DNOLOGGING |
289 |
- |
290 |
|
291 |
diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild |
292 |
deleted file mode 100644 |
293 |
index 0e18ee718f1..00000000000 |
294 |
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild |
295 |
+++ /dev/null |
296 |
@@ -1,45 +0,0 @@ |
297 |
-# Copyright 1999-2018 Gentoo Foundation |
298 |
-# Distributed under the terms of the GNU General Public License v2 |
299 |
- |
300 |
-EAPI=6 |
301 |
- |
302 |
-inherit toolchain-funcs flag-o-matic |
303 |
- |
304 |
-DESCRIPTION="DRY and RAD for regular expressions" |
305 |
-HOMEPAGE="https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok" |
306 |
-SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
307 |
- |
308 |
-LICENSE="BSD" |
309 |
-SLOT="0" |
310 |
-KEYWORDS="amd64 arm ~arm64 hppa x86" |
311 |
- |
312 |
-IUSE="" |
313 |
- |
314 |
-CDEPEND=" |
315 |
- dev-db/tokyocabinet |
316 |
- >=dev-libs/libevent-1.3:= |
317 |
- >=dev-libs/libpcre-7.6 |
318 |
- >=net-libs/rpcsvc-proto-1 |
319 |
- net-libs/libtirpc |
320 |
-" |
321 |
- |
322 |
-RDEPEND="${CDEPEND}" |
323 |
-DEPEND="${CDEPEND} |
324 |
- >=dev-util/gperf-3.1" |
325 |
- |
326 |
-PATCHES=( |
327 |
- "${FILESDIR}"/grok-0.9.2-Makefile.patch |
328 |
- "${FILESDIR}"/0.9.2-build-with-pcre-lt-8.34.patch |
329 |
- "${FILESDIR}"/grok-0.9.2-build-with-gperf-3.1.patch |
330 |
- "${FILESDIR}"/grok-0.9.2-libtirpc.patch |
331 |
- "${FILESDIR}"/grok-0.9.2-libdir.patch |
332 |
-) |
333 |
- |
334 |
-src_prepare() { |
335 |
- default |
336 |
- tc-export CC |
337 |
-} |
338 |
- |
339 |
-src_install() { |
340 |
- LIBDIR=$(get_libdir) default |
341 |
-} |
342 |
|
343 |
diff --git a/dev-libs/grok/metadata.xml b/dev-libs/grok/metadata.xml |
344 |
deleted file mode 100644 |
345 |
index d1adf07cb2d..00000000000 |
346 |
--- a/dev-libs/grok/metadata.xml |
347 |
+++ /dev/null |
348 |
@@ -1,8 +0,0 @@ |
349 |
-<?xml version="1.0" encoding="UTF-8"?> |
350 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
351 |
-<pkgmetadata> |
352 |
- <!-- maintainer-needed --> |
353 |
- <upstream> |
354 |
- <remote-id type="github">jordansissel/grok</remote-id> |
355 |
- </upstream> |
356 |
-</pkgmetadata> |