Bump to kvm-78

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 40 insertions, 29 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index 31fca587751e..e39c205ac5a3 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.19 2008/10/21 01:08:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.20 2008/11/06 19:20:02 dang Exp $
+
+*kvm-78 (06 Nov 2008)
+
+  06 Nov 2008; Daniel Gryniewicz <dang@gentoo.org> -kvm-74.ebuild,
+  kvm-77.ebuild, +kvm-78.ebuild:
+  Bump to kvm-78
 
   21 Oct 2008; Daniel Gryniewicz <dang@gentoo.org> kvm-77.ebuild:
   Turn on modules by default; that's what most people want
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 3c7ac9c57c01..96f26b55664a 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST kvm-74.tar.gz 4203618 RMD160 adfd0d3e3c79c75e8a9dd5d470c5104cf11307ac SHA1 c2580cd19e867ff77029326f412b8dfcf115bb3a SHA256 4454f0c2516cf4794c9ca5c6f9797c6be251db36643f04e5c8aaa2c5532ecd3e
 DIST kvm-75.tar.gz 4108859 RMD160 e536cce39653111c1eb4d9eda8e908ae381362b8 SHA1 6b86df5554748998a31a1609cd8b4593af7cd3f0 SHA256 fff3add1e16b3ece8edfb29b10cbdcefed95d8a18ceac77b008a241a2427d0bf
 DIST kvm-77.tar.gz 7320987 RMD160 3bb7cf48af0af2062769b95485c4a504a1274cd7 SHA1 bb3d0d09b369a4561e4cfe5de58bdf77b1d6a16e SHA256 9b6c1d61d27e5e67daea751b908927fc7290e0f15b3f4bbe391e154404d8abca
+DIST kvm-78.tar.gz 4231476 RMD160 b4b06a717f6d9212feebd2b2744f3fc89a586a45 SHA1 18d0cb5958d9d3968710cd7a62349ae3d23ca830 SHA256 1ade8847ea3f72b662eedb01f7447325915ca243c3ea86b22ecbb5fafbed6217
 DIST kvm-patches-20080822.tar.gz 25178 RMD160 4640f1da457b3ab2da66f8ef6dc98f83464b741e SHA1 827f7a932968e4027902892191cf29cafc5f662a SHA256 811d8541f395c682d98384c7304486e0b47d8fcf6e3df2e02f5ccd7dee353dfb
 DIST kvm-patches-20081020.tar.gz 21961 RMD160 8c51fa76fb0ec7b8bc4734c6b42e7dcd078bedcd SHA1 470678a4ffe7a25f2ab957ce5eaf5ab6fd730920 SHA256 424d13f264a65de2919bb37af3059391dcaf5fc82e304c6f4366f619c38cd478
-EBUILD kvm-74.ebuild 6884 RMD160 0430399ea1e5905725270c6f729a9c2e3eb56225 SHA1 fc751a2154dafc48e2b23a244f5cffaa2f879c97 SHA256 14c196bcd5dbb6e4257159880d8226d30413d197bb1531ad763a691510758ce9
+DIST kvm-patches-20081106.tar.gz 21997 RMD160 f5585a2a3d8bb6e55827a85a689699e10c3338a6 SHA1 0b72d22b65bb01d3d1f4d190290bb0ee59a47f6b SHA256 3077741aff3aaf3b114fc9dd6bc15633ca043c6161ca58535bff0bd5bc21cc73
 EBUILD kvm-75.ebuild 6884 RMD160 aa189a1a1bd03e5088377742697a7ce8987de42c SHA1 e16a3d60e9e3be82e2d2c919eeb90c16e728d341 SHA256 f3561a33882a46235ea57a770a327449fd62dab95ddb38f4e892f28aac988ef6
-EBUILD kvm-77.ebuild 6784 RMD160 e63e49fbbf69404b39f384d4032ff24384b66cf3 SHA1 c83ed659a71eac6f15f7c11a2a061c38c7bffed4 SHA256 ec4ee89511fc7ba72301acce8187943df278cf3e025e1bc3f6a92e42c20442d7
-MISC ChangeLog 5745 RMD160 fd3ff621ef6fc974797b38ae3135e5ef0709e4b3 SHA1 0ea23cfaa91378148a00f33c5db8e9f5101e3940 SHA256 1dcee111592b36560519285f4823cfcbcc59241c8456d00fef93373d928a2c78
+EBUILD kvm-77.ebuild 6785 RMD160 4a95b99f9327c01d6b42ad2d97761208fd137e43 SHA1 a439d709ded61094c89a6a283a020c338da76436 SHA256 17f4905e61b79c41640ad411f96237ae20158af5331a6db0840e30075a6ceda1
+EBUILD kvm-78.ebuild 6785 RMD160 c3456efcca89ba905431ba6bfb829326c4083e12 SHA1 90f10f7d00678d5f85df4275b575fff7c5864549 SHA256 0468c699b2dfb061b7ea0030e2f6032037e1c99c6c202bbe0ff2ddf7fe72468a
+MISC ChangeLog 5886 RMD160 92b74a6d7992e9dd1843545b4a81523b366c5cea SHA1 f7453a4379637ef9a55effd18da1be52dcb35b6d SHA256 edf0b55e2a9b491677205269569ed27685cedd7a43d2d98125414c91d5558096
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFI/SusomPajV0RnrERAnWnAJ4zS5nDVhnsyzqKU0lLajL461v7JQCfeY2u
-5cRX6Oqcxx+GRs0Ycc5tero=
-=/8q/
+iD8DBQFJE0NvomPajV0RnrERAnX4AJ44fKVZ+p41QvYC+I1NXl5DgXiAMwCeLCzq
+JeUHUYPaAB+A6RgX27toSBo=
+=WJFp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-77.ebuild b/app-emulation/kvm/kvm-77.ebuild
index d56388d4be3e..752307e689d6 100644
--- a/app-emulation/kvm/kvm-77.ebuild
+++ b/app-emulation/kvm/kvm-77.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-77.ebuild,v 1.2 2008/10/21 01:08:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-77.ebuild,v 1.3 2008/11/06 19:20:02 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 # Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio sdl test vde"
+IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-emulation/kvm/kvm-74.ebuild b/app-emulation/kvm/kvm-78.ebuild
index 9723e9f0d94a..99f025ae8b93 100644
--- a/app-emulation/kvm/kvm-74.ebuild
+++ b/app-emulation/kvm/kvm-78.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-74.ebuild,v 1.1 2008/09/09 14:36:49 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-78.ebuild,v 1.1 2008/11/06 19:20:02 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
+EAPI="1"
+
 # Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20080822"
+PATCHSET="kvm-patches-20081106"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/${PATCHSET}.tar.gz"
 
@@ -16,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 # Add bios back when it builds again
-IUSE="alsa esd gnutls havekernel modules ncurses pulseaudio sdl test vde"
+IUSE="alsa esd gnutls havekernel +modules ncurses pulseaudio +sdl test vde"
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
@@ -40,6 +42,7 @@ DEPEND="${RDEPEND}
 QA_TEXTRELS="usr/bin/kvm"
 
 pkg_setup() {
+	linux-info_pkg_setup
 	if use havekernel && use modules ; then
 		ewarn "You have the 'havekernel' and 'modules' use flags enabled."
 		ewarn "'havekernel' trumps 'modules'; the kvm modules will not"
@@ -49,17 +52,24 @@ pkg_setup() {
 		ewarn "You have the 'havekernel' use flag set.  This means you"
 		ewarn "must ensure you have a compatible kernel on your own."
 	elif use modules ; then
+		if ! linux_chkconfig_present KVM; then
+			eerror "KVM now needs CONFIG_KVM built into your kernel, even"
+			eerror "if you're using the external modules from this package."
+			eerror "Please enable KVM support in your kernel, found at:"
+			eerror
+			eerror "  Virtualization"
+			eerror "    Kernel-based Virtual Machine (KVM) support"
+			eerror
+			die "KVM support not detected!"
+		fi
 		BUILD_TARGETS="all"
 		MODULE_NAMES="kvm(kvm:${S}/kernel:${S}/kernel/x86)"
 		MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}/kernel:${S}/kernel/x86)"
 		MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}/kernel:${S}/kernel/x86)"
 		linux-mod_pkg_setup
-	elif kernel_is lt 2 6 22; then
-		eerror "the kvm in your kernel requires an older version of"
-		eerror "kvm as shown in :"
-		eerror "  http://kvm.qumranet.com/kvmwiki/Downloads"
-		eerror "Either upgrade your kernel, or enable the 'modules'"
-		eerror "USE flag."
+	elif kernel_is lt 2 6 25; then
+		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+		eerror "Either upgrade your kernel, or enable the 'modules' USE flag."
 		die "kvm version not compatible"
 	elif ! linux_chkconfig_present KVM; then
 		eerror "Please enable KVM support in your kernel, found at:"
@@ -89,16 +99,10 @@ src_unpack() {
 	# avoid strip
 	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
 
-	epatch \
-		"${WORKDIR}/${PATCHSET}"/kvm-45-qemu-configure.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-61-qemu-kvm.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-57-qemu-kvm-cmdline.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-68-libkvm-no-kernel.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-69-qemu-ifup_ifdown.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-70-block-rw-range-check.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-73-qemu-no-blobs.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-73-qemu-kvm-doc.patch \
-		"${WORKDIR}/${PATCHSET}"/kvm-73-kernel-longmode.patch
+	# apply patchset
+	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
+	EPATCH_SUFFIX="patch"
+	epatch
 }
 
 src_compile() {