summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-11-23 09:34:12 +0100
committerLars Wendler <polynomial-c@gentoo.org>2018-11-23 09:34:12 +0100
commitd974487bb60c61987c4e4490e615b8fc8963586e (patch)
treefca6c0d335f6df8a1fbd8dfa54280c0a7b39dde5 /sys-libs/libcap
parentdev-ruby/ruby-macho: fix USE=doc and FEATURES=test (diff)
downloadgentoo-d974487bb60c61987c4e4490e615b8fc8963586e.tar.gz
gentoo-d974487bb60c61987c4e4490e615b8fc8963586e.tar.bz2
gentoo-d974487bb60c61987c4e4490e615b8fc8963586e.zip
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@gentoo.org>
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r--sys-libs/libcap/libcap-2.26-r2.ebuild (renamed from sys-libs/libcap/libcap-2.26-r1.ebuild)2
-rw-r--r--sys-libs/libcap/libcap-2.26.ebuild78
2 files changed, 1 insertions, 79 deletions
diff --git a/sys-libs/libcap/libcap-2.26-r1.ebuild b/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
-}