Backport a bunch of patches from upstream's git repo for issues that I've run into.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

2 files changed, 111 insertions, 2 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 0ea799cff67d..bf077c73e1a5 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2011/08/12 15:42:53 cardoe Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.59 2012/01/16 21:20:12 cardoe Exp $
+
+*virt-manager-0.9.0-r2 (16 Jan 2012)
+
+  16 Jan 2012; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.9.0-r2.ebuild:
+  Backport a bunch of patches from upstream's git repo for issues that I've run
+  into.
 
   12 Aug 2011; Doug Goldstein <cardoe@gentoo.org> virt-manager-0.9.0.ebuild,
   virt-manager-0.9.0-r1.ebuild:
diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..0805cb9b74c9
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.9.0-r2.ebuild
@@ -0,0 +1,102 @@
+# 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.0-r2.ebuild,v 1.1 2012/01/16 21:20:12 cardoe Exp $
+
+BACKPORTS=2
+
+EAPI=2
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="http://git.fedorahosted.org/git/virt-manager.git"
+	GIT_ECLASS="git-2 autotools"
+fi
+
+PYTHON_DEPEND="2:2.4"
+
+# Stop gnome2.eclass from doing stuff on USE=debug
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 python ${GIT_ECLASS}
+
+if [[ ${PV} = *9999* ]]; then
+	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.0"
+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"
+}
+
+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
+		intltoolize --automake --copy --force
+		perl -i -p -e 's,^DATADIRNAME.*$,DATADIRNAME = share,' po/Makefile.in.in
+		perl -i -p -e 's,^GETTEXT_PACKAGE.*$,GETTEXT_PACKAGE = virt-manager,' \
+			po/Makefile.in.in
+		eautoreconf
+	fi
+
+	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
+}