change to new style kvm-kmod upstream package

(Portage version: 2.1.7.16/cvs/Linux x86_64)

5 files changed, 24 insertions, 153 deletions

diff --git a/app-emulation/kvm-kmod/ChangeLog b/app-emulation/kvm-kmod/ChangeLog
index 61393456fc27..11214ea6e940 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.5 2009/09/21 14:59:42 dang Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/ChangeLog,v 1.6 2010/01/05 22:35:12 cardoe Exp $
+
+*kvm-kmod-2.6.32.2 (05 Jan 2010)
+
+  05 Jan 2010; Doug Goldstein <cardoe@gentoo.org> +kvm-kmod-2.6.32.2.ebuild,
+  -kvm-kmod-85.ebuild, -kvm-kmod-86.ebuild, -kvm-kmod-88-r1.ebuild,
+  metadata.xml:
+  change to new style kvm-kmod upstream package
 
   21 Sep 2009; Daniel Gryniewicz <dang@gentoo.org> metadata.xml:
   Remove myself as maintainer
diff --git a/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild b/app-emulation/kvm-kmod/kvm-kmod-2.6.32.2.ebuild
index 66272b9a3cf6..eb3198d40610 100644
--- a/app-emulation/kvm-kmod/kvm-kmod-88-r1.ebuild
+++ b/app-emulation/kvm-kmod/kvm-kmod-2.6.32.2.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm-kmod/kvm-kmod-2.6.32.2.ebuild,v 1.1 2010/01/05 22:35:12 cardoe 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"
+SRC_URI="mirror://sourceforge/kvm/${P}.tar.bz2"
 
 DESCRIPTION="Kernel-based Virtual Machine kernel modules"
 HOMEPAGE="http://www.linux-kvm.org"
@@ -21,10 +18,8 @@ IUSE=""
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-	!<app-emulation/kvm-85"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
 pkg_setup() {
 	linux-info_pkg_setup
 	if ! linux_chkconfig_present KVM; then
@@ -38,16 +33,12 @@ pkg_setup() {
 		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)"
+	MODULE_NAMES="kvm(kernel/arch/x86/kvm/:${S}:${S}/x86)"
+	MODULE_NAMES="${MODULE_NAMES} kvm-intel(kernel/arch/x86/kvm/:${S}:${S}/x86)"
+	MODULE_NAMES="${MODULE_NAMES} kvm-amd(kernel/arch/x86/kvm/:${S}:${S}/x86)"
 	linux-mod_pkg_setup
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_P}-2.6.30.patch
-}
-
 src_configure() {
 	local conf_opts
 
@@ -67,3 +58,10 @@ src_compile() {
 src_install() {
 	linux-mod_src_install
 }
+
+pkg_preinst() {
+	find /lib/modules/${KV_FULL} -name 'kvm*.ko' -type f -delete
+
+	linux-mod_pkg_preinst
+}
+
diff --git a/app-emulation/kvm-kmod/kvm-kmod-85.ebuild b/app-emulation/kvm-kmod/kvm-kmod-85.ebuild
deleted file mode 100644
index 3a0592c74e46..000000000000
--- a/app-emulation/kvm-kmod/kvm-kmod-85.ebuild
+++ /dev/null
@@ -1,67 +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-85.ebuild,v 1.2 2009/04/28 14:23:55 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-MY_PN="${PN}-devel"
-MY_P="${MY_PN}-${PV}"
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20090218"
-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
-}
diff --git a/app-emulation/kvm-kmod/kvm-kmod-86.ebuild b/app-emulation/kvm-kmod/kvm-kmod-86.ebuild
deleted file mode 100644
index 72f0671fadcf..000000000000
--- a/app-emulation/kvm-kmod/kvm-kmod-86.ebuild
+++ /dev/null
@@ -1,67 +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-86.ebuild,v 1.1 2009/05/28 15:49:07 dang Exp $
-
-EAPI="2"
-
-inherit eutils linux-mod
-
-MY_PN="${PN}-devel"
-MY_P="${MY_PN}-${PV}"
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20090218"
-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
-}
diff --git a/app-emulation/kvm-kmod/metadata.xml b/app-emulation/kvm-kmod/metadata.xml
index 7b5373c2f609..e5abd6a01ee8 100644
--- a/app-emulation/kvm-kmod/metadata.xml
+++ b/app-emulation/kvm-kmod/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>none</herd>
+	<herd>qemu</herd>
 	<maintainer>
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>