Trim spurious pam lib in /usr, and touchup ebuild.

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

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 9e80dea399cfa677812a07624599530c33415edb..55c051edeac23fbd3afe5ee81de5eb51e7baf352 100644 (file)
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,9 @@
 # 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.110 2011/11/03 10:16:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.111 2011/11/05 22:47:20 vapier Exp $
+
+  05 Nov 2011; Mike Frysinger <vapier@gentoo.org> libcap-2.22.ebuild:
+  Trim spurious pam lib in /usr, and touchup ebuild.
 
   03 Nov 2011; Tony Vroon <chainsaw@gentoo.org> libcap-2.22.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index f4995b9fc4d7b2a01b4956dd176b6b0b4a58578d..db6d9a4b99a0613b41c61183db40c39789b8ee62 100644 (file)
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -15,13 +15,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 1302 RMD160 f07ff4dd4057fde2718f0fb49f1904eaa6723d17 SHA1 d56a578dae91b12d00b0929878709e5693bf6bb7 SHA256 5ad8e2213495f2b4af698ed94e91ee335878d4a56d80f9cd36769f8e20612ae7
-MISC ChangeLog 15534 RMD160 74b54e1fa8eb9c22960c92440cdb42aef1709d42 SHA1 118f2c3abd993c8ea4cfe1e5c70d6a43ad720c82 SHA256 8ccf193ead3077e48824bcc609acd8951c786b420bc91fb3c9749158755bdb71
+EBUILD libcap-2.22.ebuild 1308 RMD160 4c6fff65ea68301c0c8642735ade2efbbf106de1 SHA1 f4eb1e1b4fcc8ab441fb3b66a9273052f1ada35b SHA256 6f84fb43f711791d06b0f2d611ac85253c7bd9ee5070f6492de644fc8fbc5a0a
+MISC ChangeLog 15656 RMD160 c3fe84db4bf068567da93355f90f91a17e9d945d SHA1 1115ab140a1aa41322ce0e714228da95bbc410b9 SHA256 3e2eb899d4196d57df02a1a676bda83beee166fe94a75250bae7c58b724b7042
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6yag0ACgkQp5vW4rUFj5rxZgCZAaYQOEjDyGlqdVi2dHpqRhS2
-gGQAoIHtqAtl5b/g4+/Ai4oaE/MKA0qa
-=ysDX
+iF4EAREIAAYFAk61vQcACgkQaC/OocHi7JZ1lAD+JfOT6g4RDwmBnINoCoq7clmk
+Iq4DhJPxF+OaFBqpLdMA/iZ0KaOz7lsrBdOmOgl6JUYFlB1yHQrsJ/KMH3Rm2Jzb
+=7jKs
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/libcap/libcap-2.22.ebuild b/sys-libs/libcap/libcap-2.22.ebuild
index 00e35413bb28dc1feb7fb088c754daee5c9533e5..829ce5a2a38580bd3ef90462217fd8dfeff490fb 100644 (file)
--- 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.3 2011/11/03 10:16:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.22.ebuild,v 1.4 2011/11/05 22:47:20 vapier Exp $
 
 EAPI="2"
 
@@ -25,15 +25,14 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch
        epatch "${FILESDIR}"/${PN}-2.21-include.patch
        sed -i \
-               -e "/^PAM_CAP/s:=.*:=$(use pam && echo yes || echo no):" \
+               -e "/^PAM_CAP/s:=.*:=$(usex pam):" \
                -e '/^DYNAMIC/s:=.*:=yes:' \
                -e "/^lib=/s:=.*:=/usr/$(get_libdir):" \
                Make.Rules
 }
 
-src_compile() {
+src_configure() {
        tc-export BUILD_CC CC AR RANLIB
-       emake || die
 }
 
 src_install() {
@@ -41,6 +40,7 @@ src_install() {
 
        gen_usr_ldscript -a cap
 
+       rm -rf "${D}"/usr/$(get_libdir)/security
        dopammod pam_cap/pam_cap.so
        dopamsecurity '' pam_cap/capability.conf