dev-libs/grok: remove last rited package

Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>

diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
deleted file mode 100644 (file)
index 4fca8e7..0000000
--- a/dev-libs/grok/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST grok-0.9.2.tar.gz 243554 BLAKE2B 390f9a252668af2ccf90c5ea91e5182bf91ed0b66fd354d77f67c13a2e4c08aa244ba290adae687f7cdacea24fdb561fa378456d1d7bed07b3f44e0b46dc1adf SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e

diff --git a/dev-libs/grok/files/0.9.2-Makefile.patch b/dev-libs/grok/files/0.9.2-Makefile.patch
deleted file mode 100644 (file)
index f105316..0000000
--- a/dev-libs/grok/files/0.9.2-Makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/grok-0.9.2/Makefile b/grok-0.9.2/Makefile
-index adfe869..fdced25 100644
---- a/grok-0.9.2/Makefile
-+++ b/grok-0.9.2/Makefile
-@@ -25,10 +25,12 @@ else
- GPERF?=/usr/bin/gperf
- endif
- 
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
- ifeq ($(PLATFORM), GNULinux)
--LDFLAGS+=-ldl
-+LIBS+=-ldl
- endif
- 
- # #############################################
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh)
- #CFLAGS+=-g
- #LDFLAGS+=-g
- 
--CFLAGS+=-pipe -fPIC -I. -O2
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet
-+CFLAGS+=-fPIC -I.
- 
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag)
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
- 
- # Sane includes
--CFLAGS+=-I/usr/local/include
--LDFLAGS+=-L/usr/local/lib
-+#CFLAGS+=-I/usr/local/include
-+#LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
- CFLAGS+=-DPLATFORM_$(PLATFORM)
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
-       install -m 755 grok $(DESTDIR)$(PREFIX)/bin
-       install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
-       install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
-+      ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
-       for header in $(GROKHEADER); do \
-               install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
-       done 
-@@ -162,14 +164,14 @@ cleanver:
- # Binary creation
- grok: LDFLAGS+=-levent
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o
--      $(CC) $(LDFLAGS) $^ -o $@
-+      $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- discogrok: $(GROKOBJ) discover_main.o
--      $(CC) $(LDFLAGS) $^ -o $@
-+      $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libgrok.$(LIBSUFFIX): 
- libgrok.$(LIBSUFFIX): $(GROKOBJ) 
--      $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@
-+      $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@
- 
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX);
-       ln -s $< $@

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
deleted file mode 100644 (file)
index 1593ac3..0000000
--- a/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/jordansissel/grok/commit/44ce9372a29319c01d4ac7f24287fb36315e0e34
-
---- a/grokre.c
-+++ b/grokre.c
-@@ -12,8 +12,8 @@
- 
- /* global, static variables */
- 
--#define CAPTURE_ID_LEN 4
--#define CAPTURE_FORMAT "%04x"
-+#define CAPTURE_ID_LEN 5
-+#define CAPTURE_FORMAT "_%04x"
- 
- /* internal functions */
- static char *grok_pattern_expand(grok_t *grok); //, int offset, int length);

diff --git a/dev-libs/grok/files/grok-0.9.2-Makefile.patch b/dev-libs/grok/files/grok-0.9.2-Makefile.patch
deleted file mode 100644 (file)
index 8d9351c..0000000
--- a/dev-libs/grok/files/grok-0.9.2-Makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -25,10 +25,12 @@ else
- GPERF?=/usr/bin/gperf
- endif
- 
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
- ifeq ($(PLATFORM), GNULinux)
--LDFLAGS+=-ldl
-+LIBS+=-ldl
- endif
- 
- # #############################################
-@@ -41,8 +43,7 @@ VERSION=$(shell sh $(BASE)/version.sh)
- #CFLAGS+=-g
- #LDFLAGS+=-g
- 
--CFLAGS+=-pipe -fPIC -I. -O2
--LDFLAGS+=-lpcre -levent -rdynamic -ltokyocabinet
-+CFLAGS+=-fPIC -I.
- 
- LIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix)
- VERLIBSUFFIX=$(shell sh $(BASE)/platform.sh libsuffix $(MAJOR))
-@@ -50,8 +51,8 @@ DYNLIBFLAG=$(shell sh $(BASE)/platform.sh dynlibflag)
- LIBNAMEFLAG=$(shell sh $(BASE)/platform.sh libnameflag $(MAJOR) $(INSTALLLIB))
- 
- # Sane includes
--CFLAGS+=-I/usr/local/include
--LDFLAGS+=-L/usr/local/lib
-+#CFLAGS+=-I/usr/local/include
-+#LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
- CFLAGS+=-DPLATFORM_$(PLATFORM)
-@@ -97,6 +98,7 @@ install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
-       install -m 755 grok $(DESTDIR)$(PREFIX)/bin
-       install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
-       install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
-+      ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
-       for header in $(GROKHEADER); do \
-               install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
-       done 
-@@ -162,14 +164,14 @@ cleanver:
- # Binary creation
- grok: LDFLAGS+=-levent
- grok: $(GROKOBJ) conf.tab.o conf.yy.o main.o grok_config.o
--      $(CC) $(LDFLAGS) $^ -o $@
-+      $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- discogrok: $(GROKOBJ) discover_main.o
--      $(CC) $(LDFLAGS) $^ -o $@
-+      $(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- libgrok.$(LIBSUFFIX): 
- libgrok.$(LIBSUFFIX): $(GROKOBJ) 
--      $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ -o $@
-+      $(CC) $(LDFLAGS) -fPIC $(DYNLIBFLAG) $(LIBNAMEFLAG) $^ $(LIBS) -o $@
- 
- libgrok.$(VERLIBSUFFIX): libgrok.$(LIBSUFFIX);
-       ln -s $< $@

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
deleted file mode 100644 (file)
index 89300eb..0000000
--- a/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Closes: https://github.com/jordansissel/grok/issues/28
-Closes: https://github.com/jordansissel/grok/issues/29
-
---- a/Makefile
-+++ b/Makefile
-@@ -213,8 +213,8 @@ grok_capture_xdr.h: grok_capture.x
-       rpcgen -h $< -o $@
- 
- %.c: %.gperf
--      @if $(GPERF) --version | head -1 | egrep -v '3\.[0-9]+\.[0-9]+' ; then \
--              echo "We require gperf version >= 3.0.3" ; \
-+      @if $(GPERF) --version | head -1 | grep --quiet -E '[0-2]\.[0-9]\.[0-9]+|3\.0\.[0-9]+' ; then \
-+              echo "We require gperf version >= 3.1.0" ; \
-               exit 1; \
-       fi
-       $(GPERF) $< > $@
---- a/grok_matchconf_macro.h
-+++ b/grok_matchconf_macro.h
-@@ -19,6 +19,6 @@ struct strmacro {
- #endif
- 
- /* this function is generated by gperf */
--const struct strmacro *patname2macro(const char *str, unsigned int len);
-+const struct strmacro *patname2macro(const char *str, size_t len);
- 
- #endif /* _GROK_MATCHCONF_MACRO_ */

diff --git a/dev-libs/grok/files/grok-0.9.2-libdir.patch b/dev-libs/grok/files/grok-0.9.2-libdir.patch
deleted file mode 100644 (file)
index 06b1955..0000000
--- a/dev-libs/grok/files/grok-0.9.2-libdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile
---- grok-0.9.2.orig/Makefile   2018-05-05 17:26:35.451938040 +0200
-+++ grok-0.9.2/Makefile        2018-05-05 17:29:03.414780593 +0200
-@@ -93,12 +93,12 @@
- 
- install: libgrok.$(LIBSUFFIX) grok discogrok $(GROKHEADER)
-       install -d $(DESTDIR)$(PREFIX)/bin
--      install -d $(DESTDIR)$(PREFIX)/lib
-+      install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
-       install -d $(DESTDIR)$(PREFIX)/include
-       install -m 755 grok $(DESTDIR)$(PREFIX)/bin
-       install -m 755 discogrok $(DESTDIR)$(PREFIX)/bin
--      install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib
--      ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX).1
-+      install -m 644 libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+      ln -s libgrok.$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX).1
-       for header in $(GROKHEADER); do \
-               install -m 644 $$header $(DESTDIR)$(PREFIX)/include; \
-       done 
-@@ -109,7 +109,7 @@
- uninstall:
-       rm -f $(DESTDIR)$(PREFIX)/bin/grok
-       rm -f $(DESTDIR)$(PREFIX)/bin/discogrok
--      rm -f $(DESTDIR)$(PREFIX)/lib/libgrok.$(LIBSUFFIX)
-+      rm -f $(DESTDIR)$(PREFIX)/$(LIBDIR)/libgrok.$(LIBSUFFIX)
-       for header in $(GROKHEADER); do \
-               rm -f $(DESTDIR)$(PREFIX)/include/$$header; \
-       done 

diff --git a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
deleted file mode 100644 (file)
index 9fd09be..0000000
--- a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile
---- grok-0.9.2.orig/Makefile   2018-05-05 17:22:33.122558130 +0200
-+++ grok-0.9.2/Makefile        2018-05-05 17:24:29.554221133 +0200
-@@ -25,7 +25,7 @@
- GPERF?=/usr/bin/gperf
- endif
- 
--LIBS=-lpcre -levent -rdynamic -ltokyocabinet
-+LIBS=-lpcre -levent -rdynamic -ltokyocabinet -ltirpc
- 
- # For linux, we need libdl for dlopen()
- # On FreeBSD, comment this line out.
-@@ -55,7 +55,7 @@
- #LDFLAGS+=-L/usr/local/lib
- 
- # Platform so we know what to dlopen
--CFLAGS+=-DPLATFORM_$(PLATFORM)
-+CFLAGS+=-DPLATFORM_$(PLATFORM) -I$(EPREFIX)/usr/include/tirpc
- # Uncomment to totally disable logging features
- #CFLAGS+=-DNOLOGGING
- 

diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild b/dev-libs/grok/grok-0.9.2-r2.ebuild
deleted file mode 100644 (file)
index 0e18ee7..0000000
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DRY and RAD for regular expressions"
-HOMEPAGE="https://github.com/jordansissel/grok https://code.google.com/p/semicomplete/wiki/Grok"
-SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-IUSE=""
-
-CDEPEND="
-       dev-db/tokyocabinet
-       >=dev-libs/libevent-1.3:=
-       >=dev-libs/libpcre-7.6
-       >=net-libs/rpcsvc-proto-1
-       net-libs/libtirpc
-"
-
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-               >=dev-util/gperf-3.1"
-
-PATCHES=(
-       "${FILESDIR}"/grok-0.9.2-Makefile.patch
-       "${FILESDIR}"/0.9.2-build-with-pcre-lt-8.34.patch
-       "${FILESDIR}"/grok-0.9.2-build-with-gperf-3.1.patch
-       "${FILESDIR}"/grok-0.9.2-libtirpc.patch
-       "${FILESDIR}"/grok-0.9.2-libdir.patch
-)
-
-src_prepare() {
-       default
-       tc-export CC
-}
-
-src_install() {
-       LIBDIR=$(get_libdir) default
-}

diff --git a/dev-libs/grok/metadata.xml b/dev-libs/grok/metadata.xml
deleted file mode 100644 (file)
index d1adf07..0000000
--- a/dev-libs/grok/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">jordansissel/grok</remote-id>
-  </upstream>
-</pkgmetadata>