Removed installation of the TUI version of virt-manager. Support SPICE

virtual machines. Patch from Malte Starostik <m-starostik@versanet.de>.
bug #356825

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index ebca14d7e369a2dd516d5e41fe422c35fa9a4473..10cfa80037e62e1fde9fb873d2183c657ca736f4 100644 (file)
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.49 2011/07/21 21:08:50 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.50 2011/07/21 21:39:41 cardoe Exp $
+
+*virt-manager-0.8.7-r3 (21 Jul 2011)
+
+  21 Jul 2011; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.8.7-r3.ebuild, metadata.xml:
+  Removed installation of the TUI version of virt-manager. Support SPICE
+  virtual machines. Patch from Malte Starostik <m-starostik@versanet.de>.
+  bug #356825
 
   21 Jul 2011; Doug Goldstein <cardoe@gentoo.org> virt-manager-9999.ebuild:
   Switch to git-2 eclass from git eclass.

diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index d9c35cedeee248230a86fd90683abd612992a5dc..0899beb1ca816bf5804fa34f350a3db674e2c26b 100644 (file)
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -4,7 +4,8 @@ DIST virt-manager-0.8.6.tar.gz 1953680 RMD160 58ad20262bc38fbb364dd68b4fd2189bbf
 DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5
 EBUILD virt-manager-0.8.6.ebuild 2068 RMD160 d8c0419904deec856055d1c7d7899a3767a1d3a8 SHA1 0b7952c11a7676a3d24548dd0003ba99eccb7540 SHA256 0a5c4832b67c1c3529909a2b809792510e9588d75e6a6317641a0cb515ec325d
 EBUILD virt-manager-0.8.7-r2.ebuild 2113 RMD160 4125bcb91544b2f24702f94e3a27e0daa3dc9edf SHA1 bd54c88e960822bbebfffd3418cd3b334fd60c3b SHA256 6edb2c5eb9983440e826da25e6c20f7492680a91062e4e9fff31e5c0fb45a4f8
+EBUILD virt-manager-0.8.7-r3.ebuild 2286 RMD160 d8788d207aae0fa2f17a3df0416f732ac9cc411f SHA1 0ed3540a0e225a5270e83675a8068c262ee7f574 SHA256 9c46a7f6324492973eeae7d392de3e04a0b200ba2df12cc9a2feba7e23070488
 EBUILD virt-manager-0.8.7.ebuild 2063 RMD160 cfe31b764bd7b073a322ae63041dbb70535838a7 SHA1 81c542cc778c600a262a281fc0e3558b6c881603 SHA256 5e46b8dcd6b068ec66b99bbc0e5b5e958340e21b6a4770a246e36f29af1449da
 EBUILD virt-manager-9999.ebuild 2699 RMD160 1d51d4f11dd9e6b94c934d8bcfe4d4e6921332cd SHA1 51967527371624ed26f28618a64e665862539b15 SHA256 96960103261609ec49ec6767f1037d116b9551ab1b1e38a042d949cc8768571e
-MISC ChangeLog 9975 RMD160 54333bb0fc8cc947bcfe03c8e1fe7e312f432db0 SHA1 266a6d4d95d163e410a09846dcbfdec4cc6f9116 SHA256 adf35d661df3214385922fc7f7059d083ea9835d12f0bb43fdfefbcb9e505633
-MISC metadata.xml 555 RMD160 958278f1fc6aa09e5864dd8fd5a8a242dbbccd9e SHA1 7476279e0c610b679ce61d96bbfc36396708807e SHA256 a52a5e2d7e7ea6bd78be3d02a294857193ff72aab24543385cf168f7b8efa53b
+MISC ChangeLog 10272 RMD160 06fbc6d0dee3f41017f5f1f76502cf1c9df9285a SHA1 1891e47db20de65f48d86e7ec5ec4acda9928b4a SHA256 596496bd0b4d66de696ac671432eaed8a6bc7a95aa7c4a01213143223cfd15cd
+MISC metadata.xml 641 RMD160 e8662f1753b0ffab34fb8539ec9c336f2e3cd769 SHA1 09b8ce549752a40c389c0e28279c2608ed8780af SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672

diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index b52b644d0fa15b948226bdee2e8327c273f25284..28dcc7d8d2b816ef2b2a623fc772669523de4af2 100644 (file)
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -13,5 +13,8 @@
       Depend on the proper libraries needed to connect to SASL-enabled
       libvirtd instances (e.g. Kerberos-protected instances).
     </flag>
+       <flag name='spice'>
+               Support connecting to SPICE-enabled virtual machines.
+       </flag>
   </use>
 </pkgmetadata>

diff --git a/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild b/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild
new file mode 100644 (file)
index 0000000..d3ea5d9
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.8.7-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 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.8.7-r3.ebuild,v 1.1 2011/07/21 21:39:41 cardoe Exp $
+
+#BACKPORTS=
+
+EAPI=2
+
+PYTHON_DEPEND="2:2.4"
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python ${HG_ECLASS}
+
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
+       ${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+KEYWORDS="~amd64"
+VIRTINSTDEP=">=app-emulation/virtinst-0.500.6"
+
+DESCRIPTION="A graphical tool for administering virtual machines (KVM/Xen)"
+HOMEPAGE="http://virt-manager.org/"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring policykit sasl spice"
+RDEPEND=">=dev-python/pygtk-1.99.12
+       >=app-emulation/libvirt-0.7.0[python,sasl?]
+       >=dev-libs/libxml2-2.6.23[python]
+       ${VIRTINSTDEP}
+       >=gnome-base/librsvg-2
+       >=x11-libs/vte-0.12.2:0[python]
+       >=net-libs/gtk-vnc-0.3.8[python,sasl?]
+       >=dev-python/dbus-python-0.61
+       >=dev-python/gconf-python-1.99.11
+       dev-python/urlgrabber
+       gnome-keyring? ( dev-python/gnome-keyring-python )
+       policykit? ( sys-auth/polkit )
+       spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] )"
+DEPEND="${RDEPEND}
+       app-text/rarian
+       dev-util/intltool"
+
+# The TUI (terminal UI) requires newt_syrup which is not packaged on
+# Gentoo. bug #356711
+G2CONF="--without-tui"
+
+src_prepare() {
+       sed -e "s/python/python2/" -i src/virt-manager.in || \
+               die "python2 update failed"
+
+       [[ -n ${BACKPORTS} ]] && \
+               EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+                       epatch
+
+       epatch "${FILESDIR}/${P}-vcpu-stats.patch"
+
+       gnome2_src_prepare
+}
+
+src_install() {
+       gnome2_src_install
+
+       insinto /usr/share/virt-manager/pixmaps/
+       doins "${S}"/pixmaps/*.png
+       doins "${S}"/pixmaps/*.svg
+
+       insinto /usr/share/virt-manager/pixmaps/hicolor/16x16/actions/
+       doins "${S}"/pixmaps/hicolor/16x16/actions/*.png
+
+       insinto /usr/share/virt-manager/pixmaps/hicolor/22x22/actions/
+       doins "${S}"/pixmaps/hicolor/22x22/actions/*.png
+
+       insinto /usr/share/virt-manager/pixmaps/hicolor/24x24/actions/
+       doins "${S}"/pixmaps/hicolor/24x24/actions/*.png
+
+       insinto /usr/share/virt-manager/pixmaps/hicolor/32x32/actions/
+       doins "${S}"/pixmaps/hicolor/32x32/actions/*.png
+}