gentoo resync : 28.04.2019

3 files changed, 24 insertions, 18 deletions

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 64f7ba03a7d9..ff4f3d6a9c19 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,7 +6,8 @@ AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032
 AUX libcap-2.26-no-perl.patch 2483 BLAKE2B 34d20ca017119a40e31e2da64786a93c1d5468558e8dfcfb15f3758b6648aaad38bf333c11b35a2c8c4cb66d823e4daefed93b7073a0a65225fe9ef3494ff9ef SHA512 750a64c7b45fd145a043f29b8262c9f972aa4dcfb76afed9e440365c0e55d67d0103491e67a34f0f24ee580656e2fffd589b46b0c5a04b4c9e05b5dac6bbe994
 DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
-EBUILD libcap-2.25-r1.ebuild 2014 BLAKE2B 4f3f2bf0f68703594aec5d4eccc4e0847deabf68c5d80437b7f99a0a61d7e63c7421d376b23258d9365bb783e7cbf5f703dd8161093969f20bef66accf74b77d SHA512 7858b3d5ac0aedbf9c973c535fa1c36d003a782b6c93e88310dab1f25fe7bd11105a418dc4e0ea0551fa2253a626dbc56bab09f8d08824a076579f9022d7bae7
+DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
 EBUILD libcap-2.25.ebuild 1985 BLAKE2B 9b54adaecef1a90ec278fca89520259164c42cf119a40472d24a000c6123010c561d73ca5bcac50005187cb79a89fe4c480a6b49960eaee4eb120915ff886351 SHA512 8fa3587c008e1acf25283186f49a78484ab70cd41bc2d87161241688ee8b9640623abda097f66d9527f498b030cb113afb1babb3f07041d9b2230fd4ade0c8ad
-EBUILD libcap-2.26-r2.ebuild 2024 BLAKE2B c97af87bad088092a8c0c62f4404e97ab31399e841d2102692e4aae0991e8f24dc46f1add51f65eeff0ab6666ce224c84d3851b97dfa0879d71f2854802c2807 SHA512 119f7b245d448a7da0bcad134534c6c8b79f148d6420940637d00a321fb44ee872f1c0191d4a6578df4c71f07dd39118ab24be911052a0d6090e54f70f9a20b4
+EBUILD libcap-2.26-r2.ebuild 2015 BLAKE2B 75d8068b7a5ceec20066643ca8e9785c08aa3f4b0c08f62dbb67b024ef8646a6b5a049bce12fbdd2ba38e51d0e322a013ce221c11884ee6e489cd43c098c829c SHA512 b4f9c15b6814c152c49bddbac3609d7e362448c3d1fd8094bd04431762dd3106f342b2b172f024d597ed7fd00de22497d75a9605ed78b25c6a536730238f1c57
+EBUILD libcap-2.27.ebuild 2024 BLAKE2B e56f3fdd4867d85ce22ccab9fea80529b665725d0ba9eed53df430fa45b07b29fac6d0925a26de9db2b96b5f6e55ea85a3f3ecef4a203ce08236b1f24f333c12 SHA512 4b4468e008443167b44a351e8ea423c22ad37d49bea729a42e5fecb7bf9cab9bbc5cab9899749f83550929289c64f3d01956b0b1abbfe42a7cf5199de1d028c1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/libcap-2.26-r2.ebuild b/sys-libs/libcap/libcap-2.26-r2.ebuild
index 27c8f7ee0891..696ef6a15500 100644
--- a/sys-libs/libcap/libcap-2.26-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.26-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+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
diff --git a/sys-libs/libcap/libcap-2.25-r1.ebuild b/sys-libs/libcap/libcap-2.27.ebuild
index 0a107305526d..c5f72abafbf2 100644
--- a/sys-libs/libcap/libcap-2.25-r1.ebuild
+++ b/sys-libs/libcap/libcap-2.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,16 +18,18 @@ 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 )"
+	pam? ( virtual/pam[${MULTILIB_USEDEP}] )"
 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.22-no-perl.patch
+	"${FILESDIR}"/${PN}-2.26-no-perl.patch
 	"${FILESDIR}"/${PN}-2.25-ignore-RAISE_SETFCAP-install-failures.patch
 	"${FILESDIR}"/${PN}-2.21-include.patch
-	"${FILESDIR}"/${PN}-2.25-gperf.patch
 )
 
 src_prepare() {
@@ -35,13 +37,16 @@ src_prepare() {
 	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
+run_emake() {
+	local args=(
+		exec_prefix="${EPREFIX}"
+		lib_prefix="${EPREFIX}/usr"
+		lib="$(get_libdir)"
+		prefix="${EPREFIX}/usr"
+		PAM_CAP="$(usex pam yes no)"
+		DYNAMIC=yes
+	)
+	emake "${args[@]}" "$@"
 }
 
 multilib_src_compile() {
@@ -49,12 +54,12 @@ multilib_src_compile() {
 	local BUILD_CC
 	tc-export_build_env BUILD_CC
 
-	default
+	run_emake
 }
 
 multilib_src_install() {
 	# no configure, needs explicit install line #444724#c3
-	emake install DESTDIR="${ED}"
+	run_emake DESTDIR="${D}" install
 
 	gen_usr_ldscript -a cap
 	if ! use static-libs ; then
@@ -65,7 +70,7 @@ multilib_src_install() {
 		rm -r "${ED%/}"/usr/$(get_libdir)/security || die
 	fi
 
-	if multilib_is_native_abi && use pam; then
+	if use pam; then
 		dopammod pam_cap/pam_cap.so
 		dopamsecurity '' pam_cap/capability.conf
 	fi