From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71B3A138334 for ; Wed, 4 Jul 2018 20:25:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7391AE09DB; Wed, 4 Jul 2018 20:25:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48552E09DB for ; Wed, 4 Jul 2018 20:25:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF532335C7D for ; Wed, 4 Jul 2018 20:25:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0948C2E2 for ; Wed, 4 Jul 2018 20:25:27 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1530735918.639031f4e550cc8f20048d201425d076cd4fbb0f.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcap/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcap/libcap-2.25-r1.ebuild X-VCS-Directories: sys-libs/libcap/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 639031f4e550cc8f20048d201425d076cd4fbb0f X-VCS-Branch: master Date: Wed, 4 Jul 2018 20:25:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 94c394f5-837b-40e5-a809-748c3c42179a X-Archives-Hash: a33ad19660428b9c1bcf64d49eec6a24 commit: 639031f4e550cc8f20048d201425d076cd4fbb0f Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 4 20:25:18 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 4 20:25:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=639031f4 sys-libs/libcap: Fixed broken rm command. Closes: https://bugs.gentoo.org/660370 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sys-libs/libcap/libcap-2.25-r1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-libs/libcap/libcap-2.25-r1.ebuild b/sys-libs/libcap/libcap-2.25-r1.ebuild index 8fd1ee61e27..9213e8d7785 100644 --- a/sys-libs/libcap/libcap-2.25-r1.ebuild +++ b/sys-libs/libcap/libcap-2.25-r1.ebuild @@ -61,6 +61,10 @@ multilib_src_install() { rm "${ED%/}"/usr/$(get_libdir)/libcap.a || die fi + if [[ -d "${ED%/}"/usr/$(get_libdir)/security ]] ; then + rm -r "${ED%/}"/usr/$(get_libdir)/security || die + fi + if multilib_is_native_abi && use pam; then dopammod pam_cap/pam_cap.so dopamsecurity '' pam_cap/capability.conf @@ -68,6 +72,5 @@ multilib_src_install() { } multilib_src_install_all() { - rm -r "${ED%/}"/usr/$(get_libdir)/security || die dodoc CHANGELOG README doc/capability.notes }