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

2019-05-02 Thread Mikle Kolyada 
commit: f1d80fe234a8ed83671f740e210d0e9d3955ddaf
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  2 18:42:31 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  2 18:42:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d80fe2

dev-libs/grok: remove last rited package

Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-libs/grok/Manifest |  1 -
 dev-libs/grok/files/0.9.2-Makefile.patch   | 65 --
 .../grok/files/0.9.2-build-with-pcre-lt-8.34.patch | 15 -
 dev-libs/grok/files/grok-0.9.2-Makefile.patch  | 63 -
 .../files/grok-0.9.2-build-with-gperf-3.1.patch| 26 -
 dev-libs/grok/files/grok-0.9.2-libdir.patch| 28 --
 dev-libs/grok/files/grok-0.9.2-libtirpc.patch  | 21 ---
 dev-libs/grok/grok-0.9.2-r2.ebuild | 45 ---
 dev-libs/grok/metadata.xml |  8 ---
 9 files changed, 272 deletions(-)

diff --git a/dev-libs/grok/Manifest b/dev-libs/grok/Manifest
deleted file mode 100644
index 4fca8e7b228..000
--- 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
index f10531646ad..000
--- 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
index 1593ac30981..000
--- 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
index 8d9351c8c0f..000
--- 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
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2019-01-27 Thread Pacho Ramos 
commit: d95d497bcda3070b0867e8abaac21de88ebc8f10
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Jan 27 11:00:59 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Jan 27 11:05:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95d497b

dev-libs/grok: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 dev-libs/grok/grok-0.9.2-r1.ebuild | 36 
 dev-libs/grok/grok-0.9.2.ebuild| 29 -
 2 files changed, 65 deletions(-)

diff --git a/dev-libs/grok/grok-0.9.2-r1.ebuild 
b/dev-libs/grok/grok-0.9.2-r1.ebuild
deleted file mode 100644
index 967671141ee..000
--- a/dev-libs/grok/grok-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
deleted file mode 100644
index 1981d7238fa..000
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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}
-

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2019-01-01 Thread Matt Turner 
commit: ca6d9852cb5865bb45fb55f6aca0d19704087113
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Jan  2 02:30:50 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jan  2 02:55:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca6d9852

dev-libs/grok-0.9.2-r2: hppa stable, bug 638372

Signed-off-by: Matt Turner  gentoo.org>

 dev-libs/grok/grok-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild 
b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 72d46636f25..0e18ee718f1 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2018-07-22 Thread Mikle Kolyada 
commit: 7d5fde16d58c8fb93b3cf51b7b0c6f2488d6fa93
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 22 15:22:43 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 22 15:22:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5fde16

dev-libs/grok: arm stable wrt bug #656752

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/grok/grok-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild 
b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 64987886cde..72d46636f25 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2018-07-09 Thread Mikle Kolyada 
commit: 3d3b18db5a19ba281ce8c4635a10a92b9145b8ad
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Jul  9 15:21:13 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Jul  9 15:21:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3b18db

dev-libs/grok: amd64 stable wrt bug #638372

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/grok/grok-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild 
b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 0893251563d..64987886cde 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2018-07-03 Thread Thomas Deutschmann 
commit: 27e870c84a31c550c09bd551d4f307cefc3580fc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jul  4 03:09:53 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jul  4 03:09:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e870c8

dev-libs/grok: x86 stable (bug #638372)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/grok/grok-0.9.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2-r2.ebuild 
b/dev-libs/grok/grok-0.9.2-r2.ebuild
index 4b6318f2f6b..0893251563d 100644
--- a/dev-libs/grok/grok-0.9.2-r2.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
 
 IUSE=""

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

2018-05-05 Thread Andreas Hüttel 
commit: cac54fbbc2f4abb24c4fb7f15194b66aa98fd223
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May  5 19:09:20 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May  5 19:09:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac54fbb

dev-libs/grok: Make prefix-compatible

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-libs/grok/files/grok-0.9.2-libtirpc.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch 
b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
index 0e91d9fed12..9fd09bef825 100644
--- a/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
+++ b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
@@ -15,7 +15,7 @@ diff -ruN grok-0.9.2.orig/Makefile grok-0.9.2/Makefile
  
  # Platform so we know what to dlopen
 -CFLAGS+=-DPLATFORM_$(PLATFORM)
-+CFLAGS+=-DPLATFORM_$(PLATFORM) -I/usr/include/tirpc
++CFLAGS+=-DPLATFORM_$(PLATFORM) -I$(EPREFIX)/usr/include/tirpc
  # Uncomment to totally disable logging features
  #CFLAGS+=-DNOLOGGING

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

2018-05-05 Thread Andreas Hüttel 
commit: 62601511e80a9c080934c2f74ff2ebd15faefab2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May  5 15:33:53 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May  5 15:34:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62601511

dev-libs/grok: Fix build with glibc-2.26, bug 638372

Also fix libdir, bug 628048
This still needs stabilization together with glibc-2.26.

Closes: https://bugs.gentoo.org/628048
Bug: https://bugs.gentoo.org/638372
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 dev-libs/grok/files/grok-0.9.2-libdir.patch   | 28 +
 dev-libs/grok/files/grok-0.9.2-libtirpc.patch | 21 +
 dev-libs/grok/grok-0.9.2-r2.ebuild| 45 +++
 3 files changed, 94 insertions(+)

diff --git a/dev-libs/grok/files/grok-0.9.2-libdir.patch 
b/dev-libs/grok/files/grok-0.9.2-libdir.patch
new file mode 100644
index 000..06b19555cde
--- /dev/null
+++ b/dev-libs/grok/files/grok-0.9.2-libdir.patch
@@ -0,0 +1,28 @@
+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/Makefile2018-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
new file mode 100644
index 000..0e91d9fed12
--- /dev/null
+++ b/dev-libs/grok/files/grok-0.9.2-libtirpc.patch
@@ -0,0 +1,21 @@
+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/Makefile2018-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/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
new file mode 100644
index 000..4b6318f2f6b
--- /dev/null
+++ b/dev-libs/grok/grok-0.9.2-r2.ebuild
@@ -0,0 +1,45 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2017-06-18 Thread Alexis Ballier 
commit: 02f01eb6bf4b14acb50df507acb219068c30014c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Jun 18 10:34:48 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 18 11:44:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f01eb6

dev-libs/grok: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/grok/grok-0.9.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2-r1.ebuild 
b/dev-libs/grok/grok-0.9.2-r1.ebuild
index 8aceb1eb0a0..967671141ee 100644
--- a/dev-libs/grok/grok-0.9.2-r1.ebuild
+++ b/dev-libs/grok/grok-0.9.2-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 
 IUSE=""

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

2017-05-22 Thread Thomas Deutschmann 
commit: 0bdc0027d77f551be490f7811702a45b5cd6405c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 22 13:17:28 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 22 13:43:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdc0027

dev-libs/grok: Fix compilation against PCRE >=8.34

In addition, https://github.com/jordansissel/grok/issues/29
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/grok/files/0.9.2-build-with-pcre-lt-8.34.patch | 15 +++
 dev-libs/grok/grok-0.9.2.ebuild |  6 --
 2 files changed, 19 insertions(+), 2 deletions(-)

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 000..1593ac30981
--- /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/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index e7a4e05d10e..1981d7238fa 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -15,11 +15,13 @@ KEYWORDS="amd64 arm hppa x86"
 
 IUSE=""
 
-DEPEND="dev-db/tokyocabinet
+CDEPEND="dev-db/tokyocabinet
>=dev-libs/libevent-1.3:=
>=dev-libs/libpcre-7.6"
 
-RDEPEND="${DEPEND}"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}
+

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

2017-05-22 Thread Thomas Deutschmann 
commit: 6cec5ed8f017a8d6869deaa00c6a364f2230d209
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 22 13:42:58 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 22 13:43:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cec5ed8

dev-libs/grok: Rev bump to allow building against >=gperf-3.1

Closes: https://github.com/jordansissel/grok/issues/29
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/grok/files/grok-0.9.2-Makefile.patch  | 63 ++
 .../files/grok-0.9.2-build-with-gperf-3.1.patch| 26 +
 dev-libs/grok/grok-0.9.2-r1.ebuild | 36 +
 3 files changed, 125 insertions(+)

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 000..8d9351c8c0f
--- /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 000..89300eb5f6e
--- /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 000..8aceb1eb0a0
--- /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 ~hppa ~x86"
+
+IUSE=""
+

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2017-05-22 Thread Thomas Deutschmann 
commit: 78a371590110c3ff90e89d0ca162232021ac28e0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 22 11:28:11 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 22 11:28:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a37159

dev-libs/grok: Add sub slot operator on dev-libs/libevent atom

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/grok/grok-0.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index 93bd40b3cdd..e7a4e05d10e 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 arm hppa x86"
 IUSE=""
 
 DEPEND="dev-db/tokyocabinet
-   >=dev-libs/libevent-1.3
+   >=dev-libs/libevent-1.3:=
>=dev-libs/libpcre-7.6"
 
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2017-02-26 Thread Michael Weber 
commit: b71eaf47bc6fd0f2d2e27056b2852db90e75c561
Author: Michael Weber  gentoo  org>
AuthorDate: Sun Feb 26 23:09:05 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Sun Feb 26 23:12:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71eaf47

dev-libs/grok: arm stable (bug 591972).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/grok/grok-0.9.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index 06c3448228..9f3001f880 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa x86"
+KEYWORDS="amd64 arm hppa x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2016-11-27 Thread Thomas Deutschmann 
commit: 185170a6c0e45997d0e78858d96a948ac19e4c4f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 27 20:07:43 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 27 21:08:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185170a6

dev-libs/grok: amd64/x86 stable, bug #591972

Package-Manager: portage-2.3.2

 dev-libs/grok/grok-0.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index a593b5f..06c3448 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~x86"
+KEYWORDS="amd64 ~arm hppa x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2016-09-28 Thread Jeroen Roovers 
commit: 33e190804a6c3bf3344fbb2c7e7800f29d663694
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Sep 29 04:02:33 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Sep 29 04:02:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e19080

dev-libs/grok: Stable for HPPA (bug #591972).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 dev-libs/grok/grok-0.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index 6942a7e..a593b5f 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~amd64 ~arm hppa ~x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2016-05-19 Thread Jeroen Roovers 
commit: 7811337510c72e1e088affc3fed4160c7d72ef24
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu May 19 09:41:20 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu May 19 09:42:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78113375

dev-libs/grok: Mark ~hppa (bug #581180).

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --ignore-arches

 dev-libs/grok/grok-0.9.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index b488e4b..6942a7e 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: dev-libs/grok/

2016-05-12 Thread Markus Meier 
commit: 891d58bcd1313e663aed42ff64a51eadaeeb6f4a
Author: Markus Meier  gentoo  org>
AuthorDate: Thu May 12 17:14:53 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu May 12 17:14:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891d58bc

dev-libs/grok: add ~arm, bug #581180

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 dev-libs/grok/grok-0.9.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/grok/grok-0.9.2.ebuild b/dev-libs/grok/grok-0.9.2.ebuild
index 579474c..b488e4b 100644
--- a/dev-libs/grok/grok-0.9.2.ebuild
+++ b/dev-libs/grok/grok-0.9.2.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/jordansissel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE=""