[gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/files/, sys-libs/libcap/

[Tony Vroon]

commit:     3e68f63c6dd1309dff74786854d3ceabb8476582
Author:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 14:41:53 2017 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 14:41:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e68f63c

sys-libs/libcap: Patch & research by Mike "floppym" Gilbert to allow 
compilation against gperf 3.1; ported to no-perl Makefile by me. Closes bug 
#604802 by dwfreed.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-libs/libcap/files/libcap-2.25-gperf.patch | 17 +++++++++++++++++
 sys-libs/libcap/libcap-2.25.ebuild            |  1 +
 2 files changed, 18 insertions(+)

diff --git a/sys-libs/libcap/files/libcap-2.25-gperf.patch 
b/sys-libs/libcap/files/libcap-2.25-gperf.patch
new file mode 100644
index 00000000..aa67a19
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.25-gperf.patch
@@ -0,0 +1,17 @@
+diff -uNr libcap-2.25.ORIG/libcap/Makefile libcap-2.25/libcap/Makefile
+--- libcap-2.25.ORIG/libcap/Makefile   2017-02-01 09:58:34.966642226 +0000
++++ libcap-2.25/libcap/Makefile        2017-02-01 10:01:49.943651936 +0000
+@@ -44,11 +44,12 @@
+       ./_makenames > cap_names.h
+ 
+ $(GPERF_OUTPUT): cap_names.list.h
+-      (printf "%b" "struct __cap_token_s { const char *name; int index; 
};\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, unsigned 
int);\n%}\n%%\n"; \
++      (printf "%b" "struct __cap_token_s { const char *name; int index; 
};\n%%\n"; \
+       $(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
+       gperf \
+               --ignore-case \
+               --language=ANSI-C \
++              --includes \
+               --readonly \
+               --null-strings \
+               --global-table \

diff --git a/sys-libs/libcap/libcap-2.25.ebuild 
b/sys-libs/libcap/libcap-2.25.ebuild
index f523bd1..ad5bb12 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.22-no-perl.patch
        "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
        "${FILESDIR}"/${PN}-2.21-include.patch
+       "${FILESDIR}"/${PN}-2.25-gperf.patch
 )
 
 src_prepare() {