reinit the tree, so we can have metadata

8 files changed, 255 insertions, 0 deletions

diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
new file mode 100644
index 000000000000..16bc61473720
--- /dev/null
+++ b/dev-libs/grok/Manifest
@@ -0,0 +1,10 @@
+AUX 0.9.2-Makefile.patch 2076 SHA256 6ce3d8e1337e75ace8215799e57a99475acacc7852398793e3525776ab7069cd SHA512 d1b56f1fe577f9dba9a5fa4b79589d8c51a47baaa80fafeaa3ec8b0660f0e329ec0d44e5b3f1cae4c2cacd877497c499d1400cc996635f82262898e06c1507bb WHIRLPOOL b9aa343c4a821a1b13a5999c0bbbcd5ef69fc6f55c560d8dd7992f338451d533b78f190694a3b0525ce618826616f4d8f4916fec2db9bb4135a4c8e2c070d9fd
+AUX 0.9.2-build-with-pcre-lt-8.34.patch 391 SHA256 6bd6f1c4c33abaf4f5052edd624f4787e2c7a47e02594a81d1cd9d9d3c736c97 SHA512 67c5f3d66536946d09c2a7b3e34dcb6d68a2cff019acbf31cafc088864eb38537e5eb09cde4a57627601057123a7748f49a6d0f9563cfed5cddb505c236c93f4 WHIRLPOOL c0c3e0b09af8991c78494ae5445278877e0e2601003b67defeabc3b3072d5cd61338de6035b4bc9126a825d4ea58aa95e3088f863ef0c5cff30e36301d80c937
+AUX grok-0.9.2-Makefile.patch 1969 SHA256 c251e9f459afc2415dbbe42d7ff988413f210b660b82de4bff64db5956c1d10b SHA512 7ae93d4e7f4052c0f43581c9e2434985665398dbdf408a2dcd164b021f9abb54d35fae546f880debf80ae10e2620c3620423723c4489fc55ee9f6bca77ffa913 WHIRLPOOL 4132dc055a5af28cff6463ee5f95af3708bdbf0558d09942ca83d945b4d1865d0eac8d9bdfa00aa52dd91903b549e311f0c89b763004ec4db607aaf7c283ebc5
+AUX grok-0.9.2-build-with-gperf-3.1.patch 867 SHA256 956f10289edad78de197cc456c35321aa35a11d93a46bf23522f98601882cdf9 SHA512 6074c5ef9da13d874716b07d0796396c5974088ce2faf52835e9735378a4896ac21dbd8899b0eb2c221ab01cbc29ed9ca25c42814082aa5c6c98e515dc7cb8c2 WHIRLPOOL 9770a1ca5354d0e3fc2282e9612af5ac3902346789761414e70e35c93e44fc65a99c28512e8e5d2fe5badf1576b1bfb5ae082e26f0f82bec33044f93ecffa404
+DIST grok-0.9.2.tar.gz 243554 SHA256 40edbdba488ff9145832c7adb04b27630ca2617384fbef2af014d0e5a76ef636 SHA512 91d410259e89de6fbab011691cf56497158bc7a508194e6d17a2b32c8b70650be3b40c4792390589929b0f553a92b81cd3981e84ddcbe6a6ea80ab8fcdb38b2e WHIRLPOOL 90d0fb5418491435b57335792626d633edc50f348ba4a211a53f3c9acd46f5633b19b9d77642e787dd50e5feed57c2a5bbc78aeea1288c1b146a47e32c62317c
+EBUILD grok-0.9.2-r1.ebuild 797 SHA256 6ee4893d8b356d4502fe2e85b965e0f689006deeb53d09582bce69b11ed2bd52 SHA512 4ec5c6a91ae7eefccf96fb686665bc19a64d3758bbcd63bd1b37bef7825458c9cd7a23c0bbb9b17e96bcb6137aa096b8ca09230de902b49b7f515c38ade25d2b WHIRLPOOL c510b8eae48e71230df20ee048a76d9ebe9e2f24e01c23581b57ab44bf5c17367ea93387ef90bd77c2c3cc2477325a27ae06268cc26116f2d5994c92149c2938
+EBUILD grok-0.9.2.ebuild 660 SHA256 3ba8ee6c8e490126ca8508d0ffcea0984bc03497bb02b2a7e9af41e3e1c95d41 SHA512 cd035ee0106ddbfa87bdd216dabeb1ae4e43e22720e266b1c8311ae9a152fec1b9944542e51b901c249930d59dbe8d8724a303e44410fae993afcb6918445ce3 WHIRLPOOL dd974fbd957f9b75e488df2110ede36dc808bfb5c9c0b8d05649a4b17ee41e2cbfd8c04a5ff5d40466b01b605dd461a612db843e48f85ac458128ee7567f782c
+MISC ChangeLog 2994 SHA256 499627f469be21d4326b6620b869d53ab1070e7c8b26575589ea9b5fd38cfa57 SHA512 0ead2bf87f5456a69eae29ff57063257558b4155ece320c33f67f8bf54a815e70c86963b57b151ce65eb9cb7a901e91918aa45b8bf09ea0e022bf03131fee9d4 WHIRLPOOL 48ea4152aa0496e8c77af4aeba2151bfbd585c39ef8a32525861ce4bb2abc1156f3b3ffc27557e350b15f91d108e21e74c9c783d38ef16c803a7f61e56f3d05c
+MISC ChangeLog-2015 698 SHA256 f9495392b5fe8ee09cf1bd605298da72e36fc892281d540275a80f83870a31d1 SHA512 13fb09a90e64e86178600579bbc597e5ce07c4dff61663acff197f10d244289b06541af8052f4217ba262d5955bf6651e33a1256d084be25f2d5c97ae8ec693a WHIRLPOOL 06af8fc2bcf629a1ec549bd1c7ec43d20bd38520afd35e5579c4cfe187e0a43c95343d0c63f90ab0bb812a298f72515838216a0b0258077da8b042718406bc1f
+MISC metadata.xml 346 SHA256 7dd2f6f3e729bacb3bf243988aa70d840c20fc10b68565b704fe5e6900c006cc SHA512 3f812f7a83ed6efec014022afe74606b1ec14376b34ba35ee1c24a88c8e6f1e492eeb439182fdc847bbf3ec2071937ceaaca30760bae8a9e6b1b19a89b38def7 WHIRLPOOL 498d2746ee9cb85e8b0d77651fecc7e16ece7417aeec4c6057ec7cb3a7765afca884952b47cd49c106500d97a8f90ef78dcca1138a6c907afcd6af0073714fef
diff --git a/dev-libs/grok/files/0.9.2-Makefile.patch b/dev-libs/grok/files/0.9.2-Makefile.patch
new file mode 100644
index 000000000000..f10531646ad0
--- /dev/null
+++ b/dev-libs/grok/files/0.9.2-Makefile.patch
@@ -0,0 +1,65 @@
+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
new file mode 100644
index 000000000000..1593ac309817
--- /dev/null
+++ b/dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..8d9351c8c0f8
--- /dev/null
+++ b/dev-libs/grok/files/grok-0.9.2-Makefile.patch
@@ -0,0 +1,63 @@
+--- 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
new file mode 100644
index 000000000000..89300eb5f6e9
--- /dev/null
+++ b/dev-libs/grok/files/grok-0.9.2-build-with-gperf-3.1.patch
@@ -0,0 +1,26 @@
+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/grok-0.9.2-r1.ebuild b/dev-libs/grok/grok-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..967671141eed
--- /dev/null
+++ b/dev-libs/grok/grok-0.9.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+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"
+
+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
+)
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
new file mode 100644
index 000000000000..1981d7238fac
--- /dev/null
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+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 hppa x86"
+
+IUSE=""
+
+CDEPEND="dev-db/tokyocabinet
+		>=dev-libs/libevent-1.3:=
+		>=dev-libs/libpcre-7.6"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+		<dev-util/gperf-3.1"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-*.patch
+	tc-export CC
+}
diff --git a/dev-libs/grok/metadata.xml b/dev-libs/grok/metadata.xml
new file mode 100644
index 000000000000..3384e9108b86
--- /dev/null
+++ b/dev-libs/grok/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ercpe@gentoo.org</email>
+    <name>Johann Schmitz (ercpe)</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jordansissel/grok</remote-id>
+  </upstream>
+</pkgmetadata>