Bump to kvm-78

(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 32 insertions, 22 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/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() {