From db580c6c320fe032f4b03bc6ea107dd3b0cd4003 Mon Sep 17 00:00:00 2001
From: Daniel Gryniewicz <dang@gentoo.org>
Date: Mon, 27 Jul 2009 13:57:06 +0000
Subject: Fix kvm-kmod for 2.6.30; bug #278804 Package-Manager:
 portage-2.2_rc33/cvs/Linux x86_64

---
 app-emulation/kvm-kmod/ChangeLog                   |  9 ++-
 app-emulation/kvm-kmod/Manifest                    | 11 ++--
 .../kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch  | 12 ++++
 app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild       | 69 ++++++++++++++++++++++
 app-emulation/kvm-kmod/kvm-kmod-88.ebuild          | 65 --------------------
 5 files changed, 95 insertions(+), 71 deletions(-)
 create mode 100644 app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch
 create mode 100644 app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild
 delete mode 100644 app-emulation/kvm-kmod/kvm-kmod-88.ebuild

(limited to 'app-emulation')

diff --git a/app-emulation/kvm-kmod/ChangeLog b/app-emulation/kvm-kmod/ChangeLog
index 1fa9264b6dd3..d5a0298251ca 100644
--- a/app-emulation/kvm-kmod/ChangeLog
+++ b/app-emulation/kvm-kmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/kvm-kmod
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/ChangeLog,v 1.3 2009/07/21 18:26:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/ChangeLog,v 1.4 2009/07/27 13:57:06 dang Exp $
+
+*kvm-kmod-88-r1 (27 Jul 2009)
+
+  27 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> -kvm-kmod-88.ebuild,
+  +kvm-kmod-88-r1.ebuild, +files/kvm-kmod-devel-88-2.6.30.patch:
+  Fix kvm-kmod for 2.6.30; bug #278804
+
 
 *kvm-kmod-88 (21 Jul 2009)
 
diff --git a/app-emulation/kvm-kmod/Manifest b/app-emulation/kvm-kmod/Manifest
index 7ee5a3c6f928..8781f63ddc6a 100644
--- a/app-emulation/kvm-kmod/Manifest
+++ b/app-emulation/kvm-kmod/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kvm-kmod-devel-88-2.6.30.patch 556 RMD160 652c2fc6f4d25a7675e9003e3a0f11e11e438fbf SHA1 c34b59332d28673940642afb592b7bc1c9a1944e SHA256 22b4b0eec48b274e3c314888f374b3159c3dea5c78e8a7958df132c5acd2b49b
 DIST kvm-kmod-devel-85.tar.gz 302874 RMD160 c765e406a63578f0c6e2c8fedb47ab1b3f4cd033 SHA1 ff5ac54eb6865d5d0287c687def8049e527eadf3 SHA256 2260cb6c759a21024b2407807f7c3c9fb1b312d68f0a65b0316865edb4e12bd7
 DIST kvm-kmod-devel-86.tar.gz 304727 RMD160 21e9c7a7dc001e64c73a7500c19635679238b76a SHA1 27de4fbee3a31bb56b85a63a0bd506ab4eaf20a5 SHA256 18910352e49c7a99bc48377e3a7e6ab975dd3daa6a81fb087f71ee501f8f6a71
 DIST kvm-kmod-devel-88.tar.gz 324670 RMD160 bcffb5cf378f94c8f9523ab8cd22f60751cb6b7f SHA1 e74df921372ce041d235aa28073dc61c621cb29d SHA256 eb6c9c5ee6d4fd78640d01a98bb0aa27a75221c7330b9407539cf9de33b3d797
 EBUILD kvm-kmod-85.ebuild 1645 RMD160 0df0903da728f2830f03107a46624936818d3417 SHA1 a805a7b8da30850ec1848dd6caafd11c35d39262 SHA256 375573413c8e7c9e7e3e0032a8a0b312c5c3b02aa34cc9b42b645b10b077aa93
 EBUILD kvm-kmod-86.ebuild 1640 RMD160 dd8c26d54d656009ba1949bd54e6675b4570f451 SHA1 7e006b7ab1115c89e9c4a7f7d4ed844c34ca6491 SHA256 87f0a574be44609e7cf0c4c1d69afc5917b0f0e1268d66e091c30e23a0ac0120
-EBUILD kvm-kmod-88.ebuild 1535 RMD160 6b9c16f1f07aee306ed574b1b138d272a4ad8106 SHA1 9ed4716b2e8b366af64ee1b42e08c1d1d11153dc SHA256 a03f9abfca12ea2a2e43c346a54ae2e2ac5fd3fb187c7ea064ffb274aa5e0326
-MISC ChangeLog 631 RMD160 740e9325890a520a64f0be459c339287992dd530 SHA1 1f3096d106427aa3221495d002b200f3395f78f1 SHA256 c164b6551822c5c9c51c64f453974fa5c0cc1c5927a400c4eb67e0d31e8912cf
+EBUILD kvm-kmod-88-r1.ebuild 1600 RMD160 ac2ff891f82a5f1251e325e7daea7ec467343388 SHA1 a976a6d58e9968e9cb7d9a4828c96c38c7f81b7d SHA256 7ca44edc6d7eaa04c47a69382e5ad37d1b029702f902d10bc633293629b6b277
+MISC ChangeLog 840 RMD160 87d60e4111f6c2bf452e929ac192c67816c0ac7f SHA1 689b3697855d7c438de04ede7170d8bc4ba22c7f SHA256 3f075db3fded0dcccc6ea31f8c958ff7e94eb4cb447e67ceefbfb88c65f27921
 MISC metadata.xml 607 RMD160 dbdf8770baf998542d7a1d8ca972862822614f87 SHA1 e8238d0ae4b04c26a2342883bc06ebfcedeb004f SHA256 2d16aaf235783c63debd819354ae8f4361dc19b54f07351ba1757fbb2169f443
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFKZgiBomPajV0RnrERAkoOAJsEyNkwq1aHU8pwKRTwdXJ+CQ7zIwCfYFUa
-Yy/L/hdBIuXxdCJDy5WOJ2A=
-=MkSu
+iD8DBQFKbbJxomPajV0RnrERAmjLAJ4m/QD0ilYbQvEaO7Thtp+oqowI0gCfXVoW
+2wEOBZ983Ac80jo+TLYWmyw=
+=xQKI
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch b/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch
new file mode 100644
index 000000000000..0dbfa87dcbae
--- /dev/null
+++ b/app-emulation/kvm-kmod/files/kvm-kmod-devel-88-2.6.30.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-kmod-devel-88.orig/external-module-compat-comm.h kvm-kmod-devel-88/external-module-compat-comm.h
+--- kvm-kmod-devel-88.orig/external-module-compat-comm.h	2009-07-12 09:19:45.000000000 -0400
++++ kvm-kmod-devel-88/external-module-compat-comm.h	2009-07-27 09:53:10.153459004 -0400
+@@ -845,7 +845,7 @@ static inline struct file *eventfd_fget(
+ 
+ #include <linux/tracepoint.h>
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+ 
+ struct tracepoint;
+ 
diff --git a/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild b/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild
new file mode 100644
index 000000000000..66272b9a3cf6
--- /dev/null
+++ b/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild,v 1.1 2009/07/27 13:57:06 dang Exp $
+
+EAPI="2"
+
+inherit eutils linux-mod
+
+MY_PN="${PN}-devel"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="mirror://sourceforge/kvm/${MY_P}.tar.gz"
+
+DESCRIPTION="Kernel-based Virtual Machine kernel modules"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	!<app-emulation/kvm-85"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	linux-info_pkg_setup
+	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}:${S}/x86)"
+	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}:${S}/x86)"
+	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}:${S}/x86)"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-2.6.30.patch
+}
+
+src_configure() {
+	local conf_opts
+
+	conf_opts="--kerneldir=$KV_DIR"
+
+	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
+		conf_opts="$conf_opts --arch=x86"
+	fi
+
+	./configure ${conf_opts} || die "configure failed"
+}
+
+src_compile() {
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-88.ebuild b/app-emulation/kvm-kmod/kvm-kmod-88.ebuild
deleted file mode 100644
index c5f4a910fc0f..000000000000
--- a/app-emulation/kvm-kmod/kvm-kmod-88.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-88.ebuild,v 1.1 2009/07/21 18:26:11 dang Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-MY_PN="${PN}-devel"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="mirror://sourceforge/kvm/${MY_P}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine kernel modules"
-HOMEPAGE="http://www.linux-kvm.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!<app-emulation/kvm-85"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	linux-info_pkg_setup
-	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}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kvm:${S}:${S}/x86)"
-	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kvm:${S}:${S}/x86)"
-	linux-mod_pkg_setup
-}
-
-src_configure() {
-	local conf_opts
-
-	conf_opts="--kerneldir=$KV_DIR"
-
-	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
-		conf_opts="$conf_opts --arch=x86"
-	fi
-
-	./configure ${conf_opts} || die "configure failed"
-}
-
-src_compile() {
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-}
-- 
cgit v1.2.3-65-gdbad