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

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

4 files changed, 56 insertions, 5 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/Manifest b/app-emulation/virtinst/Manifest
index 258cc2bac37c..0b8d618b7252 100644
--- a/app-emulation/virtinst/Manifest
+++ b/app-emulation/virtinst/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX virtinst-0.300.1-nfs-check.patch 484 RMD160 846829455dc253c0388818947b6d5d5c3e8f2f64 SHA1 b1ec92897301057b8477a33ab8486080ee99f32c SHA256 20e46c6bc1160b3979a689ea3df2c5cf9f818a07ee440e7f60458a78307ca01b
 AUX virtinst-0.300.1-remove-usb-tablet.patch 4793 RMD160 4da49ee37822107ebe230314ddfcb88135982c61 SHA1 dde76e9186d3e39b907e756d45013d1db9ab05a0 SHA256 796a0cbfcf8c66a3454beccf33d07703069cda9396b85e8f04ed9ab46f3c2dc5
 AUX virtinst-0.400.0-virtio26.patch 672 RMD160 d5de8f12c30cd65fd15b8f3b337fcc893ce5b04a SHA1 58c64e22b0853c43722fd81b4b3321bfe72d6381 SHA256 ac45dd58a3d68cde0727e77f087fa1061de646f640fa64344a1a9f763fc4f939
+AUX virtinst-0.400.3-kvm-img.patch 1059 RMD160 d700c6a68e024ee0711cd6bc2b57b326e82cf3b8 SHA1 2d017cdc006a915132d412d1302d12093bb66ecd SHA256 fccb99501946f65a46a5efa9519a9239cce3982e755a938cfbab3ca498a83cdc
 DIST virtinst-0.300.1.tar.gz 96757 RMD160 7a334a18bea44db4c383e0b7420cb144381256a4 SHA1 b462531b40457661de12d5caabdef7b112e6869f SHA256 58e812432685950e7179373a26219558f612ca459e461ee5874f84058dd97b40
 DIST virtinst-0.300.3.tar.gz 139248 RMD160 ef8614cf77213696486a11f0599e332db04a86e5 SHA1 8bfe6552e9c10bfe44a183ac13d72882a72c72ea SHA256 89acd24dd6e4b9b27e6427d6da88dd806e51b31ce461e5137ad8057f8a002be1
 DIST virtinst-0.400.0.tar.gz 251104 RMD160 77fea45e7319651dc1df7df6768b8fed452e6ee0 SHA1 674ab1449df5d442b0aece5493d33c9c29e9a723 SHA256 a555932c61992e0db4bbf09a1bf548afb73803dd237a6bfaa6f349aace5d1306
@@ -13,13 +14,14 @@ EBUILD virtinst-0.300.1.ebuild 727 RMD160 8b4ec91bef5d7b15b02fe83c69ec133d9a76a3
 EBUILD virtinst-0.300.3-r1.ebuild 1152 RMD160 66590fa73bdf9af3560e62eee27712b221acb40e SHA1 a6b2f5bc2eb7f34ed03181dcf1c24477be9e4e28 SHA256 f7cf71b77d799ce920ff2ecd48ddd0af57d4c02dc85baac4ef7c159b98a00277
 EBUILD virtinst-0.300.3.ebuild 593 RMD160 8b31051e3769e791bf7c3e1b368f12f1ade316d5 SHA1 d94dbe3b4e15dc5b4e274344093df3b6aaef1ac8 SHA256 072e1e240fd7083f7e0ed1feaa1d07cedeadd92ba8deea937a0e46a3039351a6
 EBUILD virtinst-0.400.0.ebuild 680 RMD160 41765176ee80e65f0f002a3fa2277f0823d305d2 SHA1 3d733e9e77c5140f58be7fe3b6b754fad4b12487 SHA256 769dee00cacadbb4a4b0592f8bf09ff175c325244385c7613b7850bac0154588
+EBUILD virtinst-0.400.3-r1.ebuild 664 RMD160 876af133f3c059c34af36a672ff128dbfc8f6a51 SHA1 1abcd50058ef368a2e43d25d51b25e759edb5d99 SHA256 7c3cccd7c93024e96c7f18fc85af3b30b6ad5d29714f49677a4bba906211d6c2
 EBUILD virtinst-0.400.3.ebuild 593 RMD160 173ebfb4b169fb5efe972668349be095535a401b SHA1 5781fae5c150dcd053f22ea831819edf4d38273d SHA256 e3724a5d1f6cf4b506ea1ea8435aa9141c1ed086319d8586e3817ae9bfc2d83b
-MISC ChangeLog 2351 RMD160 b7c65cec9c734a51151ddb32f4899d440b4fa195 SHA1 47b37771c78cdc2ed0e0bb6e35385364981298f4 SHA256 263f8f58a9bfb0e229053fcdf429265d53b29f6d832157958899c9aa2fa7fce8
+MISC ChangeLog 2559 RMD160 e5b5ff414fb0df47289ac4e7497c466794a3c17f SHA1 f64fe64458c796ddc01dfbf32ef76a40e8d0fd5c SHA256 8fc4a4e5d9d4e1cb4559f310d14eeff333a93bc1ad51d829ac0050316c063b1d
 MISC metadata.xml 255 RMD160 d15c39df9cab7353c3a4ef8abaf1195a09ccc952 SHA1 117d8bf9e19ae7775839cda51d4d3320509817bd SHA256 a833521ef577d8838d38195f402701546d92c77ee38395dd0afaddafdd8549b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknorNQACgkQoeSe8B0zEfyzyACfWBzo/yC3zpmn4CeoxWeBxc+G
-zAQAn0vmeTDWJW1x4K/ZIbbCq2Sdm9qw
-=j+vx
+iEYEARECAAYFAkoda00ACgkQoeSe8B0zEfwwjwCfZiYQRGDYTX7W3qGdB75VTeRi
+btYAniVAHnTN2ePkqDQrcFyxsIuajmt5
+=4zXO
 -----END PGP SIGNATURE-----
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
+}