Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/
Date: Wed, 21 Nov 2018 11:35:21
Message-Id: 1542800104.ec7adfdc4d71e492ea1a0521c56321a3d70a6d41.floppym@gentoo
1 commit: ec7adfdc4d71e492ea1a0521c56321a3d70a6d41
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 21 11:35:04 2018 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 21 11:35:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7adfdc
7
8 sys-libs/libcap: enable pam for all abis
9
10 Package-Manager: Portage-2.3.51_p14, Repoman-2.3.12_p5
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-libs/libcap/libcap-2.26-r1.ebuild | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/sys-libs/libcap/libcap-2.26-r1.ebuild b/sys-libs/libcap/libcap-2.26-r1.ebuild
17 index ea415972d36..6840c717a14 100644
18 --- a/sys-libs/libcap/libcap-2.26-r1.ebuild
19 +++ b/sys-libs/libcap/libcap-2.26-r1.ebuild
20 @@ -18,7 +18,7 @@ IUSE="pam static-libs"
21 # While the build system optionally uses gperf, we don't DEPEND on it because
22 # the build automatically falls back when it's unavailable. #604802
23 RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
24 - pam? ( virtual/pam )"
25 + pam? ( virtual/pam[${MULTILIB_USEDEP}] )"
26 DEPEND="${RDEPEND}
27 sys-kernel/linux-headers"
28
29 @@ -41,7 +41,7 @@ run_emake() {
30 local args=(
31 prefix="${EPREFIX}/usr"
32 lib="$(get_libdir)"
33 - PAM_CAP=$(multilib_native_usex pam yes no)
34 + PAM_CAP=$(usex pam yes no)
35 DYNAMIC=yes
36 )
37 emake "${args[@]}" "$@"
38 @@ -68,7 +68,7 @@ multilib_src_install() {
39 rm -r "${ED%/}"/usr/$(get_libdir)/security || die
40 fi
41
42 - if multilib_is_native_abi && use pam; then
43 + if use pam; then
44 dopammod pam_cap/pam_cap.so
45 dopamsecurity '' pam_cap/capability.conf
46 fi