gentoo resync : 16.04.2018

12 files changed, 22 insertions, 60 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 197074e608b9..96c7455b964e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index e9765e2b4916..caee55c71c42 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -14,7 +14,8 @@ AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47ab
 AUX virtlockd.init-r1 570 BLAKE2B 734d582d867b79649f863504fcd7c87fe3c59569b56b0996a6229d6eebadc9d4c356c10bbcf5637483fbc930d0c50233da4fffa357d423029b3828b7a3be56de SHA512 65a05d406200da9a534df5caa1b9cb2af97f0b03f64e6b4157322975fa754f59ae74fff9ec8301a6c0510e4b75e2b72a78cddf004a76109e18c375e83527cee5
 AUX virtlogd.init-r1 569 BLAKE2B 20df60c23cee575577592d41d1a9913923255633d12de789c036e6085f9e7b4360e017155c61e3688332b493a0e96ffca55753bcc67a33bb877539b80eef81fe SHA512 0a3e083e742f9e0d8206ab9a48c63bbd395bdc24e5551e2cbeddffa3fb576a817b73dbafe646c392a35c354d6b65426a9b6f3ce3dcafc30077715e90684968c1
 DIST libvirt-4.1.0.tar.xz 15046956 BLAKE2B e5d4fb47d6308b2f74d464b8a4b236fcda96ca71357847ce7bc9c787e89111ed99538e9f7815287d14af24db1bc774012682843edc1e067cdf710e82d0b349c9 SHA512 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
+DIST libvirt-4.2.0.tar.xz 15180120 BLAKE2B 0df6caef7f377e627a7ca1d169e1c8032d02fdfb5cc32a3036fbedd021063672114fcef09aa34e7218b56eef0fe64509024fbcd674a0c5f312a7afb9aa3e34a5 SHA512 ced3a7408e95f1663deec03b095780d0f805126506a064a11063d1f313f923eb0ff0ea95f99826514d8cb4e51c850f6f02904e06e5ef8106c38898a0cfe7f9ed
 EBUILD libvirt-4.1.0-r3.ebuild 9688 BLAKE2B 7990f26444badc344ffc9faab1d55c2accc06709d02e8318d37b9975035494b0e971e272ee0482b0c756a2cfed92699bbdc323e2f13dcd24041c3d15949b1a25 SHA512 5dcfa2c9118eb07f0732ea3ecb6af40fb4517300efd1cc2e1f36efc682469a7b97eb08dfae552e34cc93e58a297c5ed652f0eb99b7047ae3b3976490e929c045
-EBUILD libvirt-4.1.0.ebuild 9678 BLAKE2B 4b2a697630bcda1b28eaf9d43c8f441fe905e7612da11502a2ef5452b733f15ffd2b47d47a8afbfe1cfa956a780abe354dca43ff2a5d85a6123c7b92c87ccbea SHA512 0fbe6b67c6c74fac74bbcc91451c18d1cdbcd52424352570c96f32972fdd6b0d9bc5f46a265b1e26afa432c69e9c4d9e41dae85dea4ec56ba3e1e121ccec58b6
+EBUILD libvirt-4.2.0.ebuild 9628 BLAKE2B 74587b56782f61502d0bb78e1517417bdc90951d6591e6b59e55cf1f346e8d903a2efc089094d51ba7585afeb44094b3c32fde19cb869c6be240717d870e2b52 SHA512 5329a60f625950e012d1f60a29b2f3b82757f023bd375639e54c87065e07fc47c6e8ff14e8afd4be978c25aa8905aae6f5a6e850c86bc4c2f03f4fa9adea7856
 EBUILD libvirt-9999.ebuild 9845 BLAKE2B 6088d0682f657ce4b8137c7dbe28f325eb3814519383958cc558db8a0e8433d4f3c73a688174d6c9bf02d67d5f1e23f8951093d67288d24e89ce13a7d907cec7 SHA512 a895edde185daea93df3e1ffcd193724c796b72ee7eb6a8f4054c894ae8b14a91b45018eb0b0ee2b039d74a47be31ee95188fc0766552605d8bcdec6bc04b568
 MISC metadata.xml 3766 BLAKE2B 38d8b1dfb815871ca19c35c80ab390a422e1833b6ef09c6691889d5d6c01e25bb9fb5d187231456c443cb22764583312a56ed8e1a772f810b58050752ba9f2de SHA512 10d96f652bdcf32e34ea415a37de0c3c4aae3a716403a0ca73228af640788734119cbf4ade26a450cc3cda81ef6182391a6f590a851a6834d52394b7c81c49ed
diff --git a/app-emulation/libvirt/libvirt-4.1.0.ebuild b/app-emulation/libvirt/libvirt-4.2.0.ebuild
index deed4ffd7dbc..d93ae1d82cad 100644
--- a/app-emulation/libvirt/libvirt-4.1.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.2.0.ebuild
@@ -18,7 +18,7 @@ else
 	else
 		SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
 	fi
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SLOT="0/${PV}"
 fi
 
@@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.0-do_not_use_sysconf.patch
+	"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
 	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
 	"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
@@ -337,9 +337,7 @@ src_install() {
 	# Remove bogus, empty directories. They are either not used, or
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var/cache
-	rm -rf "${D}"/var/run
-	rm -rf "${D}"/var/log
+	rm -rf "${D}"/var
 
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 1182482c056c..bd3a8b6a4ae7 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -19,5 +19,5 @@ EBUILD lxc-1.0.11.ebuild 5899 BLAKE2B 015dd027c8ac9e51f7f93a0fe6e82ac66122929179
 EBUILD lxc-1.0.8.ebuild 5932 BLAKE2B f8f4843c5da5405e69ebee0b3c5e1d50057d15baa841f4b20edf8acc22cc6f761d1723fe1f9cac93b4129ce10ab5eec0c52c44172dd724f0f2c65d24e293e7e1 SHA512 6af1e114ecc64264eafb85e77fba744e4b8dfdf19c8d2b769959d642df237e29813f71bcf370ea75685cb728592c6b9f9a9637d0b4b00f13d40ee8c110045619
 EBUILD lxc-2.0.7.ebuild 6343 BLAKE2B 9b93d611f9ab364779579bbab92b0e11245f2df2bce41e2c0aa87dc3886278eda9d41466c8922cbc587bbb34933341e6afd26ed675df1571504629d2176c1814 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f
 EBUILD lxc-2.0.9.ebuild 6597 BLAKE2B 33bef88cb3a507674824f6dc38a61a633d16a2da037c40d06455a5b5b11cdcfa73e7f7975bf52bab6288017261bc031d0407fdbe4a5ce001d18c59f4bc77bf88 SHA512 def7c5c687e8a91fc3b763747ce7a311fb000c8fc1d9cf8270c2863694e79a7b6e84b578eb441139c9051c93bba90a82821d3cc930b171d53a6c4c7fd9ad514d
-EBUILD lxc-2.1.1.ebuild 6766 BLAKE2B 229ebab9afd710c885c08794463464c8acbc11eb4fb47a4fc0747ad65d80da71960bbfea46292819fdbfedcf4fcbce8434067a36898e42f0842d191c08c79ddf SHA512 ae74ded64f600cb6034169c7dfbdbbacc98a7cbdd283743a7d4b95087868e286d91aa653795467a3989d7fdf3133052e709f802e48133fbccdccb44cfd31d8b8
+EBUILD lxc-2.1.1.ebuild 6763 BLAKE2B a4d6e09451ebb728147e1ebeca98292422472040eea4a7664e8659d2d00774933b16e264b2af3a0ad6a90750586369a02cc6149959bb3a218a528f4f8f0aa773 SHA512 e5838b9a63d096284905d3f000c268a6c398835c2054c2d0bb92e3e6ed2d0b3aaeb2a417d2c04b8182ced7447a47fa9e1340e89f92d0fd6dd48238544684a727
 MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2
diff --git a/app-emulation/lxc/lxc-2.1.1.ebuild b/app-emulation/lxc/lxc-2.1.1.ebuild
index e02adaf47ad3..a3c804d01763 100644
--- a/app-emulation/lxc/lxc-2.1.1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 67521a8c3c02..e2c47561d822 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,6 +1,6 @@
 DIST virt-manager-1.4.3.tar.gz 2765924 BLAKE2B fa888dc78bb8ab27ff5a507829c5ace5d0e82b7840c9d4ec1857dfd2e62f39172abf116ca3f4d99f4a2c4366f06695a52561e6c816969928df79e623fb4ce9bf SHA512 007f125503fc2c774beefc8047ca2c36aa7177af40d9bc78fa3448fd50d4d35abd4a1dbbf761a8cd538fdf6541eba46c2cd019ba3ff0c7e29b1944d873b74274
-DIST virt-manager-1.5.0.tar.gz 2797380 BLAKE2B 45ef8c2b98fa1d6f7c4b4fe45bca74e27d595eb4d2e7c80c4e7671c445d8e523b8a4c21eaffc02dea756b7a93f5b3c7f3bdc795a0cf6ef99230bcf0c5683c81b SHA512 b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da
-EBUILD virt-manager-1.4.3.ebuild 2406 BLAKE2B b18ed780d146def605866e8468edf5505cee6913169381fa591a804bd25ce6b6ec4b09801ee42827871f6b08d9bd8aaa621ba819bbec682f6731fbaa8e984411 SHA512 0db0e050d64b2b6cf820c4dfa2a21c1154ee7a3bc124b38b78bbd5e6ab18239a5cdff49838597daeb3a1fe71b2b4ee167c685f2217087404fe7d6bcf9fa82c44
-EBUILD virt-manager-1.5.0.ebuild 2408 BLAKE2B eae4524fbacfa095a48dda0fd3e4cac44281ce5d7df862990cb8fe8ab72049185aaad886b3ccb4a957fe0367e1d587b62304a94065146f1b5e3d27ed90c80108 SHA512 960693352f33803ffb0049790e944482b6f7272a040137e25f78f4e0ef7015d0fb4a0fde922110aa6f90dcea9c35d075425d851a0550821b200834275666cf04
-EBUILD virt-manager-9999.ebuild 2355 BLAKE2B 56d4f90d91ab55ec2d0388cc49d238e3d3b314f16738734bf21f22283496243085ebc5a2828e34a66c0f03856f743edb335dd828dc9197de8c30ffeced9db5b9 SHA512 55fc8f98599d38c5f676104ecc6ec6085ad619f1ec47dc95a89406bd24669b65d65c233fc33492eb0b871cb67d9c4c6768a97d46ccf554488c2331aefa8e88ae
+DIST virt-manager-1.5.1.tar.gz 2796831 BLAKE2B 0fc8b266e7dd2ac3f337e3f95f4328ece930ff66605a444bd728183ffb8fb497204f5e73409f42e3d19ccaa009195a552864dc09f9d78efda7c04f4c5292dbf5 SHA512 e0da3b879ea33a8c394c33df85cadac4fbb9cfed65f9a904c5d9bf07232e29f8c96b5242e3f94cae390b7b5d7a20e1c25c3867962f0a39de40e71dc00013d32b
+EBUILD virt-manager-1.4.3-r1.ebuild 2385 BLAKE2B 1361cdbb0b185ff6dd6430e94c2416a9981ce360cbcd6330cde5f519989af3f9f85b98d194a23c2d6fe0f9fd9ccb701bf09f1fbae32d1906d1fa22ed30250bd3 SHA512 3a864d2802a1f61b3153c84c0cd1c91241d9003331aa749035133a06d21c06fbd094a9c7a5058b69f9a560961069611465b9054cfd57b7ce64299c83cf0fb183
+EBUILD virt-manager-1.5.1-r1.ebuild 2403 BLAKE2B 2e30a3cb3debac21490fb97a3bbc02bd7f24d5ebabe989340fe94ecc2dfbe30d9f7774fab428ca9d237e554f18863466359a6ab2f7c9e82f2dfa6a9dbf7f4e1c SHA512 952a3bb8d6f4e239b933e2b011db72dcb2d23ea34da193fcc58b755e44cb9acebaa3caceffff565c8db752188abba8d677858e96b76bdd801c8cdf54bedbb3d9
+EBUILD virt-manager-9999.ebuild 2309 BLAKE2B e215c429af443c797b2789dbbba3a87eaf792a918c082ea6f3a5a47eab503413523beff33610f981a2a0114094293d3c31bc0ab5c0c122cf0bcc0836d601f6bd SHA512 f70be63a5d9e02d3a560fd020c1b2cb8bf657ce6c0dc3dcaf7ba02c3b89504914de2beac4f7a252a6032ba21ffffef8cdb57e46a35806fbd5daa02c72ced7fd0
 MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a
diff --git a/app-emulation/virt-manager/virt-manager-1.4.3.ebuild b/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild
index 5d71ab10f3d0..c931037ed2b2 100644
--- a/app-emulation/virt-manager/virt-manager-1.4.3.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.4.3-r1.ebuild
@@ -37,7 +37,7 @@ RDEPEND="!app-emulation/virtinst
 	gtk? (
 		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/vte:2.91[introspection]
diff --git a/app-emulation/virt-manager/virt-manager-1.5.0.ebuild b/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
index 7725679e8339..9258899fd29b 100644
--- a/app-emulation/virt-manager/virt-manager-1.5.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.5.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
 else
 	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -26,20 +26,21 @@ SLOT="0"
 IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	${PYTHON_DEPS}
+	app-cdr/cdrtools
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
-		x11-libs/gtk+:3[introspection]
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
+		x11-libs/gtk+:3[introspection]
 		x11-libs/vte:2.91[introspection]
 		gnome-keyring? ( gnome-base/libgnome-keyring )
 		policykit? ( sys-auth/polkit[introspection] )
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 9a719e6ef546..7e88178f48f6 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -27,9 +27,9 @@ IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
 	${PYTHON_DEPS}
+	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/configparser[${PYTHON_USEDEP}]
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -37,7 +37,7 @@ RDEPEND="!app-emulation/virtinst
 	>=sys-libs/libosinfo-0.2.10[introspection]
 	gtk? (
 		gnome-base/dconf
-		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
 		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
 		net-misc/x11-ssh-askpass
 		x11-libs/gtk+:3[introspection]
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index a7f5c5803e01..62e30f14e673 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -1,5 +1,3 @@
-DIST virt-viewer-5.0.tar.gz 908726 BLAKE2B ffc1e8ce7b74f888289a65a0ad7566c84278cbf1a412b426883313f1b66bb95e10b74fedb256b4ab6b39e4dc6e292e518585fcbaf07e7669b51a5be87cfd257f SHA512 924fa88fd0ca7cc5b3d0a348c0d1104337fe0a06328e32110b4417c64f5d9efaf6df534adbc1eaa69157d229763b773307fa834a66f16156e3703731525eb690
 DIST virt-viewer-6.0.tar.gz 922916 BLAKE2B 1c2246369474d06188dc2191b9756dbe69cff2d5f997ffb58bdab1143a0e4d6cda0e43b4b082d7921125caa4348635762070fa8e6686ccf7728a90e4e6fc3a18 SHA512 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2
-EBUILD virt-viewer-5.0.ebuild 913 BLAKE2B 82aabc3c398e50636ab8d934366b3c560382d10c848f94d11fadab63e83043cbd9c197e71b196f22d29edf96bcb5571d2f0618838bbe9cb11dda249580f901d3 SHA512 38e81719acda11fbe13604f607632bf0519c7274fb4617795589ac12e187c8801f5a93af46ca052ff2b5198e74af52c4b5acea34e96732637204db88e497d24e
-EBUILD virt-viewer-6.0.ebuild 913 BLAKE2B 72016aaacda1f38e7c35a2e032bac8aa1be31383b046c72d31e9f45b55774cfb9f64dba2190776dac6da3819104ea12a8120e30f601875442c32e36744e40589 SHA512 e491e7ab83ad8bd407a624196e39e9bee3e043b6dbcb160e3ab3937b8794ee29c126e63eff6cb2dbeff961dcbd92e75b06e73acf273aada49628b219c11851da
+EBUILD virt-viewer-6.0-r1.ebuild 916 BLAKE2B c43af1747c961f6e90bfc6d472047ba056ba60417a8252adbadc89d3cf15438efda23bc98da745fa26d4e3fc779821d7fc6aa756623e6ed6e84266245f51f6f9 SHA512 995db1ae9baad0d2fa3407c85da1d278706ad04a6a7d5d2dd2ad0e046b465242a31921e52e7712875cd582d0c7abccc111ad11be5b344ce1b89e7364fef571e7
 MISC metadata.xml 452 BLAKE2B cb307dd6593ae8c96ca9c6925783e0b26335f1d1b11c21ccbf7e54003ef2e9e32701304464380afea75a642914e2334c053417aa5e18de5737443b2b60f65d0d SHA512 c97651a4477db1452310d3b53efec56c596963827d1b13385bdbaee5bd8725774b40edc88dc5389b5c0a4ac50f9801de5f649d8f941d315f1e28b6ebf1c9cb79
diff --git a/app-emulation/virt-viewer/virt-viewer-5.0.ebuild b/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
deleted file mode 100644
index e79a543002fb..000000000000
--- a/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Graphical console client for connecting to virtual machines"
-HOMEPAGE="http://virt-manager.org/"
-SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sasl +spice +vnc"
-
-RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
-	app-emulation/libvirt-glib
-	>=dev-libs/libxml2-2.6
-	x11-libs/gtk+:3
-	spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	spice? ( >=app-emulation/spice-protocol-0.12.10 )"
-
-REQUIRED_USE="|| ( spice vnc )"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--without-ovirt \
-		$(use_with vnc gtk-vnc) \
-		$(use_with spice spice-gtk)
-}
diff --git a/app-emulation/virt-viewer/virt-viewer-6.0.ebuild b/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild
index dafa029a2682..5e7f75d9859a 100644
--- a/app-emulation/virt-viewer/virt-viewer-6.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-6.0-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
 	>=dev-libs/libxml2-2.6
 	x11-libs/gtk+:3
 	spice? ( >=net-misc/spice-gtk-0.33[sasl?,gtk3] )
-	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3] )"
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3(+)] )"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	>=dev-util/intltool-0.35.0