Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/
Date: Wed, 04 Jul 2018 20:25:31
Message-Id: 1530735918.639031f4e550cc8f20048d201425d076cd4fbb0f.polynomial-c@gentoo
1 commit: 639031f4e550cc8f20048d201425d076cd4fbb0f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 4 20:25:18 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 4 20:25:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639031f4
7
8 sys-libs/libcap: Fixed broken rm command.
9
10 Closes: https://bugs.gentoo.org/660370
11 Package-Manager: Portage-2.3.41, Repoman-2.3.9
12
13 sys-libs/libcap/libcap-2.25-r1.ebuild | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 diff --git a/sys-libs/libcap/libcap-2.25-r1.ebuild b/sys-libs/libcap/libcap-2.25-r1.ebuild
17 index 8fd1ee61e27..9213e8d7785 100644
18 --- a/sys-libs/libcap/libcap-2.25-r1.ebuild
19 +++ b/sys-libs/libcap/libcap-2.25-r1.ebuild
20 @@ -61,6 +61,10 @@ multilib_src_install() {
21 rm "${ED%/}"/usr/$(get_libdir)/libcap.a || die
22 fi
23
24 + if [[ -d "${ED%/}"/usr/$(get_libdir)/security ]] ; then
25 + rm -r "${ED%/}"/usr/$(get_libdir)/security || die
26 + fi
27 +
28 if multilib_is_native_abi && use pam; then
29 dopammod pam_cap/pam_cap.so
30 dopamsecurity '' pam_cap/capability.conf
31 @@ -68,6 +72,5 @@ multilib_src_install() {
32 }
33
34 multilib_src_install_all() {
35 - rm -r "${ED%/}"/usr/$(get_libdir)/security || die
36 dodoc CHANGELOG README doc/capability.notes
37 }