add patch to use kvm-img if qemu-img isn't there

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 50 insertions, 1 deletions

diff --git a/app-emulation/virtinst/ChangeLog b/app-emulation/virtinst/ChangeLog
index 3375bc66e004..0d0e2e06f920 100644
--- a/app-emulation/virtinst/ChangeLog
+++ b/app-emulation/virtinst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtinst
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/ChangeLog,v 1.10 2009/04/17 16:22:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/ChangeLog,v 1.11 2009/05/27 16:33:08 cardoe Exp $
+
+*virtinst-0.400.3-r1 (27 May 2009)
+
+  27 May 2009; Doug Goldstein <cardoe@gentoo.org>
+  +virtinst-0.400.3-r1.ebuild, +files/virtinst-0.400.3-kvm-img.patch:
+  add patch to use kvm-img if qemu-img isn't there
 
 *virtinst-0.400.3 (17 Apr 2009)
 
diff --git a/app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch b/app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch
new file mode 100644
index 000000000000..ad701d31e345
--- /dev/null
+++ b/app-emulation/virtinst/files/virtinst-0.400.3-kvm-img.patch
@@ -0,0 +1,21 @@
+diff -Nur virtinst-0.400.3/virtconv/diskcfg.py virtinst-0.400.3-kvm-img/virtconv/diskcfg.py
+--- virtinst-0.400.3/virtconv/diskcfg.py	2009-03-09 22:32:15.000000000 -0500
++++ virtinst-0.400.3-kvm-img/virtconv/diskcfg.py	2009-05-20 10:55:13.000000000 -0500
+@@ -151,12 +151,17 @@
+         Use qemu-img to convert the given disk.  Note that at least some
+         version of qemu-img cannot handle multi-file VMDKs, so this can
+         easily go wrong.
++        Gentoo, Debian, and Ubuntu (potentially others) install kvm-img
++        with kvm and qemu-img with qemu. Both would work.
+         """
+ 
+         self.clean += [ absout ]
+ 
+         ret, ignore, stderr = run_cmd(["qemu-img", "convert", "-O",
+             qemu_formats[out_format], absin, absout])
++        if ret = 127:
++            ret, ignore, stderr = run_cmd(["kvm-img", "convert", "-O",
++                qemu_formats[out_format], absin, absout])
+         if ret != 0:
+             raise RuntimeError("Disk conversion failed with "
+                 "exit status %d: %s" % (ret, "".join(stderr)))
diff --git a/app-emulation/virtinst/virtinst-0.400.3-r1.ebuild b/app-emulation/virtinst/virtinst-0.400.3-r1.ebuild
new file mode 100644
index 000000000000..5b53618e56ce
--- /dev/null
+++ b/app-emulation/virtinst/virtinst-0.400.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtinst/virtinst-0.400.3-r1.ebuild,v 1.1 2009/05/27 16:33:08 cardoe Exp $
+
+EAPI=2
+
+inherit distutils eutils
+
+DESCRIPTION="Python modules for starting virtualized guest installations"
+HOMEPAGE="http://virt-manager.et.redhat.com/"
+SRC_URI="http://virt-manager.et.redhat.com/download/sources/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=app-emulation/libvirt-0.2.1
+	dev-python/urlgrabber"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-kvm-img.patch
+}