Fix issue where network stat I/O wasn't being displayed and the debug console was spewing errors

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

3 files changed, 112 insertions, 2 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 54a4ab9a6e36..cc398d8d1c7b 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.56 2011/07/28 22:04:11 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.57 2011/08/08 18:26:29 cardoe Exp $
+
+*virt-manager-0.9.0-r1 (08 Aug 2011)
+
+  08 Aug 2011; Doug Goldstein <cardoe@gentoo.org>
+  +virt-manager-0.9.0-r1.ebuild:
+  Fix issue where network stat I/O wasn't being displayed and the debug console
+  was spewing errors
 
   28 Jul 2011; Doug Goldstein <cardoe@gentoo.org> virt-manager-0.9.0.ebuild:
   Remove bad patch reference
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index a998be920f7c..75346160d891 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,9 +1,11 @@
 AUX virt-manager-0.8.7-vcpu-stats.patch 876 RMD160 f77163cf34423675130f1c8368261b1ccfc77715 SHA1 0f30def046c2407e8c1ea2cf45aebb9cfd6f71c5 SHA256 43dd7dec0e01d7c82085d8f97767f0a7403554d1cea9f132fe4af5f01b0315a3
 DIST virt-manager-0.8.7.tar.gz 1879504 RMD160 e80475270e54018b89e5a1a58c467478c03c71b5 SHA1 fe1565b9836b23cefb37d60b403be5b302e83472 SHA256 1907ec0e5479d6af8b4882fc068b74fa8c04f8d36ab0a503b405a937fe765dd5
+DIST virt-manager-0.9.0-bp-1.tar.bz2 707 RMD160 e4614dd36bd1a334080dcb712d731665944ef705 SHA1 dc007460bb721eb385c02de671045820926626b6 SHA256 823ae2aea4515e47db9791e3edda78530223a48ba2fa0bdb33a328e85e64f284
 DIST virt-manager-0.9.0.tar.gz 1951176 RMD160 f3af53591babe3d95c4017d19a292fd6c1bfee97 SHA1 e937b9aedc7c4ebc84fbfa48c622d1918cf7a335 SHA256 db0de808efa5d6bae0bdc2db796e58ea79f9e1db20d9a5a5977b28b4b85d4321
 EBUILD virt-manager-0.8.7-r3.ebuild 2926 RMD160 79022b8089c4d9145906ddd390d9c3d0e844ea66 SHA1 6a39b37c1f3c518953017242976a4307e7b1e47f SHA256 5cc419c5e08b03c7067e42042eb679b595555dff620b87ab322fa51b7ae19628
 EBUILD virt-manager-0.8.7.ebuild 2063 RMD160 cfe31b764bd7b073a322ae63041dbb70535838a7 SHA1 81c542cc778c600a262a281fc0e3558b6c881603 SHA256 5e46b8dcd6b068ec66b99bbc0e5b5e958340e21b6a4770a246e36f29af1449da
+EBUILD virt-manager-0.9.0-r1.ebuild 2944 RMD160 ab409d9c9a76e89b69b4a15afbc270a67a2e7b18 SHA1 980c43ddddac06c2d8a402cfa6cc0a301e6cf0d3 SHA256 fc1efb431cc3531c140adeaea4890c53044066fdc3cb07da433c076290afad79
 EBUILD virt-manager-0.9.0.ebuild 2878 RMD160 28f6f78ecc8feeb6ec77c65cb63185c6f1bfed9a SHA1 9561ef12b15eba64e0b4c78cc732969997152aef SHA256 bc56d4fa2eb154bff9be65ab368f455d8b6388da9e2388484ad1da0b2343167f
 EBUILD virt-manager-9999.ebuild 2877 RMD160 4552e0051034353f10674176343c5e6547072999 SHA1 6396698afcd615a57d70412cc0b7fc61226e0aff SHA256 dfbbf71b9a70d08e17ccbe8c31b065fdb736fb1a0144535466fe485dcd360b22
-MISC ChangeLog 11043 RMD160 49deaa2693db9c58cff1b1db7d2dd038d5bf2e7a SHA1 58ecdbbf955aa97e66a6e98c39814c6f3df26eb1 SHA256 9baad48abc41e36cde61eb7502527d51f7a2a70f250dc226d8701b68fccb043f
+MISC ChangeLog 11266 RMD160 7c481909e1fda85bc3eef25b9b58f162cce17adc SHA1 464581958f4574a5d17bf74bd95ce51b7e5a037e SHA256 20f56d113ad81d907fa6c9f6765b4bc8842a31bf058593a2310caf7109f3b7c3
 MISC metadata.xml 641 RMD160 e8662f1753b0ffab34fb8539ec9c336f2e3cd769 SHA1 09b8ce549752a40c389c0e28279c2608ed8780af SHA256 3d4ac13637c95e0524006f0cbaf690d4dc8d3f7faf2e36581be8730aba6cc672
diff --git a/app-emulation/virt-manager/virt-manager-0.9.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..747491d2f32a
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-0.9.0-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.9.0-r1.ebuild,v 1.1 2011/08/08 18:26:29 cardoe Exp $
+
+BACKPORTS=1
+
+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.500.6"
+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] )"
+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
+
+	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
+}