change to new style kvm-kmod upstream package

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

6 files changed, 32 insertions, 165 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/Manifest b/app-emulation/kvm-kmod/Manifest
index a89b3096a86b..91f75c6b78a7 100644
--- a/app-emulation/kvm-kmod/Manifest
+++ b/app-emulation/kvm-kmod/Manifest
@@ -2,18 +2,14 @@
 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-r1.ebuild 1600 RMD160 ac2ff891f82a5f1251e325e7daea7ec467343388 SHA1 a976a6d58e9968e9cb7d9a4828c96c38c7f81b7d SHA256 7ca44edc6d7eaa04c47a69382e5ad37d1b029702f902d10bc633293629b6b277
-MISC ChangeLog 936 RMD160 bbd63c183d86bdf64d2dd6c6026b2a70370af09e SHA1 9ac067d1d96b8e90b2e46b22b2ed9d7fbefd5625 SHA256 b5c4899e357d0bd0c79269933379982814ed8651b5c825918fd1560e1141f93b
-MISC metadata.xml 512 RMD160 dc8c7e9f4f4151c6631ea919ed99bc6ec86c260f SHA1 d0ef64bdc8337f9e245190650f5ae2c60d8cca6f SHA256 a8e91cd1a7e66b0a4d177d5a8ec385ed94350a79519f551fcbeb2b6a7c5ed3d2
+DIST kvm-kmod-2.6.32.2.tar.bz2 276645 RMD160 dab2e90c1ed4b5fe7f5031b1cd5013a9e05b4d63 SHA1 1b3cfef78f25822d3f05500c23055ceec4bd1e34 SHA256 8b30bcf310b48a21e9588933af2543aeee5878c84d67c1c3efc1282b3d7e2434
+EBUILD kvm-kmod-2.6.32.2.ebuild 1608 RMD160 252df33ae8b0302d6ea156065eb0c4305037aca0 SHA1 60a8f6b9c50f1923aefe20e3347639267f4581ed SHA256 3aa8236cdd6ab59751d039ec12c69fe4e239390e9d55f3f209f525f8d7169fe0
+MISC ChangeLog 1182 RMD160 be66da86cda99f470db56602a01280019cc81c86 SHA1 b921a0e6ad64d79a6696b2e7ca8b57b1dc505200 SHA256 8b0e84ea6e7c18188af3b4599d82f57b42986ee9338ccb7182b393eeef2f3742
+MISC metadata.xml 512 RMD160 4532b7bf47ac6f68e996616f4b2346da780f9785 SHA1 9b8cb95d6eebe3f1a1486c0952ca7eefd56e6e3b SHA256 2cfef7df1c5fed551003a189f27badfa45dc60456976d4407b77c73df98adafc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iD8DBQFKt5TkomPajV0RnrERAsxyAJ9uIIJEEK+rb25KYZ2zc4eg0/cSmgCeKtuR
-E57YQ1Mk+nVKHyRl++SpRp4=
-=8x5I
+iEYEARECAAYFAktDvqoACgkQoeSe8B0zEfy1+wCeOYm9QOnztaEaEsNVAy+K+vjY
+9V0An0PR3PSjG1+qyXvERZls4sa3eCsD
+=XCdU
 -----END PGP SIGNATURE-----
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>