Sync 9999 with latest stable, add missing sys-libs/libosinfo RDEPEND per #508680

(Portage version: 2.2.11-r1/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 31 insertions, 13 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index fb3e8d1335a2..8240a13e4d9a 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virt-manager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.104 2014/07/07 18:10:52 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.105 2014/08/06 17:50:43 thev00d00 Exp $
+
+  06 Aug 2014; Ian Whyman <thev00d00@gentoo.org> virt-manager-9999.ebuild:
+  Sync 9999 with latest stable, add missing sys-libs/libosinfo RDEPEND per
+  #508680
 
   07 Jul 2014; Chema Alonso <nimiux@gentoo.org> virt-manager-0.10.0-r2.ebuild:
   Stable for amd64 wrt bug #508250
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index b7f13697fe94..fa92bfe3ad67 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-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/virt-manager/virt-manager-9999.ebuild,v 1.20 2014/04/26 08:15:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.21 2014/08/06 17:50:43 thev00d00 Exp $
 
 EAPI=5
 
@@ -27,10 +27,9 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="gnome-keyring policykit sasl"
+IUSE="gnome-keyring gtk policykit sasl"
 
 RDEPEND="!app-emulation/virtinst
-	x11-libs/gtk+:3[introspection]
 	|| (
 		dev-python/libvirt-python[${PYTHON_USEDEP}]
 		>=app-emulation/libvirt-0.7.0[python(-),${PYTHON_USEDEP}]
@@ -41,12 +40,16 @@ RDEPEND="!app-emulation/virtinst
 	dev-python/ipaddr[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/urlgrabber[${PYTHON_USEDEP}]
-	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] )"
+	sys-libs/libosinfo[introspection]
+	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"
@@ -68,8 +71,19 @@ python_install_all() {
 }
 
 pkg_preinst() {
-	gnome2_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)
+		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
 }