Allow virtinst components to be installed separate from virt-manager to allow users without a GUI to get the newer virtinst bits that are now merged into virt-manager and maintained there. Controlled by USE=gtk.

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

3 files changed, 107 insertions, 10 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index a6f5e5fa04a3..edd2af1d0709 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.98 2013/12/09 15:24:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.99 2013/12/14 02:04:48 cardoe Exp $
+
+*virt-manager-0.10.0-r2 (14 Dec 2013)
+
+  14 Dec 2013; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.10.0-r2.ebuild:
+  Allow virtinst components to be installed separate from virt-manager to allow
+  users without a GUI to get the newer virtinst bits that are now merged into
+  virt-manager and maintained there. Controlled by USE=gtk.
 
   09 Dec 2013; Doug Goldstein <cardoe@gentoo.org> virt-manager-0.10.0-r1.ebuild,
   virt-manager-9999.ebuild:
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index d6eaa34ac7c9..474c9d291459 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -5,21 +5,22 @@ DIST virt-manager-0.10.0-1cd29748.tar.xz 11716 SHA256 a9293c2fcadd230cdfb13977c7
 DIST virt-manager-0.10.0.tar.gz 2548256 SHA256 59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d SHA512 13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 WHIRLPOOL e3e34506171217c63e5e5337157f75006554afb156a430f2ee7f11e354d0c490adc371174b342efb4cc90ab0686d2c74f42b4d52c55c0a9221868670980fdbb3
 DIST virt-manager-0.9.5.tar.gz 1773882 SHA256 5d2afb282fb8c4401f9e203dcb41a62746b9a909258d440d508219bc1a33803d SHA512 a1ecf6fe9f3ddacfe43006cfc388d9324c457be91767792119d8a112b190739e3274dfeb7cffd28534b86a33f86079c569d8337eeddaa9d60ed69f82d8a4627f WHIRLPOOL d15728e55c0a3e361b42b6e615bed50b8870c436a12ae0ececcd80d47d0482ea01c33f5497672e050aa6465f9b031948bf92925710c4340837d789d4634506c8
 EBUILD virt-manager-0.10.0-r1.ebuild 2082 SHA256 77c319a4ec4aeb276b6a5f695d4bbfcde54a6a47a12bd48a418d44d06ad9e2c9 SHA512 618d17ce2a0ae982e677298bc9af136bdcf4cd0b68201da70dfaef9b1071da41fd66bf260d35b96b7240808d2414dbbef5afe7ba4953953be4beb492b43d24dd WHIRLPOOL 5870e820870147b5cde8ff84231de860ba8de56bbea33083617448efbf01d9411bf33388a81e403b529a9a669081093af4ee5b7d4a1b2f45a6ff58d7e23719ab
+EBUILD virt-manager-0.10.0-r2.ebuild 2515 SHA256 95f56333ebfe682fbd4aa9fec003e12545c7fe1610bff45834d25bf869abbdee SHA512 797ab49ac06d746bed27bcf9ba4e4c297b625c26574fe1f1bffe3cb7612bda1318a56afc77d58792d7b25d447ef267643e91ff237779305136d17eb9e467c056 WHIRLPOOL c5f5283b295230e0e6f036bc4087ce53a24f7a9e4bc2127c9b8a5974128191f28394acebe4e475854a40e7819a2e100fb1b1ff0fbce8ed69963c9d2bad9bef83
 EBUILD virt-manager-0.10.0.ebuild 2305 SHA256 6909ae20fb4a1a0618c475ec1d68cb1e6213b4476622d5f78c5ca46c19e28f32 SHA512 73375ce4e054d327f0ea2da355ff682081fb7e44c15c4e4d7a52c09bf9e688ca879fd0c9bce760ce9470747cd1138af151ad9fa87a0fc071b9ed15d39d0af843 WHIRLPOOL ec0cbf86145a5f4c055f44b3e07037f5858e2a1c87b7520eb645ca66acc3568e5e23cf0687f6f3eb5edb1b6837e206ec5e447d104c012295b67a765bb0dd37ca
 EBUILD virt-manager-0.9.5.ebuild 2651 SHA256 b36fbda7acd3d873ba408bac74bbb801fc697bf771443e69353c1a1f5c6c7dc9 SHA512 bfe17dda6a5d98494135040ee23875dc4df107cfd9e324405612ba473dea8537d18b37e93515b2939931fa58dacfb3014a1ed9e75b7bf1c9929c4046ac508487 WHIRLPOOL a23f89d18d7a94c6aea1732e9bb005a46b9c324ed7a27528ffe75f7b0448ae6f31d947a9b2501d28540687d7c3f70ddbb75c3c9f7197afda9c595d4ccc66fdef
 EBUILD virt-manager-9999.ebuild 2078 SHA256 c669c76f94437dc4ac86c73db5fff3caf020f48d3de5ee22e8aead37f69e5209 SHA512 a8c44748565b4c22a57968c4e2b02cdfc63a9959484e7d4e127a9bc4635663eae827563f851005145c5724d439e01b1c608b63f225bd2ab386cbaf3f08761db7 WHIRLPOOL 37c398dfa675c4ec075afb3fff8c7fb700805b643b7eff3910d318028fa35b434b9d43a654c4eb7e86fffe483f7c7767cd980b46153f845ebb39fea24ecea293
-MISC ChangeLog 18475 SHA256 9a1322481d101277fd9f1edddc580d0bb41487f6ed89e41b31e8844ae2bdb046 SHA512 2393cd41829b7481ab005d7930fe562f133baec743e965cb3be909cf4b2a785972c1c1218dbcbb467885b5e8206a7036ab3932e82eeec3d2e9e9e30399cb0eaf WHIRLPOOL 7de2c049d784173e076e8608291c7fddf76b95a698c8e7e7e194b90f22611f61f4e088d27620ef2322e91ccda9b8b3a76c11947342af26815487156858e6d132
+MISC ChangeLog 18817 SHA256 9eee3064f83c412d75ca57900cfae0a8fe22fbb845f93bf6ca9c043e74d4c5a0 SHA512 1a56a333f7992190e4b5b1d7028a7c596de5a74f60e15a37d0774e5508d7935b2d68b36a8d270ba9655c64c121293334333ff88d08013b311f4d9e5e59dc5fc1 WHIRLPOOL b8230a646e8095240324f39c4b6c41bf42122804df0ebbaac5b6e5dc136d9daa2bba6e4ffb939346d42345b2c742d9e13aa5084d719c93bba18543f74d730ee2
 MISC metadata.xml 722 SHA256 70795a507d431d9f6682777a65b480eeb0d762368f3150552b7d17bf98f96bed SHA512 1a6cb74025b5f750c82f7c373638a764f19057bbb076e96688f73690362ef197d8a38333873f8ec5baaa9cdf11a0848c83c1d86403f17b70347d7f6ca8fcbe3f WHIRLPOOL 5a3b8cbfbdbada615803ac5e6cf3a21ebc6f5d15ee1d440be6de3efcd129557c6651aac91192b8b94ed7171e856cc564e9f49c7c5b6d425d2b778621f644c7ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQF8BAEBCABmBQJSpeCwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJSq7zQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE
-N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvcc0H/jcb1ac475UGCbwBkmR/WKd7
-Z6/aQ1ML1KBH3UiK0hYJF8Ksv/KvGHyyj2WdsAjFLaMtpXo8zQX93JqK4iXyGWb8
-9BwsSFvft9j1dWZrcCKFJfNSPlqk1DkgLVqERXvColDd/Gx9pnb407aGaVqVz/Lp
-IZwOdxXW+IBah7Ftc04RF3VtQYQ2rwbfFFWFMZTMkHqbR9NffMG9HCLwbJcfGxeC
-knLWNM9W2yJgK1wvMY1pNpWSUreZjs7wStqutOPb9u/CLqN0jkN+IWcknDcAb5UT
-s6Bta/c3ux52LI1am2tP+I3gJ4pt70QNZF0aZ5yNKcH/nF0Oerq0jVZNkl08ROY=
-=sC2b
+N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvkwIH/ityxTrVSr4S9J2ZyKMWSoEX
+j5kN9aHVYFKuSq0dgsx6j7JTP7aF9+17fdJn9SYXT9qw8+2xGliVtJfeO8Yu7ZzA
+FTfbgTo9mx5GvqYQcHdsgvbDEP7PJL3abFkcOd7bYcl802bZE2F1mO5LihDPgF9G
+dhm35EkGUmD7f6BNQmfPlfHXa3j3W41OiksXWBI02Ud60YcQJbgCk+WgC316rwwA
+vW9PBnhiUUvj2kjlI0fRPqBxNycxA9ARJVdMFoSwRB3ToX/6E/6cMlTNpixjlEUA
+rCP5k8w4YUWyEHXr+t2YTpBp8/pnD1F+slE7VD/+7diLhvy9iE2YFDEAXkzVR3E=
+=rE0V
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..9963c686e220
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.10.0-r2.ebuild,v 1.1 2013/12/14 02:04:48 cardoe Exp $
+
+EAPI=5
+
+BACKPORTS=1cd29748
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
+	${BACKPORTS+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	|| (
+		dev-python/libvirt-python[${PYTHON_USEDEP}]
+		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
+	)
+	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	gtk? (
+		x11-libs/gtk+:3[introspection]
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection,python,${PYTHON_USEDEP}]
+		net-misc/spice-gtk[gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+		x11-libs/vte:2.90[introspection]
+		gnome-keyring? ( dev-python/gnome-keyring-python )
+		policykit? ( sys-auth/polkit[introspection] )
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool"
+
+DOCS=( README NEWS )
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--qemu-user=qemu \
+		--default-graphics=spice
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_fix_shebang \
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}