From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1058399-garchives=archives.gentoo.org@lists.gentoo.org>
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 720C7138334
for <garchives@archives.gentoo.org>; Fri, 23 Nov 2018 08:34:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 34F07E0884;
Fri, 23 Nov 2018 08:34:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 E4D5EE0884
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 08:34:35 +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 E8229335CDD
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 08:34:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C6A1442
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Nov 2018 08:34:32 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
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" <polynomial-c@gentoo.org>
Message-ID: <1542962052.d974487bb60c61987c4e4490e615b8fc8963586e.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.26-r1.ebuild sys-libs/libcap/libcap-2.26-r2.ebuild sys-libs/libcap/libcap-2.26.ebuild
X-VCS-Directories: sys-libs/libcap/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: d974487bb60c61987c4e4490e615b8fc8963586e
X-VCS-Branch: master
Date: Fri, 23 Nov 2018 08:34:32 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5c34ab77-3e3f-4ec1-9d6f-acee4df2d5db
X-Archives-Hash: 00414cc35beea3092b0d00710164310a
commit: d974487bb60c61987c4e4490e615b8fc8963586e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 08:34:12 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 08:34:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d974487b
sys-libs/libcap: Revbump to restopre previous install locations
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
...libcap-2.26-r1.ebuild => libcap-2.26-r2.ebuild} | 2 +-
sys-libs/libcap/libcap-2.26.ebuild | 78 ----------------------
2 files changed, 1 insertion(+), 79 deletions(-)
diff --git a/sys-libs/libcap/libcap-2.26-r1.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
similarity index 98%
rename from sys-libs/libcap/libcap-2.26-r1.ebuild
rename to sys-libs/libcap/libcap-2.26-r2.ebuild
index 6840c717a14..5e2452d4a65 100644
--- a/sys-libs/libcap/libcap-2.26-r1.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
run_emake() {
local args=(
- prefix="${EPREFIX}/usr"
+ lib_prefix="${EPREFIX}/usr"
lib="$(get_libdir)"
PAM_CAP=$(usex pam yes no)
DYNAMIC=yes
diff --git a/sys-libs/libcap/libcap-2.26.ebuild b/sys-libs/libcap/libcap-2.26.ebuild
deleted file mode 100644
index 3a944d5dc0c..00000000000
--- a/sys-libs/libcap/libcap-2.26.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib multilib-minimal toolchain-funcs pam
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
-SRC_URI="mirror://kernel/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="pam static-libs"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable. #604802
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
- pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers"
-
-# Requires test suite being run as root (via sudo)
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.25-build-system-fixes.patch
- "${FILESDIR}"/${PN}-2.26-no-perl.patch
- "${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
- "${FILESDIR}"/${PN}-2.21-include.patch
-)
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- sed -i \
- -e "/^PAM_CAP/s:=.*:=$(multilib_native_usex pam yes no):" \
- -e '/^DYNAMIC/s:=.*:=yes:' \
- -e '/^lib_prefix=/s:=.*:=$(prefix):' \
- -e "/^lib=/s:=.*:=$(get_libdir):" \
- Make.Rules
-}
-
-multilib_src_compile() {
- tc-export AR CC RANLIB
- local BUILD_CC
- tc-export_build_env BUILD_CC
-
- default
-}
-
-multilib_src_install() {
- # no configure, needs explicit install line #444724#c3
- emake install DESTDIR="${ED}"
-
- gen_usr_ldscript -a cap
- if ! use static-libs ; then
- 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
- fi
-}
-
-multilib_src_install_all() {
- dodoc CHANGELOG README doc/capability.notes
-}