Fix fcaps usage

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xD7DFA8D318FA9AEF!

4 files changed, 30 insertions, 18 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 46558b235fa3..1012a1f96cc6 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.193 2013/02/25 15:07:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.194 2013/02/26 05:49:10 cardoe Exp $
+
+  26 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.2-r4.ebuild,
+  qemu-1.4.0.ebuild:
+  Fix fcaps usage
 
   25 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.4.0.ebuild:
   Fix patch to virtfs-proxy-helper
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index cfe8578d0eaa..8bc2e9ef88f7 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -24,23 +24,23 @@ EBUILD qemu-1.1.1-r1.ebuild 12063 SHA256 a3f92888f96d664c0dd26ca257ebce3dd1716c1
 EBUILD qemu-1.1.2-r2.ebuild 12149 SHA256 b73be920f461c0d416483776750668ce68deb4214049a29e600b6268a1e6fae2 SHA512 368d8086ec85fddc60189c8e53d9e407f1321a6ac7a98da04d048f436dbd56088eaca3fd77a5888ea8865b4f6a0311d75f82a736ecda5f9ca8e02a2c03931a25 WHIRLPOOL 943f6cb80fc610a4615783e1bd5b3152366ba80877cce142ef00709a5d8461ebee5c2bb975c8b9dca6452075fc810c3e601bb4aee01f6700b7c7aa8c149e8d6e
 EBUILD qemu-1.2.2-r2.ebuild 13797 SHA256 fed8d1598f3f6087029a89b2d263c9c5cb43dc3a451087d4ab7aadc21514d263 SHA512 7d2bec002f0f470bb10d08d54ca133395a68f1d6eb2827211c27f84c05f5282c3a33712b2d657ed3f3bfbc5629dd39d00b6fb1b1dc62410984413919ca57b714 WHIRLPOOL b48726f91f9e92cbd648661c60be64208c260da05651591863292b7f3ee91f7fa0f791d46c3e3b19be2b533b92b795741cb358de8c2a694477c94d2f23f6aacf
 EBUILD qemu-1.2.2-r3.ebuild 15167 SHA256 ad0e4f9f13bf61f92ca545ccbeb89dcd3f51aae9de69154a28c2edad46b80a0e SHA512 824bb2abf45545f1af34172dd06dc3f5e6645c06b7ccf1fa0837defe79e917b7d1a9580fb4d2ff0278f5f27adc2669e405f3a05f9b312c9dc1d7acf9b4508e3e WHIRLPOOL 0ce5fe9098e73399840f13a5b3aa5056d56da5855a1539959e7be57d5412ede7b35b4405091903a54b6844505931307853a2932ce0848563d097e5b174e81394
-EBUILD qemu-1.2.2-r4.ebuild 15374 SHA256 cddfd3f042e7e6f438fb082351d4d018f38c760a2e0ccc7a8768f738bd5f56c6 SHA512 16f1cc3d630b8f1c830af07489f946f0eac6bf9665137d20fd6fff80e2f54ed073e7d1e4aff61cd1c514bb82eeb257ec5340030c3e69a6fd34ffd3457bccf3ac WHIRLPOOL 1fb18142842bf62720efe6bed5bd41d9f17b0ecfa326839daec86eadd1c12cd9dae6bc26797481760c6c802c3eb057f14174904de254067ef30d3ab878da97a6
+EBUILD qemu-1.2.2-r4.ebuild 15435 SHA256 80f9d351e31a00ba532c94c36725b692cce9f34b2ecb225724aeb28b176e594d SHA512 a437586b91ca34408f7155b29910f333e37687bbf208956e420b3928a81e419d4896cb0f4be8f7b9996f9b9ca75b0c16cd2d12bd65e43f0963a48ab7676a09ba WHIRLPOOL fca06917b1f47eac932bc6456f6b16ac23075d2e9b32f31fbd27d1207ce0e24c0e5adff66c1ac1a4f15a5827036e9a85ef12f7bea0f97867361da67022252779
 EBUILD qemu-1.3.0.ebuild 13711 SHA256 bda7012b27a54fc2cc0d0bb800a9192226237ab0fd04279304dea2bc15f5a9b9 SHA512 fd149229fd46f829490331cf48abf46e9ea1c59992d1bd7c4350ce7d1a70bcb4f7ffc14923130ad974ae9124a468cfafa6f746020f4c0e034d8ea50810681076 WHIRLPOOL 1ba4505219a2c28f14b303adae83b4474a40c424eae06b7ec2b0d20a12d14600251f495bb18e6bee498b4d51304a1675d3c7b61b8f959bbd8cf63757b21b1ed6
 EBUILD qemu-1.3.1.ebuild 14978 SHA256 e2e24c04443a2358b8c3ca6c9b02ad1db034423a7c08017c21d533c0298dc3d1 SHA512 90d7827fa5dd4ab96edf6c878cef7276bc9931cdca6c02d96d038f338c8f029d77c2323e67bce13b5d428af840d5d79d18071cbc49c00a52af723c7debbc1cfa WHIRLPOOL a6cbfb4fa295aa27c952c3ac1888263ccd99a2328266cb5f5977e6236f71cb3ed65e4b38cfd15035f61c434cb9d88b269ba6124dadf31d11823fdb15a521b940
-EBUILD qemu-1.4.0.ebuild 15435 SHA256 0b5a4db96ab6548b132e5270e9d65cd5ac6e35e39796fe6dae2d04bbf99c65ce SHA512 340b67673327520ee340bc06514a4d523bf1132a00b68941e764255ef4082405e7eb3565c1ec5ba2fe8ea6adb470d553ee5ccf27adf8f1fbac280b60899ed030 WHIRLPOOL 56d0e2af7bc51bade60475ae9b983ea4deb5f722ff35839c4dfba0d6a2f5f68ef95f9db1aa9bcbca73a44255113a9ac359ab6ab6c3d5352fdc8a48b6d2443f0d
+EBUILD qemu-1.4.0.ebuild 15500 SHA256 38e5503e2c8e3ccccb2ddcbd23aaf7b9d8b493c2d630d022af3982f235609243 SHA512 8a5cc40a1c5e0866d224ba18c399b09c651d81994109c9ca11cf2cf796a324c54d37887faea4f17faa45e39b5f355646e17d72607b28e54c6fede5422750ab62 WHIRLPOOL a67d3c28a2416ae0f35edba56bba95b551aeeec1547d5fe563cb5beeca12227b6441c8ec695630625779454331cc4fe72086b55a3df9458b42339d7e767052de
 EBUILD qemu-9999.ebuild 13648 SHA256 a694e912dcdb513b833fe629dd836580fdc541b26484d9f33a9da1ede74c86e4 SHA512 f5209038cfd83041bb0479a4c4a80df15e22f321d9ff7f9f543b2bb4b7cf42660fabed8d32cc455aaf3bcaa51fede305ceac933b8489ce7768370e9b560ac1cf WHIRLPOOL 34acbaef26fd45051d37b67767a4b5a686e299c82b005aef0cf542c42efdf54b29cb02b7ff987f7de9ee702eeb3ba4bac4a89d7bcda4b3ab53ca9ace7f9d9e02
-MISC ChangeLog 31490 SHA256 067cb4ad0ed1775c03dc2da72566b18c99e6493674c24dcd53f384b08ecdf46a SHA512 335ce73a0a0561acc0e1c2a3e83fb23b51374980891958b0a04625b85e4347324081d3fd7e6e868781d830d87f7b4a719a3a569772358a4fbd7d39fb7d410e59 WHIRLPOOL 9d9cfe43932d1868d41a61c27d7f0e944cf387722384b6c3438bcaa5d3f46e61a6d1b418acf5495f9fdbb468659a5e2bd273e49a93578c426702ae2cc4883eb6
+MISC ChangeLog 31602 SHA256 4a87bd26dbe08a8d067e987c4cca4fe8734986dbb12c35e633a30f074ee9a77b SHA512 206bc1963921ed7a3b6a3dd59b864214daae8784baa47afe8498cba1eb4802cc4c5afd45c10101980012f5e5ea83004f7334fd9b03b7569934319ddad181f7da WHIRLPOOL 5b02ee18aeb0742df39697259c1aa930260f6da232d1ec49dade80bea4336cfe47c2747ebaf2f6086764b27cdcce56177b2e152dc968ef760a8149a5e57ac22f
 MISC metadata.xml 3027 SHA256 ef8dfb1742c4d0b967dbf6a51d5f98f1722e2c9367ec359a6011b6fa6c4ed15c SHA512 c0cf75fa65e345c585c4947eba980aaacbc9901aa0609b52da90b19a7f675a143517e040294fbf12a0d63d878b667d12335e8305659eb313c67d3d4d024b8f6d WHIRLPOOL 4ecebe7f8390d3bf7e9c8b10e866903b7d7b5b1e31a42995f13886414cc189d6ac25d2e11bd3f1f558ba13938229f2da456cfe1433dd0c99b3b133bccfdb6033
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRK35qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRLEzjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv08sIAKkhFKbmbzOhdqjscVG6XU3v
-hfC61AxH/0saDAKq+z0d3GbbCGFvNo7Snq8LDBRUBg5gNS+L2E8Ipin5XxmujqiJ
-p0yCLfLxkw37wdZCDEpd2SumqCydp21k4ucLGPE5/+fJdzRWSrU3cRZO66SpxRql
-pi2a5jIP481GKpRyFGDNc0h422xwib0putYgimHYtHopgGR74JOxck4ASrIbeC65
-Wm4HomVm+Gbvfn5U60pPDUSbbF/LmcxkBe5Uc4nXgpWqTB86F8Ddft//yZl1LwWb
-RItNMOJUmJ4qsAS+igTe3LRvzfT/WA5oddc/yuOImcjT473Nx+Sz+nygnDXJtIo=
-=lbBg
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvNo4H/jiQ2EexWUljMh2yhPy5Nq7A
+GSUP1PU6olcdzPzxjURRHjKdlyjNyzNaXtT4TXqfI7CbBpBhwjHpbFOteF+PQ/J0
+vdBIT+YX89GWtpXmdncSSDh+IsGQDEyGzOXYeDMlv4MYIHn4z8dz/dvSoONv9nOA
+QuEo/DcJ1JNHF/EZtgADO+c9FQVJc+p2UQB6KanP3DAnNqCF1fo4JRiwvz0rrwW1
+g3fPSkZcAKVNt9jensk4rtlN352xC86s+1EQ2mwaB+KcGopYv/Qxg6ynuc+HIyca
+JslqpGCo2lnc40Ka1eOEhgd8ggvK3BV2s3firPhDU1sFpedcgpb3on9EkQ2vegg=
+=xCg0
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.2.2-r4.ebuild b/app-emulation/qemu/qemu-1.2.2-r4.ebuild
index 79e4133b7ae9..97aac32c0b4a 100644
--- a/app-emulation/qemu/qemu-1.2.2-r4.ebuild
+++ b/app-emulation/qemu/qemu-1.2.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.1 2013/02/25 04:08:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.2.2-r4.ebuild,v 1.2 2013/02/26 05:49:10 cardoe Exp $
 
 EAPI=5
 
@@ -452,6 +452,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	local virtfs_caps=
+
 	if qemu_support_kvm; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
@@ -465,9 +467,11 @@ pkg_postinst() {
 		elog
 	fi
 
+	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid"
+	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
-		cap_setgid cap_mknod cap_setuid /usr/libexec/virtfs-proxy-helper
+	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
 
 	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
 	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
diff --git a/app-emulation/qemu/qemu-1.4.0.ebuild b/app-emulation/qemu/qemu-1.4.0.ebuild
index 5d68490a9546..8c7313ec6216 100644
--- a/app-emulation/qemu/qemu-1.4.0.ebuild
+++ b/app-emulation/qemu/qemu-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.5 2013/02/25 15:07:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.4.0.ebuild,v 1.6 2013/02/26 05:49:10 cardoe Exp $
 
 EAPI=5
 
@@ -451,6 +451,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	local virtfs_caps=
+
 	if qemu_support_kvm; then
 		elog "If you don't have kvm compiled into the kernel, make sure you have"
 		elog "the kernel module loaded before running kvm. The easiest way to"
@@ -464,9 +466,11 @@ pkg_postinst() {
 		elog
 	fi
 
+	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid"
+	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
 	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps cap_chown cap_dac_override cap_fowner cap_fsetid \
-		cap_setgid cap_mknod cap_setuid /usr/bin/virtfs-proxy-helper
+	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
 
 	elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
 	elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."