Directly depend on sys-apps/dbus for USE=X since there is no way to depend on that via dev-python/dbus-python. bug #462734. Remove older version.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

3 files changed, 10 insertions, 99 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 47f4084c8524..590068c10e94 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virt-manager
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.77 2012/12/06 04:26:39 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.78 2013/03/24 00:40:35 cardoe Exp $
+
+  24 Mar 2013; Doug Goldstein <cardoe@gentoo.org> -virt-manager-0.9.1.ebuild,
+  virt-manager-0.9.4.ebuild:
+  Directly depend on sys-apps/dbus for USE=X since there is no way to depend on
+  that via dev-python/dbus-python. bug #462734. Remove older version.
 
   06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   virt-manager-0.9.4.ebuild:
@@ -393,4 +398,3 @@
   +virt-manager-0.4.0.ebuild:
   Add a graphical tool for administering virtual machines including Xen, QEMU
   and KVM.
-
diff --git a/app-emulation/virt-manager/virt-manager-0.9.1.ebuild b/app-emulation/virt-manager/virt-manager-0.9.1.ebuild
deleted file mode 100644
index 488b50b7f190..000000000000
--- a/app-emulation/virt-manager/virt-manager-0.9.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2012 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.9.1.ebuild,v 1.5 2012/05/31 23:41:58 zmedico Exp $
-
-EAPI=4
-
-#BACKPORTS=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
-fi
-
-PYTHON_DEPEND="2:2.5"
-
-# Stop gnome2.eclass from doing stuff on USE=debug
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 python
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2 autotools
-	SRC_URI=""
-	KEYWORDS=""
-	VIRTINSTDEP=">=app-emulation/virtinst-9999"
-else
-	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz
-	${BACKPORTS:+mirror://gentoo/${P}-bp-${BACKPORTS}.tar.bz2
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-	KEYWORDS="amd64 x86"
-	VIRTINSTDEP=">=app-emulation/virtinst-0.600.1"
-fi
-
-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] )"
-#	tui? ( >=dev-python/new_syrup-0.1.2 )"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool"
-
-pkg_setup() {
-	G2CONF="--without-tui"
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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
-
-	if [[ ${PV} = *9999* ]]; then
-		# virt-manager's autogen.sh touches this and eautoreconf fails
-		# unless we do this
-		touch config.rpath
-
-		rm -rf config.status || die
-		intltoolize --automake --copy --force || die
-		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in || die
-		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
-			po/Makefile.in.in || die
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-	gnome2_pkg_postrm
-}
diff --git a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
index cb60b6bd6eb6..3f5865a856e5 100644
--- a/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
+++ b/app-emulation/virt-manager/virt-manager-0.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.9.4.ebuild,v 1.4 2012/12/06 04:26:39 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-0.9.4.ebuild,v 1.5 2013/03/24 00:40:35 cardoe Exp $
 
 EAPI=4
 
@@ -44,6 +44,7 @@ RDEPEND=">=dev-python/pygtk-1.99.12
 	>=dev-python/dbus-python-0.61
 	>=dev-python/gconf-python-1.99.11
 	dev-python/urlgrabber
+	sys-apps/dbus[X]
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 	policykit? ( sys-auth/polkit )
 	spice? (