Fix install of pkg-config files #550730 by Martin Jansa.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 93 insertions, 15 deletions

diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog
index 336ac144e59a..84e514975955 100644
--- a/sys-libs/libcap/ChangeLog
+++ b/sys-libs/libcap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libcap
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.139 2015/05/25 02:35:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.140 2015/05/29 17:31:28 vapier Exp $
+
+*libcap-2.24-r1 (29 May 2015)
+
+  29 May 2015; Mike Frysinger <vapier@gentoo.org> +libcap-2.24-r1.ebuild:
+  Fix install of pkg-config files #550730 by Martin Jansa.
 
 *libcap-2.24 (25 May 2015)
 
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 380f1fab8549..cb4609580f8d 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -21,23 +21,24 @@ EBUILD libcap-2.21.ebuild 1299 SHA256 db3f1beac4841be548fb653eed670c7562816f3eb4
 EBUILD libcap-2.22-r1.ebuild 1491 SHA256 c4f6e82a96c0abc001b5c91dcd0e7bb6a33c6ad88fc992ab523fff7e55ea7a09 SHA512 6017d2e908b8f3cd20d80eace382855cbe7fef9ae18f35f114d8fb3d24fe64ef122435180b4d942289638f9f8d590aacc4f86d8a11adcbf6b6454e53bac86bd2 WHIRLPOOL 95887935fcd9f345b17f22bc11defc918fd80e1c5a6a597a7a3e17b446e11f65649d4aa93ccc38ed76731e7ba44f4a9ce31407fbdb2d53d01340b5a611beed25
 EBUILD libcap-2.22-r2.ebuild 1784 SHA256 6a3be4b46a5f53aabb5694dc5647fc791cba5da81abba430d4c24f78727dcc45 SHA512 b18bb4409379fedf07e0aa87d47d3283fadb6a61c23d0476fc38150cc31068344a1bec52e5286ce5a85185a1735fbb0515506d8b12a8502ae849c292f9697f32 WHIRLPOOL 378aee18dbe76afd7b3f9606f59864e478a8ad49fc12e50bae43157cf25446558994094e71f1531405d54dbd6ce1083c938727de234a70581ab00a13cb2ccd19
 EBUILD libcap-2.22.ebuild 1378 SHA256 b12f31434c4699323601597a5dd6b6d18b87c4a2e60e82e04e58ec64c8eda83b SHA512 408d78f78d9c1174fdbaddbf61f5388bbca6aa404bc1e7e1eb891120af82e376a0e50bf0cca17ab5697ae0b007f62e80a8637e1435c1d2f82bc99f941f1d29d1 WHIRLPOOL 8640b7f1887bbf4d4f8612dd68272f685d0c08596f179bc04d6565ff61ec0621ec774bcf0f3efd60c2e5c8f77428e3b36afda467f163caee5d4bb61ea0f5f46f
+EBUILD libcap-2.24-r1.ebuild 1952 SHA256 e23ab190c71f9afbd93c3d978bfb3798f21606fe83ff90e210f82b7a468fa3bf SHA512 95160b7f1c594aa86d678ef2e6336a5eeb3466638a5bdffa9b6ded4ccd6b3d35f6220fe2aab3601ad3d37ed3505c6ebf64c81daa0987eb5bdaa10225c4c93fbf WHIRLPOOL b5405eb55e72091acd09202c4a7e20191797e785de6efc7ce241811dc34e822661f7c8cf7cfb51e8765360b44844bb9a26ab6226b6ca4c4bff1d0d659b29775a
 EBUILD libcap-2.24.ebuild 1913 SHA256 21f213d033891b775b4d26f4d7aacf5426fd5621af0de55225bbbb724201cb0f SHA512 f93736ab52750aaf5aabf1f4a4230645e8f27e4035a7f495e392c849296bb3260c023b1b1ecf6964e1774010fb777caa3916c4126f220b4d32ef07723df0a03e WHIRLPOOL 54503874ff0fd10fb8f93c69468f395541ee998e7e41b905bc7b6d1498c6b2fa5a75d20df134d9d81e5cc05fe2f67519f30daad314dc1356669c382a974e7f9b
-MISC ChangeLog 19292 SHA256 ead174446c023cc339bd6692b364818d7ecc1552742b7d778da62816af3e783e SHA512 124c2c44c5dd73f4f259c52e665fe963f9b734f0811768b150c520e52083714198f016227ad0ca62ad620ec648b309b8c2654666e3f9fe3891da4ffe6eed5a59 WHIRLPOOL 6384ef329e9f55cb53a05e25455bdbc7b4b78c62107c48c24a0f29a7f56823a82dc13dcc0ee75fd82a2e027076176544290ee77549c8226b4d1107de664cf945
+MISC ChangeLog 19457 SHA256 d4fc0e2f968fb026973067afdad1a13c9c56c826fa82b4d6413c800ebbe4b313 SHA512 8885aea19a6e64db96a7a6537b963c1e0e68bf70df0324dd23f0b2e1c3861a388e84d07e13bd706945f9d06092d21be116428661a52696722c6f108fb4d7f5b0 WHIRLPOOL 52233f299ec8bb802a6f3addbedb0bb183f49a8d7a8939dbe81054c445749c9e1e1d4a8e871c0ded18d3971cecdd1537d5aa7e46e0ffa76fdc307b3833868d07
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVYophAAoJEPGu1DbS6WIA9B4P/i3rwNBhaS3t0CN6R1EldWB/
-eo+vs+h+kpLfRSRItab7NUuWI4fygNVdqSXA1o6hhgxch/clrXI2XhpwufCzrx1i
-7GE9OW6vrczjgZl5qFOmoB3MjkkrFU6R8JTOHloWP7/uZOYDfq5PiBIxBYj7Cq5Q
-D5Bzugtbgq9HO43VRKnj5q3qKPXjeoWlL0XPX2SR30YC1BcQ3eSTSXoeD/umulIK
-Wb1jhgc3pasKOFkh9XTnMRCPEKvr8MtblmCJ9sC963MZLOeau3ZjiL57D0m4DUmU
-w4lPmoAEeaT9vxaTkGsEOflWJyOdAjvSU6QHJJk3zok1/+XXPCHaUBjMZ5Uz1But
-LJybDaaOfmzdcS/RJkD0bNMqGm83t5S32XXGZx4H00+cNZtkH/EgPrY55ZJrYefV
-zo0uaZsmjxThah9vYLdcDNpoFYQJRvzxw+4/ZwfLGtCbPfvMy23doLEo1QQVXMeS
-0gmV0/iZS1ZebJIpKma9PVZOi+zBWfH22BOCuN3HJbeeipuKXQdzylppUBW69rH5
-u4yVYsRRJZkmcRmd16MagarAtRderV0hQOVz06zDUUK+LzkhluTKRVnJG3skavS1
-QnnfQShJ1QRR4dbVXIAa7m55B+PkuOKB1i6bTgS3MP58yGyalgpyb6nlcV3BDVBk
-F1aWLw8WoKrW7g57yKmt
-=c4ZY
+iQIcBAEBCAAGBQJVaKJwAAoJEPGu1DbS6WIA2twP/3UuBPI3UIhyFQCJwdU9UBko
+r92D3KAC55cmyyByDgNROvw+QfnF4V3H48Vrm7onVcgZFuBvSn8uAFUtFRELER3Z
+pfG9vKaQAb1hwOZtKn0WrHwwPx0UKopfvmgTa8ihpIVjltKeHi30guX1ynSqVZPd
+3OXHArRdUYMDjKQUwe2qJOAuhbyBfuTWpN/LFqp4RHzItaPg1DhAgRfiU/1Fg9OB
+sjs8k1ZgRHQm1CPZtumfVxQbb6gLYTRKwLo4xiygYKdL5xdNEHAXjdAAzqKDTgdu
+N5ZgaJg5xArWzsa35EbWCToG+QnC8ukO+GhX3B18IOwUStPB1ceHPgLAlcvXBpLL
+haVNgoZ6VQcYejBjjQDR8avfneVy1O84wkEdPHaO9andVci1hvcOoZWYCe/9Xmrx
+AByRDEFXG8O1f3GRcnZV9BUnwcYGKiusM2olu8/9RARg0K0fAEJ7NH4wTXO/mihM
+PyTr6OPwW9LwL2ad0HKue37kJouRxId4JknZlh2bDkkgqVp7fHZzYOoEQhHCbB17
+xY54ELQYhtHqP556TBHy6DSV+XAjGM7LjDGms/bqzhWNQgTiGT+HivwwtqW5WOQU
+HQlKx1/9bFS5Dm5eygr2ONaNQBxL6Floyth+dJanPTStfHFIyPLYO299X+R+E4NE
+QsuzTjCi+X7V1OATIAFF
+=nDec
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libcap/libcap-2.24-r1.ebuild b/sys-libs/libcap/libcap-2.24-r1.ebuild
new file mode 100644
index 000000000000..b1613ba11fa9
--- /dev/null
+++ b/sys-libs/libcap/libcap-2.24-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-2.24-r1.ebuild,v 1.1 2015/05/29 17:31:28 vapier Exp $
+
+EAPI="4"
+
+inherit eutils 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 ~ia64-linux ~x86-linux"
+IUSE="pam static-libs"
+
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.24-build-system-fixes.patch
+	epatch "${FILESDIR}"/${PN}-2.22-no-perl.patch
+	epatch "${FILESDIR}"/${PN}-2.20-ignore-RAISE_SETFCAP-install-failures.patch
+	epatch "${FILESDIR}"/${PN}-2.21-include.patch
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local pam
+	if multilib_is_native_abi && use pam; then
+		pam=yes
+	else
+		pam=no
+	fi
+
+	sed -i \
+		-e "/^PAM_CAP/s:=.*:=${pam}:" \
+		-e '/^DYNAMIC/s:=.*:=yes:' \
+		-e '/^lib_prefix=/s:=.*:=$(prefix):' \
+		-e "/^lib=/s:=.*:=$(get_libdir):" \
+		Make.Rules
+}
+
+multilib_src_compile() {
+	tc-export_build_env BUILD_CC
+	tc-export AR CC RANLIB
+
+	default
+}
+
+multilib_src_install() {
+	# no configure, needs explicit install line #444724#c3
+	emake install DESTDIR="${ED}"
+
+	multilib_is_native_abi && gen_usr_ldscript -a cap
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/libcap.a
+
+	rm -rf "${ED}"/usr/$(get_libdir)/security
+	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
+}