gentoo resync : 07.07.2018

4 files changed, 82 insertions, 5 deletions

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 33a5d7fbfc49..432d771aa97f 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,5 +1,5 @@
 AUX libcap-2.20-ignore-RAISE_SETFCAP-install-failures.patch 840 BLAKE2B 9d6059a08b40f8ebbb3d21205a7c2427e2d64693e8539e5c372be96cd11ae889af4f6e1302273950427191749c986dd0b8f072cf112134b55708970ca312f1bc SHA512 59936147919f3a8959d87831583df96ab3e1883e58b746f6542cc6430434d2a93c07e79ff7e9fdf9698626aa42e60c6c57981025e46923be76ff2d65720d606c
-AUX libcap-2.21-include.patch 290 BLAKE2B 466e517a394219d0a0b04b4e92e977679372fae31ee0e8467c29815626de70d85123e0ff38725b6305478301d2558f631695c2ca07310c2fc4cce6f6e5b1b849 SHA512 6f4867c64121e1294824a2dc1ac02578c9900cd051aea41d0920f1f65e162e3acec86a42f7e4fa6ee1dff08554fe25bd740951e9dc8a11bf79471229f268cffd
+AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520c4694178aa1d85bf0c48abfca4c77f940b4fbb9bd08464edc31af657960fc41cab71d112ebf3573d1aa1f23148 SHA512 637f5dc2d7ead44a19a57db436ddf7e8afa1b368c72e5520a1ac77633c20b0f9a2af9defdafed1edb7209474798d1bcd236c712a160b5c6920d8864411baefed
 AUX libcap-2.22-no-perl.patch 2360 BLAKE2B f9ef0549a8f2f1f08f3b93e9a4234d8d0188780dc134c4b56cc83b5ca94453f96e10a384de3d9dd24dbab3758376145e96b28ac3c0e04a9e1b46cc0c4f20b0cc SHA512 8c49d829cbae15f28ded70b96bc0715819b13183136d90b64b7b6bfbd85c262f0161d89450579e9b58961c724b34816919d111f839e3f5a7a68427ffe441881d
 AUX libcap-2.24-build-system-fixes.patch 4943 BLAKE2B 5f66815f52b69171794225784e69025037f08796a0bd25ac46bd93477d3e2f471d9e52a53910f45f82f31853abb4dc62cfa03503bbcf7e32e3946745f3f01b7f SHA512 84283f0652f87a8c1f598413d03e8f3aeeb140b322519051df1873933d6d3ac738757e1c7c91ea6efc51548d224149b84d6a1fab0301a655eb609b183bc9e7ba
 AUX libcap-2.24-setcap-errno.patch 1491 BLAKE2B 19a3422b560eb21957f10f512902aeff6cf5b832354a41a4ff24c497bc2189b06197063a26fa089864d573fc6cd6f0f42c0207b627053985fce9417543adfccb SHA512 367037d6c42d07c359e9ee397cbc7431ea05c3d34deea93db1473394decb9f61a2c9de186652fc3a12fb615406ec1a2f4d76eb63c4410c6a2b5f435ece5b05ef
@@ -9,5 +9,6 @@ AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 988 BLAKE2B 63417032
 DIST libcap-2.24.tar.xz 63412 BLAKE2B 9edab6e606f64dcb06eb75160775340ff5ab92a7f5d98957c682d6510aa510a21f6c796af64dfef0090d9c035b94903d86b360635977e55549e51e25b8fa167e SHA512 c062bab936d651a50efa66dcfa51ab3ce4b0881195d23bb32142b5c8044d30e0e2152f3497844ce90c04f909aeffe2d41203efff41972e38758dcca7b653884b
 DIST libcap-2.25.tar.xz 63672 BLAKE2B 205790dea83f15b585e5151814ea520ab1545661d18fa57f36e8c8e597a7c0f0ff1d7b5ccffc36e313eb28606f1e71678233a06896e29cb28e5559b190dd47ed SHA512 c3ab491885292adc171cde542b96f1295e84132febb50112a46575c3bde3a3eb6fcf733f7a756b4b656e013c0abb5ed6571db24799f8c0b23d8f759f992864f9
 EBUILD libcap-2.24-r2.ebuild 1865 BLAKE2B aa257346d0da204ae26fd2f702681e9d207dbd36d72648f049c25c6611262c82ecc0f4580406a361bd20cfa391b49bb8f487f1481c0795018b6d30ed08aa6f6a SHA512 2d0fceabd4131ca6cafd7b2f2d8f27be7cd2a4bc4a0dd7614d0f7212cb3959e4e80705c6431d106542901384be51f4ad57f5c3a14ef06c1ded163b16835cbbc1
-EBUILD libcap-2.25.ebuild 2009 BLAKE2B 9b73d115bff54fe3b03ca1fe995a5aa4f5c9d43d2bddc0546fd61a0cc657a251562ba9d96cf7115d04f89d47d516bf7dea6fe32b049f1fba774c3fba3843eb54 SHA512 f59b50c716e78138bfeff288e82b062f442fdb54ba252846f4f9d6933de5ca138e69e230e6af1dc40ef25a0d31b079e1701fb88d7bd6f8cb11969b8177b4e117
+EBUILD libcap-2.25-r1.ebuild 2025 BLAKE2B 182c4466d857d61166cbce57c6ea3d5885ccd4678b62cb15825210e7994bf6a3a251d745ffb8734308772959b7d60c0f99268ce820345939572fbbd835897d53 SHA512 ee0dd155f13c0f5dc568d9b18ab1ac2ed7de80a15e72f24c033dafb6098ea26cf4166d6c38652a3afae094fe8f6e759eaef2ddc01c32dbbbc016a859ea01509f
+EBUILD libcap-2.25.ebuild 2005 BLAKE2B 7232168d084f724ce15d1668bad525690933567411221f8911ad5397772657ffeeabe4f2b080836022893914afad85a1d2cf2028ff3b2343ad1c2846c1ffe74f SHA512 0190561034775841a2b630a4f51e3f1c11663745a18fe4951f63e2424decb73a2011e83fdb39e78eb26a0ad7460261dec8a5c66fdd65d3d2a19cb64888e2d97e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libcap/files/libcap-2.21-include.patch b/sys-libs/libcap/files/libcap-2.21-include.patch
index 2a534246ee01..8ea6545659e3 100644
--- a/sys-libs/libcap/files/libcap-2.21-include.patch
+++ b/sys-libs/libcap/files/libcap-2.21-include.patch
@@ -1,5 +1,5 @@
---- libcap/libcap.h.org	2011-06-15 07:25:58.912480899 +0200
-+++ libcap/libcap.h	2011-06-15 07:26:16.421329661 +0200
+--- a/libcap/libcap.h
++++ b/libcap/libcap.h
 @@ -13,6 +13,7 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/sys-libs/libcap/libcap-2.25-r1.ebuild b/sys-libs/libcap/libcap-2.25-r1.ebuild
new file mode 100644
index 000000000000..9213e8d77853
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.25-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~arm-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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.25-build-system-fixes.patch
+	"${FILESDIR}"/${PN}-2.22-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() {
+	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
+}
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index 81fb56032a2e..679ea2d23896 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -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 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="pam static-libs"
 
 # While the build system optionally uses gperf, we don't DEPEND on it because