Do not require perl to build #390263 by Bruno.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 74 insertions, 4 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 0eff4b690b4e..8d838ddba773 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.114 2011/11/06 23:41:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.115 2011/11/12 19:36:25 vapier Exp $
+
+  12 Nov 2011; Mike Frysinger <vapier@gentoo.org> libcap-2.22.ebuild,
+  +files/libcap-2.22-no-perl.patch:
+  Do not require perl to build #390263 by Bruno.
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> libcap-2.22.ebuild:
   Marking libcap-2.22 ppc for bug 389201
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index bc5a482201c6..3d94ffffa5f5 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.16/0001-build-system-fixes.patch 4632 RMD160 f0d6589436465fe05227689243832f566e6bb03d SHA1 444bf8cbe6f0652deb4d34fe526057997d210bc7 SHA256 4c4e5dc5d465e7db63076d80b627705e8c65adb55d2e97aeaa976e2fe5c12a1e
 AUX libcap-2.20-build-system-fixes.patch 4832 RMD160 9cba5f737621ced058bd3d6539abe4102853000c SHA1 9c912ed404bf5eeb50b07a59bad23b36621b9e91 SHA256 67a741af74c13a283e73cd3d9e828b73e1db68db19e8010e942c341b6d280842
 AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 RMD160 50016332262dbc2a9af4acee8be28b3a230e655b SHA1 92ceabd66ea59bd92e050b46ddd91c3320ad183e SHA256 29be1427227f9b045151bd02597192bff1c6761c649014b0fd1384f08e010616
 AUX libcap-2.21-include.patch 290 RMD160 ee972e388d9b1ea036223e59d349cff2d5744634 SHA1 64f9c786be36687f37808f77b7ad2f181164c2a7 SHA256 60038e5f67928edbf7e1b43b8799d5a92cff40dd7c3678135c793ed434c29305
 AUX libcap-2.22-build-system-fixes.patch 4922 RMD160 874a60ff961325d0c0bc1f778cf516893b998d06 SHA1 e5665557cbc72770151cf3758617b6ebea861a8b SHA256 6c371caa4fb3e500eda4a98dc6dd4e21a8378117b4d01defb2198184d6ed5a16
+AUX libcap-2.22-no-perl.patch 2360 RMD160 1dcf6b82f12dda8180a87d85d505d86647dba42b SHA1 ef3e4534937b75b7252d77c75160b966beabb6e2 SHA256 4eca873685da1aec0d06e9d7681c285166f9ad7e7cb14c65da6e05cbb135e9ef
 DIST libcap-2.17.tar.bz2 48899 RMD160 4b8ce8b3f42277aeb297a56fb741a8e2f6817dda SHA1 74cad53570cb5c69c08fa3f31b1a3fbf555dab0f SHA256 2cab109eed9bd944408c13efed910091479d8770cf9aa1bec4f9b26d9302f5b0
 DIST libcap-2.19.tar.bz2 53099 RMD160 09aa28c02af494a3ffa638a8c536a95dcd048190 SHA1 77e47faab6016383954a27777747a614edcd2640 SHA256 ed1693e344054a398e68a7cc840892e3d1a880562743bdf28fd918649aa5a4ce
 DIST libcap-2.20.tar.bz2 53629 RMD160 734ec196b63644c66849698a009392e00aea367e SHA1 90ea2ca7325c344d225f863a66b2a9f4b29434ee SHA256 20e7c1ea4d3d5c410efb3a6ff138dc417912fae316d883460dcd58d9803a9220
@@ -12,6 +16,13 @@ EBUILD libcap-2.17.ebuild 1295 RMD160 8c15404afb209e68ffb34cabd9610d71cc6aa3c9 S
 EBUILD libcap-2.19.ebuild 1241 RMD160 3e97c723b3580f1f1c623b6b075b53ed9912e4c4 SHA1 4338abf829038a8a70e5bdf1a7fc00879d106753 SHA256 8334b3d70bafccfbecac938629acfe6866b5f990a9ae449ec851c2e27a70d3cb
 EBUILD libcap-2.20.ebuild 1255 RMD160 5c564b48afcedade90d1cb6291ef1fa0bff56be6 SHA1 229ae4df168118e4124acc917b47d45c4032fd89 SHA256 14c38763c45c488e74a49a4399b844ea6e5326e8a189feba5e2650b6e424becd
 EBUILD libcap-2.21.ebuild 1299 RMD160 e9943729af5614ad2915b8df74b5d96dfa3a4e21 SHA1 e62f4886152f050a1bd071014aa066ed169c0d47 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754
-EBUILD libcap-2.22.ebuild 1305 RMD160 8b03f00e9379027df0099ee83eff0d29c3b9e2af SHA1 9c71f4624f288c3df8928e25a1e3ab899aeed869 SHA256 3821c07bcbbc274e8fa754e084b8578ec7170f87d7e88ae41dc8c13cd94a729c
-MISC ChangeLog 15984 RMD160 00e7cf81a382d94767943bf98ef6b27a74f12cfa SHA1 0c8f8c8e9c9e82b6ba5c14b5594e7fce1f371d5c SHA256 002901737d047b7ce3a1627d4224ccf6624577fca71053ecf012a77f007e1fff
+EBUILD libcap-2.22.ebuild 1352 RMD160 b8c89991bfcbfbee0eb146cef6d4480f3f55e295 SHA1 c7297a7fe824885cb3b97a410ffa4ad59a2dfe7a SHA256 bb38a0fab0cbaae09e3500f8bacf0b50e7d2126b9475b2ba87646df89f69667f
+MISC ChangeLog 16140 RMD160 a22d47dedc9514435fddc9f16b499fd39e6de693 SHA1 ec1559ad74498426340433acffb585a703f70584 SHA256 87a1bdcc5e5a0693f1850c9d74df96a073fc4528f15af6fdc634a31b51fa9736
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk6+yr8ACgkQaC/OocHi7JYIuQD/bV9Lr0tZboE9JA4PlyK3Hm4u
+vpPlkHUcsTWN+H1MqRYA/iJdoaFw5p7Gx4ke6unLnSYRd8i3MmOVmhrBcYF3ZOT8
+=J8dA
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/files/libcap-2.22-no-perl.patch b/sys-libs/libcap/files/libcap-2.22-no-perl.patch
new file mode 100644
index 000000000000..9c29e7efbf38
--- /dev/null
+++ b/sys-libs/libcap/files/libcap-2.22-no-perl.patch
@@ -0,0 +1,54 @@
+From fdd0f3b207785711663f48e0dd3414d90d1f2e86 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 12 Nov 2011 14:24:08 -0500
+Subject: [PATCH] use awk/sed instead of perl for creating header files
+
+More systems should have awk/sed than perl.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libcap/Makefile |   20 ++++++++++++++++----
+ 1 files changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 4762c60..68845e0 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -24,6 +24,8 @@ OBJS=$(addsuffix .o, $(FILES))
+ MINLIBNAME=$(MAJLIBNAME).$(MINOR)
+ GPERF_OUTPUT = _caps_output.gperf
+ CFLAGS += -fPIC
++AWK = awk
++SED = sed
+ 
+ all: $(MINLIBNAME) $(STALIBNAME)
+ 
+@@ -39,11 +41,21 @@ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+ 
+ $(GPERF_OUTPUT): cap_names.list.h
+-	perl -e 'print "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"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
++	(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"; \
++	$(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
++	gperf \
++		--ignore-case \
++		--language=ANSI-C \
++		--readonly \
++		--null-strings \
++		--global-table \
++		--hash-function-name=__cap_hash_name \
++		--lookup-function-name="__cap_lookup_name" \
++		-c -t -m20 $(INDENT) > $@
+ 
+-cap_names.list.h: Makefile $(KERNEL_HEADERS)/linux/capability.h
+-	@echo "=> making $@ from $(KERNEL_HEADERS)/linux/capability.h"
+-	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(KERNEL_HEADERS)/linux/capability.h | fgrep -v 0x > $@
++cap_names.list.h: $(KERNEL_HEADERS)/linux/capability.h Makefile
++	@echo "=> making $@ from $<"
++	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $< > $@
+ 
+ $(STALIBNAME): $(OBJS)
+ 	$(AR) rcs $@ $^
+-- 
+1.7.6.1
+
diff --git a/sys-libs/libcap/libcap-2.22.ebuild b/sys-libs/libcap/libcap-2.22.ebuild
index fd2e0ad5383c..808c472a1968 100644
--- a/sys-libs/libcap/libcap-2.22.ebuild
+++ b/sys-libs/libcap/libcap-2.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.7 2011/11/06 23:41:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.8 2011/11/12 19:36:25 vapier Exp $
 
 EAPI="2"
 
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.22-build-system-fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch
 	epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch
 	epatch "${FILESDIR}"/${PN}-2.21-include.patch
 	sed -i \