Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist #516874 by Joakim Tjernlund.

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

4 files changed, 32 insertions, 31 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index efb1e0b39267..9182b1d9e37c 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.269 2014/07/29 09:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.270 2014/07/29 10:09:28 vapier Exp $
+
+  29 Jul 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0-r1.ebuild,
+  qemu-9999.ebuild:
+  Do not attempt to set fcaps on virtfs-proxy-helper when it does not exist
+  #516874 by Joakim Tjernlund.
 
   29 Jul 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0-r1.ebuild,
   qemu-9999.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 036d4c66261a..bddf8ac8fe4d 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -32,25 +32,25 @@ EBUILD qemu-1.6.1.ebuild 17742 SHA256 93d4b5c0abe3171f4c3e1836d64f296eb125ef9c1d
 EBUILD qemu-1.6.2.ebuild 17740 SHA256 f41910723e8c7b26351d8f74cfbf76ab4efc26e1d773bafcff6eae81c8caff0a SHA512 a93596e46df82e7aaad430e4458e16c61a43f4860e32e5c7456223b571e13a182b1099bbad3d82eadc3b115b2f40a88b3fac4e80a4ecc6f5f31c27f81523e53e WHIRLPOOL 62b1bfc3cc54bfacc849b8fac63c894dee6c0a6ace4dbec745132accd59f439c2aff0604de33fe57a1ac79b1afebcd4fd7f388506f23988297459e7cb86b0d01
 EBUILD qemu-1.7.0.ebuild 17679 SHA256 beb978b28d6659537cf3728f47e3676e30de84ff16f9b227e4c9cd8289291e7a SHA512 e533f97415e6f3839da4df3f5b7d684beafcfc1e5288949c547b9cb4ca608ae2a7956da54fea9dcc4b233245e62fa962b37ea961de1c96cb17eb6b05087d9a1e WHIRLPOOL 9475909bf46f03445e7a959baa272d42304696fc74d17dd78b12a77db8e10965dbb39468bcaa2095aee6ab39cada2ad4181856dc3d610c4d0200c1f75a70caac
 EBUILD qemu-1.7.1.ebuild 17679 SHA256 5f1210b57f7b0c78f7f800a4945e7a5705bd92ccd7badfd41269034235ef3940 SHA512 2d596e280f3b2c312df5448109534043ce27038529a22cd068c6a5973e44e0f8b955b358883b007c62d3cc02374412d31084e3c2eb55abeb1d55ae23b4d46bf0 WHIRLPOOL 75fd489fab0857a3bd1728a0212c3d6690eb8acb159fb002115e575f1a7747374f1a04696374af830d5a3af6035cde30dbc2ef698c71ffd96a1dd7bb64309ed7
-EBUILD qemu-2.0.0-r1.ebuild 17578 SHA256 d9d1ae1bb76ce32fbf7bfdb4d4be34c5a09605bf8f0b7e92dada766008c4a776 SHA512 85f83a24d43307730a852a92d6540d25f500c95b0fbfa45d1ade547491bfea127b7c6e881f3da18398390805d99ed6eec5a8bbab0591c364e8712a59b8947f5b WHIRLPOOL c617124d8a33a432fa4aae276178fadbc6ff0fd33ee097a49d2df5445a37c55d0d1cd356cc5e0dcf773b589a1bc800492d99752997fdd7d2842fce8b937afc1b
+EBUILD qemu-2.0.0-r1.ebuild 17588 SHA256 621f9495171dfc6735725826f24737dc1c74bb8c335f30875cf2f40f03ed31d1 SHA512 6366bdf7e30ae8f20804e14eac873c2b54f3529e7e3aa7c5945ade6d7e0308544541d97419dce0470a29a1739d3012952afdd2441c71d765d28d036fb3b26b3c WHIRLPOOL 3eb6ad380d5835cc0990d09a793f18a61e10a9c1ecc7ec3a47dfdf0f12dc66fc314e817d288e85cf9cf407c6f9e80441aa0c7df2311da48f9b438a99dc025485
 EBUILD qemu-2.0.0.ebuild 17240 SHA256 24bb08495a885b9310bea53a21cdde76561c598ade9af7a7973562938f93047e SHA512 aa0e6d9e9f669f7b2266d9f207806c61ec44d71ad3c965836f32285dcf9424ccd1e71c0d1b6818c9cd24a082412e60309d6557b03ec687b0b60dc2abbc38051c WHIRLPOOL 5f9644ce1c5ce5410aa2cba8f1f14aa8292607b9d02bbf36b9b7017b46bd42834335ff25d34beff0a9c58126571ccaf5fdb8ea8769ae685f085108c737751c26
-EBUILD qemu-9999.ebuild 17167 SHA256 a2583da42cc1bac67d3c8a452bbd706e0801b8c99bf5dab9133576ac4232b956 SHA512 cc89b401c01ae4fd4229b861e0bcb2072f55b4541a24fa7983db507f4dff0bf3be81ea2e183ad6dc29653e7c2956b10723c0212af735d2105f437b5145ebd535 WHIRLPOOL 0eefe052020a76bfb4ad7d8718acadf4f1d5b2a2d6efdc09967d739ff5db35acba033893838194f3c121334177c78f81342875a3ba5e2860eea5f159e09faa14
-MISC ChangeLog 44458 SHA256 8492e25bf337e7072c4d50b5a7754fffb7b53ba3ef1315ce770752230419637b SHA512 1ea97a9b68426a2640c5c896cc580e01dbd30ae6fdbccc36a099f4d51146ff6cd537ba5da4cb07e5ab678d971786f7b123a0af4561af1f36022abf142de350a5 WHIRLPOOL acf3c46175f7da705a5e92cebd65b0c543146d2ea432e947329acf0903c1cb71c41443cccbbd05a0b6391d808f8206a127f9b3653cbaf2cf869ffa5feb3c4d7b
+EBUILD qemu-9999.ebuild 17177 SHA256 d465469656e5fabf72946bb2bed816a39e0d65175ddb9407a57321e7e0c19cce SHA512 3a3a9fc6dc25722c0f85409627601b689d8d4c68390cc838cf5292771b3e5349df6ade0469b5bbc4a84eddf3dfdfde2ee0c7498af4a0e716f8b81c57e2cfc845 WHIRLPOOL 7ece7bc96a63cb49fffbc40adee389ff8163dc2706193e528cc3cee93de9518d954ab91d502253edaac48ed6a35bbf97277590eb96638497ced13231f4e968f1
+MISC ChangeLog 44658 SHA256 21ef286fa663c31393f7ac1bc6bc8125fa50f92796f91a8d86ab9a759867a1bf SHA512 7ad801700b4b7c5fa81af46d07df146c26a8550c59d0db0fd7de4d4f7b9fc633352ab0e3ee695a558c9cfb0c549ce2b52715e0617d8ffa927d80a6c66aec9d87 WHIRLPOOL 2834e4b68034f02f17334fbc3587505feb28f9b6a305a6de98e17d4595acb56c03193ca741a07458f69c3b8478fd4a4ac16390f58d5022359642b22edcf35253
 MISC metadata.xml 3515 SHA256 dfde4a226457996dfb5cc86ddb77cb1514db7a7d9b1c999db77d313146b6b4df SHA512 c7c6b742cc1be5fe440bcba43693c3b5d30e8039b1f1f5aa2a179af35d18aee05439e48f768b20318e15317a0f0d300cead74ad585b82767c5d51a8e7ec3fffa WHIRLPOOL 96ec11e854a58593a4a29d66404dd10d354cf19608053b60704a7466817c8d677f8c15ba1434d6674bd7f41cf28020ee3e3a412837c62930abb4521a0e57c127
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT125hAAoJEPGu1DbS6WIAyBQQAJKXANLimL+trsFNHseI0cg+
-hENSoTRl4txtApr0ECERffK90VMpuKH94FBm9wYGRgy8ILgz4t6L6Qnjoe4J7GFb
-UJCfVnijufUngpBYmmEyxKtkybWQZ/KQfHUNX/JPL+Q5XuvQJFFvHI/ni7y530GD
-/KkCb2E1pEx3/VYkY+Ix6+Q5rIYJFdZ38DI/zI4V5/uABGF84qWPoswW/+JjEknA
-OMMCORkuueOzsSnDqGq9yBZ2JUqlU8vGTx3sPZZQat5KeKtG7vHa6RbMuL72kCE/
-QXEouOpuYNjgGl63vI09DNSxDsOopU0pS6y7KeeXhX6ty8ej0wF4yUcwgMoT6ViP
-Tv/FGYTfO2GrShs28wBqKrugvishj4wjpvhKoUd4AbZ/NbQg7gBsAXLUmODs8Vyy
-WKPW7p3d2Ui4RIfxImOGbmKzVZLMZ/ediF2maqAwhp4FspIhvTokQDGNelh5Qyw3
-ZxN8An4K6MnLlPlFJaSWwUABaDpENbAdSDQzIFC+Up/ukB8lfn0baFCTiGU5FIX3
-yvwWlD/S8ko/YWUT0jVlWpiTalGkqjjGqMfcjbNfVxTpyWzYN/dOJGu1t/qQSAgC
-tHnnR72dMMEvhPkDIx9z8hC+e/zayiX3LmoTG0yiRO5B77l/w9WeFIhItxDx4OY4
-SiNOWgq0sSdN9XbZIrMi
-=mf5z
+iQIcBAEBCAAGBQJT13LaAAoJEPGu1DbS6WIALDYP/A5y1T8ePQE/cstmI9M9z65d
+/vIsvLkyXeKgzWOombgQajBcWZxSxCMG/M4N1M9cvTJLWdoIp6iwVvHqmo5K+Z7v
+QoPTuzthX3Msr/1moWjWqHz4k2V/XmdgbnleWA4tsmXPgLbLouNvO+BNgdcdo2A8
+oGklfPbVERtSbvuFSsm3V7UCkv8Cz5QGL7ZC4wzt3ELIkZ8vcPXuuYSFD3t2acJO
+JhDvYRUdWYn4Ayfq0EGJBYzueT7V5WnSHPzkIfrK+4ifhGnl2slZ2Odg7Y9u5f6q
+IMvMeFKrrLrlmbCSTebmHhONDr0/iRV8sE6Ogycl4snNC12ILKdSzzQHn3Z3iBaR
+/dWZL1EdGxmVfVVsNKCwk+S0t8Sdglmipk4OfKG6hnWMrcfm9EgyKzgzSOHKO6/1
+1yK1gJiaF1RmXsgmx/OcC5Ucr2smKkQEuHXu+9+NQXiNCYm6XtLC/fCZEJC6L2jN
+KjAlpyi3ZBk99PCtK+m7cZSASbGFZHFcbs3YajRwx3x4uf/6oRe60K7Xot2ThR4y
+WEf0GcmP5RDc1vVrNiyfYGTO1/Y/8mnFfxivhSHWjUZOR+1v2nZZYMYBYf/ymSPg
+AqxMWvTvZZK/T/y7T1YsUnLNOteziYZZqPLLiYaxTieCab7Ltj/vkyl5z1DThN/8
+rj2RNMLcYJzocEuOmXMX
+=PkNs
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-2.0.0-r1.ebuild b/app-emulation/qemu/qemu-2.0.0-r1.ebuild
index 45e9aa8c9d66..263785e91a4e 100644
--- a/app-emulation/qemu/qemu-2.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.6 2014/07/29 09:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.7 2014/07/29 10:09:28 vapier Exp $
 
 EAPI=5
 
@@ -533,8 +533,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	local virtfs_caps=
-
 	if qemu_support_kvm; then
 		readme.gentoo_print_elog
 		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
@@ -554,11 +552,11 @@ pkg_postinst() {
 		fi
 	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 ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
 }
 
 pkg_info() {
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index df254059a679..8bd7a6f20527 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.76 2014/07/29 09:50:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.77 2014/07/29 10:09:28 vapier Exp $
 
 EAPI=5
 
@@ -527,8 +527,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	local virtfs_caps=
-
 	if qemu_support_kvm; then
 		readme.gentoo_print_elog
 		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
@@ -548,11 +546,11 @@ pkg_postinst() {
 		fi
 	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 ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
 }
 
 pkg_info() {