added prefix support (bug #444724)

Package-Manager: portage-2.2.0_alpha142/cvs/Linux i686
Manifest-Sign-Key: 0xC2000586

3 files changed, 67 insertions, 15 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 31c6ef4451b7..c95ff7458309 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.120 2012/09/23 23:56:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.121 2012/11/26 16:03:15 ottxor Exp $
+
+*libcap-2.22-r1 (26 Nov 2012)
+
+  26 Nov 2012; Christoph Junghans <ottxor@gentoo.org> +libcap-2.22-r1.ebuild:
+  added prefix support (bug #444724)
 
   23 Sep 2012; Mike Frysinger <vapier@gentoo.org>
   files/libcap-2.22-build-system-fixes.patch:
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 0e5ec0d7a11f..7bc7da2728a7 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -16,23 +16,18 @@ EBUILD libcap-2.17.ebuild 1295 SHA256 54ea6cf5fb44e049d786b30578c0f47a5d0b67bd22
 EBUILD libcap-2.19.ebuild 1241 SHA256 8334b3d70bafccfbecac938629acfe6866b5f990a9ae449ec851c2e27a70d3cb SHA512 0a28f2c0e70b95595baf39c3807436945fe6c38c142722d3642b7e52a9638d03fec113a7dc5586aeb85bcce89c5a1fb3811a9154cd2dbb35e5234efd7c6b2d22 WHIRLPOOL 5a106f93a3303ed233bc16c0c671eea83bfeab2bc7757f31a4adaa9787e28f84240352961ef6e59d68396f0535843ca52e07d4b43ceddcd03016f2310eb5e86d
 EBUILD libcap-2.20.ebuild 1255 SHA256 14c38763c45c488e74a49a4399b844ea6e5326e8a189feba5e2650b6e424becd SHA512 4623edc3861e947b3a9a0da631c33a6d4a08e667c03aff9c258a63ecf092cfb36db1dbc4553402ba97e6c4e8e0cc862e331a2a6232dd1982a58dd42376df4f2d WHIRLPOOL 814310ff27914937f4ca26b35b1f7e7ff66c82341ace9e8de379d83e7e9cd1bc6ef531244b66c75e6a6ef3b7aad46acdf7510801ff8229597477dc4626deaa66
 EBUILD libcap-2.21.ebuild 1299 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4b318304bb11290c4939754 SHA512 ffdf2859f2745aedc75a3f6ce09651f0c450eb1e4d049f7d5f24b21937d8a38db4e2a3a6d9b19803b4a41231756e236a18f584fe50b61f5b269011fe42a6c381 WHIRLPOOL c7789d4c0b496bbdd4f1aacf0247a24de139dd2ec909c0743308f1371afe5a4b6f764b9be295f2869fb7a2825a650844c448df1dc3b1290f530108cb338c8672
+EBUILD libcap-2.22-r1.ebuild 1521 SHA256 5b5ab1243d0166bfc6b8c14aed8457d4e0bfe9d02044df711c59d4fd4129db13 SHA512 da49020b7e836802daa68841208f3f6e83b06f399c6b81f8a965793f2ebf5c19f5e11638a4434b57420b5b8e9a7775982c2b5d34cca025cf39f1d6d57dc1aba0 WHIRLPOOL 22eb6c16925be41437fe898339957b16a4dadc85d753113d14eb729c8952c596a29e1fb033559139b4b2323d24432542b5f38cec0831fa80a25829dbe854c1d0
 EBUILD libcap-2.22.ebuild 1420 SHA256 64483578a4bf2bdfe178a14ba9e1225fa3608e4dd1a7c12292c90ef3cd403a02 SHA512 7f7946334625f59e6c52a183071d54ee6d07a0f35086f721a91ae4a4fc05ed8cb9eb7e3150432b36a288993efcfcfab02e7152a03a7039917476ab23eeced65d WHIRLPOOL 02a3b1ceacebfc2c9168182d9b6565845a3bac827e4b75618e2df2dc10229ef19d9e5a2f180b6a2be440f0912fe7666ac696990007aa2f06b28ebf378d494c7f
-MISC ChangeLog 16730 SHA256 533b16fb9fb8da079a8c78037cfa0fedbc74686d2b95c16305e2dc6a927ee864 SHA512 66c798d3c9a93fdff473812b513eb81f41e35a9631ec44788c2dae9ed71bfbb2798cd1a60e6e986df19e5b65b8cb8d0bed10a0b8007d977186831cc9acaf0bbe WHIRLPOOL c2594fdcf9b8f82aa8df2a3c108706895bddcbecc4476316299f6409561244d8a6eda2157ffa0c6817e0b1aa7e94732cbda74cc4a5806598b7672fb9f8cce179
+MISC ChangeLog 16877 SHA256 c85817b46d93cfe2695ae64aa7270f72def306831925a3853e9324e8c88b3e15 SHA512 79ef5c4e0defc61402b2c3fad840c39178c2a24b82446b4cbf0e762f84509d3c5d0da19579ef2fd0804d8da4aa63cec15a9bb2714a6ed72f3766cf1178c4d426 WHIRLPOOL d315d2e9dd22e713086a10ef3666f1902ca8702cbc8e85070d9573df6aa971219d4762de3484cb332f8cd2d29b28ceaa583ecea2d542fb8571e3ee7b0f694b96
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQX6HEAAoJELEHsLL7fEFWTOIQAKdj/24pY9Ut+kI8wmYtdtBD
-EjAWDQsAEYcVEHJwQiV857iq8OI9EZTpFe9jxwXfaOrCOKzWVaPVPG6l16LpRDuo
-6Q5GdVWi3VncKUHiq7YT47Afp/hEAqGTVKuRsLt3EYgLss1zMS5jRTCNAdIa/YO1
-ZFXgYkvrDqLKQageIvf2QNEOsOoY7gAZUWW8pdRae/lDpUsYj7qWOSBvsacZzSZY
-OxOxkKcRpkoOJmxY1vfjitozhUbBU4BERZvXmNHEzJ9b7BOam365kqCggjVr9jZY
-nNEfO/V8gExsNdumJBEsMHdLjRbK05R14Ct7JOVDXkXxFL2+zQ2wQF3+tjCTOlnq
-abBwXau6gwBd40i7NA+PdHFEuTAobhsiW5wS72lmrr8N0yzouDHcYYgZqaS9ge3Y
-jbSfBwtqWPnP6f9cvn5xqxpEtCeM0kxbabZ8rr3kUqE6tYpKcJTkOt/pu1xcib55
-cMpIApQyakDMoqU6UesdJe5M0wECFGtfIX8nHRB8mcKq9PWGJKhW5cvWwNyhlVAr
-lz4HKg6yj0FTf/dnPIpOnXLpTOiGKpQB562/5UX1GSiSszmgPkAE5hKBFTU5betN
-ZKhUyO0KIqa+RYTSPnVP+vxlUXfk79fLuPtgw2maPr4tdXYox+qoacTTeWuWR4rV
-SZ3tgdWf4sf163CFQkyX
-=rqz1
+iQEcBAEBCAAGBQJQs5LFAAoJEOeBhlrCAAWGyyoH/RwzmaCha0yqKfZBwusdk6av
+yMvC2N0C3ieAQ18Y0MWSiY1NkcU2h1kfabKDr4qZFY6sKyxy8lu4ciX5zQQsWy56
+g15RzomPvkhDbE9zrbX+zpE7vz3PbFHhDqPeafQmfNHC9d19ojlIhUAQJTaJeipe
+rK1VQr/fYREGhthI+n30y0q2R9/LQYYtnA/vCtTzuem2TdVxStlcXCk+Bj4zna7c
+3ZfCfPiVmQNMxaVWewxuW5Yx/qWLUHxffnQ36PTRmju0R8/+NZAFx9k+pSOkCspe
+r7uuQ1vPDrEknBLJ0sMWR3nwL7wOf2htBgB5NINqXpNtiYzkbY7ikXpSjmtsEwA=
+=dXYs
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/libcap-2.22-r1.ebuild b/sys-libs/libcap/libcap-2.22-r1.ebuild
new file mode 100644
index 000000000000..31436c9256c7
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.22-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22-r1.ebuild,v 1.1 2012/11/26 16:03:15 ottxor Exp $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs pam
+
+DESCRIPTION="POSIX 1003.1e capabilities"
+HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
+SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap${PV:0:1}/${P}.tar.bz2"
+
+# it's available under either of the licenses
+LICENSE="|| ( GPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="pam"
+
+RDEPEND="sys-apps/attr
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+
+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 \
+		-e "/^PAM_CAP/s:=.*:=$(usex pam):" \
+		-e '/^DYNAMIC/s:=.*:=yes:' \
+		-e "/^lib=/s:=.*:=/usr/$(get_libdir):" \
+		Make.Rules
+}
+
+src_configure() {
+	tc-export_build_env BUILD_CC
+	tc-export CC AR RANLIB
+}
+
+src_install() {
+	# no configure, needs explicit install line #444724#c3
+	emake install DESTDIR="${ED}"
+
+	gen_usr_ldscript -a cap
+
+	rm -rf "${ED}"/usr/$(get_libdir)/security
+	dopammod pam_cap/pam_cap.so
+	dopamsecurity '' pam_cap/capability.conf
+
+	dodoc CHANGELOG README doc/capability.notes
+}