Version bump

Package-Manager: portage-2.2_rc67-r7/cvs/Linux x86_64

3 files changed, 26 insertions, 19 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 14f3588453a5..125d3cfe0a83 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.27 2010/04/03 13:51:55 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.28 2010/05/18 17:57:32 tommy Exp $
+
+*qemu-kvm-0.12.4 (18 May 2010)
+
+  18 May 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -qemu-kvm-0.12.2-r2.ebuild, +qemu-kvm-0.12.4.ebuild:
+  Version bump
 
 *qemu-kvm-0.12.3-r1 (03 Apr 2010)
 
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index e57d7e4b9407..f14c499327df 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -8,22 +8,22 @@ AUX qemu-kvm-0.12.2-virtio-large-iovecs.patch 987 RMD160 b16ae8ffd7a4b2d32c32d0a
 AUX qemu-kvm-0.12.3-fix-crash-with-sdl.patch 4003 RMD160 1e8965e94537e24d0903a7a096c91e35f7013118 SHA1 a6a36da9613d90d45148aa133392bd342b83d1cd SHA256 aeca9f133c021726c0e3ce2a58843ee12d592669143d0b75e46b8e301b5cf102
 AUX qemu-kvm-0.12.3-include-madvise-defines.patch 274 RMD160 2b2b454fabc3b5362c0479d581e5fb038e02aa97 SHA1 c34b51b9c0b5a69ab2ab7a8a64c804f7cbbbebf5 SHA256 0d33d22a853e9b1d19786c9ac53a515587a9753ff69a2f53e61c4764590e7821
 DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b
-DIST qemu-kvm-0.12.2.tar.gz 4713699 RMD160 1581fa5ec5dc168de3667a3c28cd56ba0b2e26b8 SHA1 27bb9b55e6539c0dc6b57e08812df76b02544c62 SHA256 82a6291857f67f84da259ee30f6d46699b73e38964ef82fb6c8000386e4baf5a
 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2
+DIST qemu-kvm-0.12.4.tar.gz 4720232 RMD160 63a18ff3b95de2b4d0dfac130cf850c1cd7caec0 SHA1 955c8dad1f65df0eb5403f40a6c92d93a0a252be SHA256 1489fe5a0def7b857256817a998768bb21662167d10e7c372312c5939e64181e
 EBUILD qemu-kvm-0.11.1-r1.ebuild 5797 RMD160 a3f4f239cd7a6cc9a7debfe6d347e0d9e1f288ff SHA1 60f6d85c50b14c3926e5e7e5f44e576bbf916d6a SHA256 a3d6efc3bcf9f169bbcad3ebe1dd0efbfb71ad1b185ab26c003191594b34edd4
 EBUILD qemu-kvm-0.11.1.ebuild 5725 RMD160 87f907a96b5b7cc6387de9b738c6261c57605877 SHA1 5cb4172354f07be1c0b9199b1aa2d880d5b1ef54 SHA256 7bd18bfac7eaa453b5edacc4111426ceab8a8652b311ad97cb6310a42392f5ed
-EBUILD qemu-kvm-0.12.2-r2.ebuild 7293 RMD160 bb0b4f3cca10fffecde0bd210cf1bb53c264beb5 SHA1 f7a9a2f98d9c0b1d16cfee33b5520d3e6f62152c SHA256 b9fe14f8ab0ed322008b22fa044c53d22af6be7f43fbcc27f2ece6a4e0c3c3e0
 EBUILD qemu-kvm-0.12.3-r1.ebuild 7452 RMD160 e4b2b3bf62be0147db6d03d34f033e87de4975f2 SHA1 a3b00b0646ce25c29439170f424328cde28ca98a SHA256 34373fec4dca921c1d1e9c19fa1335d70491283a5fc03544f735c7d9db9f3a60
 EBUILD qemu-kvm-0.12.3.ebuild 7291 RMD160 6a23cf04d27e8cb4a41586f64ef20ba96a1edd02 SHA1 aa72ec725c4facdcbf6b19880fdfc9114a9ea7c1 SHA256 6b27f2365f1114df96f45e3f5501aa5788a007db3619f55d9d678af69d5a2ed1
+EBUILD qemu-kvm-0.12.4.ebuild 7408 RMD160 8227b225228a4050331405da9a88522d3bd56f64 SHA1 f860cb9c27db03208f5bfc75f6f5605b62173d57 SHA256 c64e9a8f7e56ce55e81b98f7089406be18c5d63341414a66422d7dcd6e28c6aa
 EBUILD qemu-kvm-9999.ebuild 6920 RMD160 eef5085843cdf6ae4f371b6dd5b2d7e402261771 SHA1 637d69343fce2d2d55cfc3bda7ebac713d906369 SHA256 8011ec51134235d0219e96a45504e7519781eb1d0bb64f553255b656b3fbb3b3
-MISC ChangeLog 6010 RMD160 606c1aaee9e139990f5299839d74c98cdc8e9f3c SHA1 045d75ac4bcbbbbeda5742f878566312e86fb9b4 SHA256 799ed483ea44a3c79f5776e782cb2e6b9ba3c9c82308bad6dfc6e6a5b6fde221
+MISC ChangeLog 6172 RMD160 5eb7a88fbd5fcd9265abb3fa307cc115556104b3 SHA1 0ce8604f5e994c9870ecd85153aa31e694ce21ba SHA256 33ef5fd31ff18e51ae0f6f925ceb595921f926eb31845482c3838819beeb3b53
 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAku3SAoACgkQG7kqcTWJkGfLewP+JFrnkuiY6R2q2N69riIbVwWn
-RY84BTCQRxiRHAJ7rBbC0jYGAai00KRjW88FY6GdKwEiAR9heXfCXuBFkHzrSAXt
-BwAPUULazVKuTbclGzPLPkeejSPYKUoXVUfzGHu8VBrm/ZYkAlENErQxpRYOsguS
-yJeC28Yp2YELL8P0euo=
-=Ixkk
+iJwEAQECAAYFAkvy1RoACgkQG7kqcTWJkGeX5gP9FyfGFUWFwBDjJScrRUHZP7be
+WzOrFs/HDMSZOOCAk6Edz/j6xGwEsehcTRBFHILEyMvygzCZEAT149ppf/0AOPfT
+kyCQnS83IzYYUT3Wk2ZdVelBS/BuTr4T/cRtxZvjYHGH5ov4O8InAtyS302jWUu2
+AzE8GnEK+JSvLrMRMX4=
+=jEqj
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild
index 43b0b5252478..0e5f0d83c86c 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.2-r2.ebuild,v 1.4 2010/03/19 17:23:17 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.4.ebuild,v 1.1 2010/05/18 17:57:32 tommy Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 # xen is disabled until the deps are fixed
 IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
-pulseaudio sasl sdl static vde"
+pulseaudio qemu-ifup sasl sdl static vde"
 
 COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
@@ -47,8 +47,6 @@ RDEPEND="
 	!app-emulation/qemu
 	!app-emulation/qemu-softmmu
 	!app-emulation/qemu-user
-	net-misc/bridge-utils
-	sys-apps/iproute2
 	sys-apps/pciutils
 	>=sys-apps/util-linux-2.16.0
 	sys-libs/zlib
@@ -61,6 +59,7 @@ RDEPEND="
 	gnutls? ( net-libs/gnutls )
 	ncurses? ( sys-libs/ncurses )
 	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
 	vde? ( net-misc/vde )
@@ -115,9 +114,9 @@ src_prepare() {
 	# remove part to make udev happy
 	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
 
-	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
-
-	epatch "${FILESDIR}"/${P}-virtio-large-iovecs.patch
+	epatch "${FILESDIR}"/qemu-0.11.0-mips64-user-fix.patch \
+		"${FILESDIR}"/${PN}-0.12.3-fix-crash-with-sdl.patch \
+		"${FILESDIR}"/${PN}-0.12.3-include-madvise-defines.patch
 }
 
 src_configure() {
@@ -197,9 +196,11 @@ src_install() {
 	insinto /etc/udev/rules.d/
 	doins kvm/scripts/65-kvm.rules || die
 
-	insinto /etc/qemu/
-	insopts -m0755
-	doins kvm/scripts/qemu-ifup || die
+	if use qemu-ifup; then
+		insinto /etc/qemu/
+		insopts -m0755
+		doins kvm/scripts/qemu-ifup || die
+	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
 	newdoc pc-bios/README README.pc-bios || die