summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-11-05 22:47:20 +0000
committerMike Frysinger <vapier@gentoo.org>2011-11-05 22:47:20 +0000
commita6b0f5b95b504505bf1a288b602e09164ed8729a (patch)
tree36b57e3fdd94bdc9e4c0cb13271c4308d103aac5 /sys-libs/libcap
parentFix CONFIG_CHECK usage to be non-fatal, this package does not build kernel mo... (diff)
downloadgentoo-2-a6b0f5b95b504505bf1a288b602e09164ed8729a.tar.gz
gentoo-2-a6b0f5b95b504505bf1a288b602e09164ed8729a.tar.bz2
gentoo-2-a6b0f5b95b504505bf1a288b602e09164ed8729a.zip
Trim spurious pam lib in /usr, and touchup ebuild.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/ChangeLog5
-rw-r--r--sys-libs/libcap/libcap-2.22.ebuild8
2 files changed, 8 insertions, 5 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 9e80dea399cf..55c051edeac2 100644
--- 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/libcap-2.22.ebuild b/sys-libs/libcap/libcap-2.22.ebuild
index 00e35413bb28..829ce5a2a385 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.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