Version bump to kvm-39. Removed obsolete versions.

svn path=/trunk/; revision=36

12 files changed, 37 insertions, 268 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index fb5bdee..606559e 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  -files/kvm_add-scripts-qemu-ifup.patch,
+  -files/kvm_use_bios_files_in_usr_share_kvm.patch,
+  -files/kvm_use_etc_kvm_kvm-ifup.patch, -kvm-33.ebuild, -kvm-35.ebuild,
+  -kvm-36-r1.ebuild, +kvm-39.ebuild:
+  Version bump to kvm-39. Removed obsolete versions.
+
   10 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> +kvm-37.ebuild:
   Version bump to kvm-37.
 
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 586e8d4..bbaffcc 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -5,18 +5,6 @@ AUX kvm-kvm.patch 3506 RMD160 80e46ff357060c90f6d19f14d4f216c40ee0b26a SHA1 0bb8
 MD5 09611c7bc9c955a13e2d65b241cfd405 files/kvm-kvm.patch 3506
 RMD160 80e46ff357060c90f6d19f14d4f216c40ee0b26a files/kvm-kvm.patch 3506
 SHA256 bb1c3a2a16ef511b92f596d21ba005d88aee347a2a50a5da20d91229398ce2ef files/kvm-kvm.patch 3506
-AUX kvm_add-scripts-qemu-ifup.patch 359 RMD160 d66e31dedd21c5fb752721ae2bc86caaf0e1301d SHA1 3e5eede431640625a2cfc03c4f1a39b0bd3f33fe SHA256 7f47028bc50cc669bebe1ca70e667a296715601601be71049a2f7c1d211bb320
-MD5 11750a6894c39ab6350cb62c034b6796 files/kvm_add-scripts-qemu-ifup.patch 359
-RMD160 d66e31dedd21c5fb752721ae2bc86caaf0e1301d files/kvm_add-scripts-qemu-ifup.patch 359
-SHA256 7f47028bc50cc669bebe1ca70e667a296715601601be71049a2f7c1d211bb320 files/kvm_add-scripts-qemu-ifup.patch 359
-AUX kvm_use_bios_files_in_usr_share_kvm.patch 306 RMD160 e9f299ea50151d7eb41a33d05dd86dca766d319d SHA1 8a721d15f518ed20da0ba9852737b119c4fa724f SHA256 3757405b687431d5998d89cf844015713b6b3d6dc90965bdc73bd0dfec38c585
-MD5 0088f7d64734479ddd9c181dfdacd070 files/kvm_use_bios_files_in_usr_share_kvm.patch 306
-RMD160 e9f299ea50151d7eb41a33d05dd86dca766d319d files/kvm_use_bios_files_in_usr_share_kvm.patch 306
-SHA256 3757405b687431d5998d89cf844015713b6b3d6dc90965bdc73bd0dfec38c585 files/kvm_use_bios_files_in_usr_share_kvm.patch 306
-AUX kvm_use_etc_kvm_kvm-ifup.patch 437 RMD160 d1127dd655b94fc518c9bb9abc7e8a72b75e0330 SHA1 403acc59c7b9a61ff25da302bb094116b6ebe23c SHA256 3c49a8a11f5941f148f09ad3bedda6fa2513e83d746f39060be09b05beec48ce
-MD5 3c362ab33d2691d93b538cf965090dfe files/kvm_use_etc_kvm_kvm-ifup.patch 437
-RMD160 d1127dd655b94fc518c9bb9abc7e8a72b75e0330 files/kvm_use_etc_kvm_kvm-ifup.patch 437
-SHA256 3c49a8a11f5941f148f09ad3bedda6fa2513e83d746f39060be09b05beec48ce files/kvm_use_etc_kvm_kvm-ifup.patch 437
 AUX qemu-configure.patch 310 RMD160 abd1b6930bc9ab0edcb5dcc1f753f1c8abb10419 SHA1 c4c5e339c602075c10f658587d5359385da65940 SHA256 df3d5086b934ee7a5ffed0832283a1a9c1120230fe397aedf1454fe1aa6c54a3
 MD5 2bd148274e1aab150c80098488b5c01e files/qemu-configure.patch 310
 RMD160 abd1b6930bc9ab0edcb5dcc1f753f1c8abb10419 files/qemu-configure.patch 310
@@ -29,50 +17,34 @@ AUX scripts-qemu-ifup.patch 847 RMD160 631b0804395115eb12aa411017982ca41233a181
 MD5 734e3f36bed683479dd8de7d5a0c251d files/scripts-qemu-ifup.patch 847
 RMD160 631b0804395115eb12aa411017982ca41233a181 files/scripts-qemu-ifup.patch 847
 SHA256 09e519488c0aa9b2ea6001d46c51ca3058e35409299bc13e79c9cb7cdac6e532 files/scripts-qemu-ifup.patch 847
-DIST kvm-33.tar.gz 2250014 RMD160 724a87ac61f7b5a1ac8d9f43c700fa55d0fc5d8f SHA1 699e6bcdf52840f7779f4836b3a42549b5a123ec SHA256 b9ed69b2416ec1d7dd0d4d66092eb3f259329771ca3da75e3e0dc101ca83c24c
-DIST kvm-35.tar.gz 2285167 RMD160 9770d3654e339c7ae5fd67c51d9edd8fc44e94e1 SHA1 5e20b856915091c2eb9da2adf47ef95cf6346e8b SHA256 08cc019b019289b08fca445d19b5a79b2372fe1e728acd718a15c5b37c7c0ba3
-DIST kvm-36.tar.gz 2562588 RMD160 b6cd150ffa0aae075bcd80571ec359c7ee8c685c SHA1 173cc293835bec231271542e4abd80252b5c014a SHA256 5e8125ff0c77908eb566f1a1c535646a53ff4865305da2d0348d7af9b91d7680
 DIST kvm-37.tar.gz 2678709 RMD160 71d916ead7c0aa9f386ea53cb6b807ceba9aa800 SHA1 306fde7e4f8e80d5ebd69eaf26732aa7119aab09 SHA256 de9e80c69ddf58a33b1a080c301f3ade37d2eea8472a3b09182f01566fe455a8
-EBUILD kvm-33.ebuild 2123 RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 SHA1 0a7479974fbb1a78d2555282bb2cd0a4dd6365eb SHA256 6dfeb6b87f64159722f5f8dbe145f157f399758e5aafe9f10bdd1ad35ebfd11d
-MD5 6a3e06972a864b566ce7beeb5a8826a5 kvm-33.ebuild 2123
-RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 kvm-33.ebuild 2123
-SHA256 6dfeb6b87f64159722f5f8dbe145f157f399758e5aafe9f10bdd1ad35ebfd11d kvm-33.ebuild 2123
-EBUILD kvm-35.ebuild 2123 RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 SHA1 0a7479974fbb1a78d2555282bb2cd0a4dd6365eb SHA256 6dfeb6b87f64159722f5f8dbe145f157f399758e5aafe9f10bdd1ad35ebfd11d
-MD5 6a3e06972a864b566ce7beeb5a8826a5 kvm-35.ebuild 2123
-RMD160 f325225eabe825df2a66a2ec71eada62cd23c578 kvm-35.ebuild 2123
-SHA256 6dfeb6b87f64159722f5f8dbe145f157f399758e5aafe9f10bdd1ad35ebfd11d kvm-35.ebuild 2123
-EBUILD kvm-36-r1.ebuild 3737 RMD160 6a379f0428878be6333a6bbae55548306d9cc1df SHA1 0868be4ed35102dce527d90279c4f5392066cb88 SHA256 9bd98d353c8aa6b7e93a84f7d14a42fb5885ce148d673115f338f59f59205cc7
-MD5 6398f55119a67f01cde3e55ea64d4887 kvm-36-r1.ebuild 3737
-RMD160 6a379f0428878be6333a6bbae55548306d9cc1df kvm-36-r1.ebuild 3737
-SHA256 9bd98d353c8aa6b7e93a84f7d14a42fb5885ce148d673115f338f59f59205cc7 kvm-36-r1.ebuild 3737
+DIST kvm-39.tar.gz 3065442 RMD160 97123332cd5532708a659ffbbb201f8cbbb53677 SHA1 bae806a81b8fdb8b476d13d1e7cbeaef47f14fe1 SHA256 c3e57e15229bf94f0847bd71551e0d4ab01450676ae32f4a4fa28f36f911c156
 EBUILD kvm-37.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a437cceca6f603e47883745ed3a016f2d6dbaff1 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e
 MD5 26e3fb7d8265357601478499fee41b8c kvm-37.ebuild 3765
 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-37.ebuild 3765
 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e kvm-37.ebuild 3765
-MISC ChangeLog 778 RMD160 7f2496c9766bc9d3ea1580653e84a3fbe0d8e9c1 SHA1 092b278ac130a10d89efe8ba9aee5c17e73b24cf SHA256 cea9ca291d55c376af2b2ffff1c6d6ea325fdf490053211993c514ebd4b9e896
-MD5 d9b36e011c1f6df2f9be8def89f784a7 ChangeLog 778
-RMD160 7f2496c9766bc9d3ea1580653e84a3fbe0d8e9c1 ChangeLog 778
-SHA256 cea9ca291d55c376af2b2ffff1c6d6ea325fdf490053211993c514ebd4b9e896 ChangeLog 778
+EBUILD kvm-39.ebuild 3765 RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 SHA1 a437cceca6f603e47883745ed3a016f2d6dbaff1 SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e
+MD5 26e3fb7d8265357601478499fee41b8c kvm-39.ebuild 3765
+RMD160 7053a04370c6ab63bc8679a61e25df4999014ed0 kvm-39.ebuild 3765
+SHA256 66cd7eeb55042b303317799322117afe61906e70edb8ff4f3999d66a3ba0249e kvm-39.ebuild 3765
+MISC ChangeLog 1091 RMD160 6bc9027965cc0a5f642ee0a6fa1b837d9a16cfd3 SHA1 e956f8c9244ffe2ce87dcb74a4ff8cdac6c77d99 SHA256 b48f9317f684925f267ec85b7f02987dc2819e111c20063fd4726ea2340e817f
+MD5 903255ff50939d073ecc7414a07d7d05 ChangeLog 1091
+RMD160 6bc9027965cc0a5f642ee0a6fa1b837d9a16cfd3 ChangeLog 1091
+SHA256 b48f9317f684925f267ec85b7f02987dc2819e111c20063fd4726ea2340e817f ChangeLog 1091
 MISC metadata.xml 413 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f SHA1 c14660bd6d54594bef13c86f243308fc92687eb0 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988
 MD5 5c1d1436d6cc39b3b6bf03f9d4b611ec metadata.xml 413
 RMD160 dd5972a65a0cc44b4a9bd61cbcfe197270bb355f metadata.xml 413
 SHA256 32796ad3337db69538c94738b611438b27e6f199d19df26f0e20a471e313c988 metadata.xml 413
-MD5 369c549663a4318cfe06f2ed0ec0ef5c files/digest-kvm-33 223
-RMD160 5d8a738bdecf4d72f84b28d0b24e795a6102fc13 files/digest-kvm-33 223
-SHA256 3b137942fafc98f059158041b40db37a2cca4c736363e8fd7ef18841299ebfa1 files/digest-kvm-33 223
-MD5 a054cc7eecc3344a807db791b7c4a61f files/digest-kvm-35 223
-RMD160 dcdf440cca2f064f2257326925880d2302241ac0 files/digest-kvm-35 223
-SHA256 a7a7565ddec84a9ebe3f989ea56ef81159b0a414c68fc5c9aaf24148c7b42457 files/digest-kvm-35 223
-MD5 2771a4b4b83a0701984a6690fc5e0b10 files/digest-kvm-36-r1 223
-RMD160 328cdebc94ca3e7aa898b3d0b261e75d96da6be2 files/digest-kvm-36-r1 223
-SHA256 fe5c3e109884a1d9c4327e864486c03e075c2bdb00562606d8e8f4c922718147 files/digest-kvm-36-r1 223
 MD5 7ce124381ae59d30ec6873b357a6fc22 files/digest-kvm-37 223
 RMD160 2fa7f480b1129b38e30bd02f0ea93010f02999e3 files/digest-kvm-37 223
 SHA256 8686d44d82b61436f315b0129690badc6ffba7876989bba7837a6bb8c7aa8a1c files/digest-kvm-37 223
+MD5 a89e7fa054b5998929d28a4d5ab17f5f files/digest-kvm-39 223
+RMD160 47c1753cbae3816746dfbe58ff487f5647b4cddf files/digest-kvm-39 223
+SHA256 6c1d6fb06d80f0d972f18a24f384d352357dfd09d2d61f2bfb233522a83a0d14 files/digest-kvm-39 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG5NHJCkvF58q80IkRAklNAJ4iT9AUcdBi7fJp7vvZ1G2TUvqPpQCfeCbT
-sqs/LWBAlUbIg9h5w/vR+Ug=
-=9EvD
+iD8DBQFG6BP8CkvF58q80IkRAicaAJ9/RoFWa+Nc59N2wJaTYrtytstV1wCfSFKR
+BN5Ot146XrSSDuusCqljuAY=
+=Zg4C
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/files/digest-kvm-33 b/app-emulation/kvm/files/digest-kvm-33
deleted file mode 100644
index 297ab8f..0000000
--- a/app-emulation/kvm/files/digest-kvm-33
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aafb33231101cbb6a8533baf781345bd kvm-33.tar.gz 2250014
-RMD160 724a87ac61f7b5a1ac8d9f43c700fa55d0fc5d8f kvm-33.tar.gz 2250014
-SHA256 b9ed69b2416ec1d7dd0d4d66092eb3f259329771ca3da75e3e0dc101ca83c24c kvm-33.tar.gz 2250014
diff --git a/app-emulation/kvm/files/digest-kvm-35 b/app-emulation/kvm/files/digest-kvm-35
deleted file mode 100644
index 2e395d4..0000000
--- a/app-emulation/kvm/files/digest-kvm-35
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d83569154ecca5da5514a130865d88c6 kvm-35.tar.gz 2285167
-RMD160 9770d3654e339c7ae5fd67c51d9edd8fc44e94e1 kvm-35.tar.gz 2285167
-SHA256 08cc019b019289b08fca445d19b5a79b2372fe1e728acd718a15c5b37c7c0ba3 kvm-35.tar.gz 2285167
diff --git a/app-emulation/kvm/files/digest-kvm-36-r1 b/app-emulation/kvm/files/digest-kvm-36-r1
deleted file mode 100644
index d928a79..0000000
--- a/app-emulation/kvm/files/digest-kvm-36-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fdbc4a6228f3876166fc0d6f01bb668 kvm-36.tar.gz 2562588
-RMD160 b6cd150ffa0aae075bcd80571ec359c7ee8c685c kvm-36.tar.gz 2562588
-SHA256 5e8125ff0c77908eb566f1a1c535646a53ff4865305da2d0348d7af9b91d7680 kvm-36.tar.gz 2562588
diff --git a/app-emulation/kvm/files/digest-kvm-39 b/app-emulation/kvm/files/digest-kvm-39
new file mode 100644
index 0000000..58ca63a
--- /dev/null
+++ b/app-emulation/kvm/files/digest-kvm-39
@@ -0,0 +1,3 @@
+MD5 be78e4bbae6f8cb32bcc9eb1d7d4d665 kvm-39.tar.gz 3065442
+RMD160 97123332cd5532708a659ffbbb201f8cbbb53677 kvm-39.tar.gz 3065442
+SHA256 c3e57e15229bf94f0847bd71551e0d4ab01450676ae32f4a4fa28f36f911c156 kvm-39.tar.gz 3065442
diff --git a/app-emulation/kvm/files/kvm_add-scripts-qemu-ifup.patch b/app-emulation/kvm/files/kvm_add-scripts-qemu-ifup.patch
deleted file mode 100644
index 37fc63e..0000000
--- a/app-emulation/kvm/files/kvm_add-scripts-qemu-ifup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Taken from upstream SVN, in scripts/qemu-ifup.
-
-diff -ruN scripts-orig/qemu-ifup scripts/qemu-ifup
---- scripts-orig/qemu-ifup	1970-01-01 02:00:00.000000000 +0200
-+++ scripts/qemu-ifup	2006-12-23 08:32:56.000000000 +0200
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+switch=$(ip route list | awk '/^default / { print $NF }')
-+ifconfig $1 0.0.0.0 up
-+brctl addif ${switch} $1
diff --git a/app-emulation/kvm/files/kvm_use_bios_files_in_usr_share_kvm.patch b/app-emulation/kvm/files/kvm_use_bios_files_in_usr_share_kvm.patch
deleted file mode 100644
index 8b54a5d..0000000
--- a/app-emulation/kvm/files/kvm_use_bios_files_in_usr_share_kvm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qemu/configure~	2006-11-02 14:25:06.000000000 +0200
-+++ qemu/configure	2007-01-12 11:54:05.000000000 +0200
-@@ -514,7 +514,7 @@
-     prefix="/usr/local"
- fi
- mandir="$prefix/share/man"
--datadir="$prefix/share/qemu"
-+datadir="$prefix/share/kvm"
- docdir="$prefix/share/doc/qemu"
- bindir="$prefix/bin"
- fi
diff --git a/app-emulation/kvm/files/kvm_use_etc_kvm_kvm-ifup.patch b/app-emulation/kvm/files/kvm_use_etc_kvm_kvm-ifup.patch
deleted file mode 100644
index d427bfb..0000000
--- a/app-emulation/kvm/files/kvm_use_etc_kvm_kvm-ifup.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-Use an independent script to control the network at startup.
-
-diff -ruN kvm-orig/qemu/vl.c kvm/qemu/vl.c
---- kvm-orig/qemu/vl.c	2007-02-14 06:56:52.000000000 +0100
-+++ kvm/qemu/vl.c	2007-02-14 18:38:13.000000000 +0100
-@@ -92,7 +92,7 @@
- #include "qemu-kvm.h"
- #endif
- 
--#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
-+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
- #ifdef __sun__
- #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
- #else
diff --git a/app-emulation/kvm/kvm-33.ebuild b/app-emulation/kvm/kvm-33.ebuild
deleted file mode 100644
index 93deaa8..0000000
--- a/app-emulation/kvm/kvm-33.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-MODULE_NAMES="kernel/kvm(extra:)
-			kernel/kvm-intel(extra:)
-			kernel/kvm-amd(extra:)"
-BUILD_TARGETS="kernel"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/kvm_use_bios_files_in_usr_share_kvm.patch
-	epatch ${FILESDIR}/kvm_add-scripts-qemu-ifup.patch
-	epatch ${FILESDIR}/kvm_use_etc_kvm_kvm-ifup.patch
-}
-
-src_compile() {
-
-	if [ "$(gcc-major-version)" == "4" ]; then
-		eerror "kvm requires gcc-3 in order to build and work correctly"
-		eerror "please compile it switching to gcc-3."
-		die "gcc 4 cannot build qemu"
-	fi
-
-	#fix make install to not install modules
-	sed -i '/$(kcmd)/d' ${WORKDIR}/${P}/Makefile
-
-	linux-mod_pkg_setup
-	conf_opts="--prefix=/usr"
-
-	./configure ${conf_opts} || die "configure failed"
-	#Check if kvm is NOT part of the kernel and compile the module
-	if ! linux_chkconfig_present KVM; then
-		linux-mod_src_compile
-		./configure ${conf_opts}
-	#If it is we need to disable the build of the module
-	else
-		./configure ${conf_opts} --with-patched-kernel || die "Configure failed"
-	fi
-	make user qemu || die "make failed"
-}
-
-pkg_preinst() {
-	enewgroup kvm
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	if ! linux_chkconfig_present KVM; then
-		linux-mod_src_install
-	fi
-
-	if use amd64; then
-		mv ${D}/usr/bin/qemu-system-x86_64 ${D}/usr/bin/kvm-system-x86_64
-	else
-		mv ${D}/usr/bin/qemu ${D}/usr/bin/kvm
-	fi
-
-	mv ${D}/usr/share/doc/qemu ${D}/usr/share/doc/kvm
-	mv ${D}/usr/share/man/man1/qemu.1 ${D}/usr/share/man/man1/kvm.1
-#	rm -f ${D}/usr/bin/qemu-img
-#	rm -f ${D}/usr/share/man/man1/qemu-img.1
-	insinto /etc/udev/rules.d/
-	doins ${WORKDIR}/${P}/scripts/65-kvm.rules
-	insinto /etc/kvm/
-	doins ${WORKDIR}/${P}/scripts/qemu-ifup
-}
diff --git a/app-emulation/kvm/kvm-35.ebuild b/app-emulation/kvm/kvm-35.ebuild
deleted file mode 100644
index 93deaa8..0000000
--- a/app-emulation/kvm/kvm-35.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-DESCRIPTION="KVM is a full virtualisation solution for Linux on hardware containing virtualization extensions (Intel VT or AMD-V)"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-MODULE_NAMES="kernel/kvm(extra:)
-			kernel/kvm-intel(extra:)
-			kernel/kvm-amd(extra:)"
-BUILD_TARGETS="kernel"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/kvm_use_bios_files_in_usr_share_kvm.patch
-	epatch ${FILESDIR}/kvm_add-scripts-qemu-ifup.patch
-	epatch ${FILESDIR}/kvm_use_etc_kvm_kvm-ifup.patch
-}
-
-src_compile() {
-
-	if [ "$(gcc-major-version)" == "4" ]; then
-		eerror "kvm requires gcc-3 in order to build and work correctly"
-		eerror "please compile it switching to gcc-3."
-		die "gcc 4 cannot build qemu"
-	fi
-
-	#fix make install to not install modules
-	sed -i '/$(kcmd)/d' ${WORKDIR}/${P}/Makefile
-
-	linux-mod_pkg_setup
-	conf_opts="--prefix=/usr"
-
-	./configure ${conf_opts} || die "configure failed"
-	#Check if kvm is NOT part of the kernel and compile the module
-	if ! linux_chkconfig_present KVM; then
-		linux-mod_src_compile
-		./configure ${conf_opts}
-	#If it is we need to disable the build of the module
-	else
-		./configure ${conf_opts} --with-patched-kernel || die "Configure failed"
-	fi
-	make user qemu || die "make failed"
-}
-
-pkg_preinst() {
-	enewgroup kvm
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	if ! linux_chkconfig_present KVM; then
-		linux-mod_src_install
-	fi
-
-	if use amd64; then
-		mv ${D}/usr/bin/qemu-system-x86_64 ${D}/usr/bin/kvm-system-x86_64
-	else
-		mv ${D}/usr/bin/qemu ${D}/usr/bin/kvm
-	fi
-
-	mv ${D}/usr/share/doc/qemu ${D}/usr/share/doc/kvm
-	mv ${D}/usr/share/man/man1/qemu.1 ${D}/usr/share/man/man1/kvm.1
-#	rm -f ${D}/usr/bin/qemu-img
-#	rm -f ${D}/usr/share/man/man1/qemu-img.1
-	insinto /etc/udev/rules.d/
-	doins ${WORKDIR}/${P}/scripts/65-kvm.rules
-	insinto /etc/kvm/
-	doins ${WORKDIR}/${P}/scripts/qemu-ifup
-}
diff --git a/app-emulation/kvm/kvm-36-r1.ebuild b/app-emulation/kvm/kvm-39.ebuild
index c905751..792b7c4 100644
--- a/app-emulation/kvm/kvm-36-r1.ebuild
+++ b/app-emulation/kvm/kvm-39.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=">=media-libs/libsdl-1.2.11
 		>=media-libs/alsa-lib-1.0.13
@@ -47,18 +47,18 @@ src_unpack() {
 	cd "${S}"
 
 	# Change script to change some options.
-	epatch ${FILESDIR}/kvm-kvm.patch
+	epatch "${FILESDIR}/kvm-kvm.patch"
 	# Improve the ifup script to allow for non-root use, etc.
-	epatch ${FILESDIR}/scripts-qemu-ifup.patch
+	epatch "${FILESDIR}/scripts-qemu-ifup.patch"
 	# Change the path to the network stuff to /etc/kvm
-	epatch ${FILESDIR}/qemu-vl.c.patch
+	epatch "${FILESDIR}/qemu-vl.c.patch"
 	# Change the DATADIR to kvm instead of qemu
-	epatch ${FILESDIR}/qemu-configure.patch
+	epatch "${FILESDIR}/qemu-configure.patch"
 }
 
 src_compile() {
 	# fix make install to not install modules
-	sed -i -e '/$(kcmd)/d' ${WORKDIR}/${P}/Makefile
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
 
 	# The included qemu is not intended to run without kvm. Thus, we can use
 	# gcc4 as well and disable the gcc-check for gcc3.
@@ -76,23 +76,23 @@ src_compile() {
 
 src_install() {
 	# fix make install to not install modules
-	sed -i -e '/$(kcmd)/d' ${WORKDIR}/${P}/Makefile
+	sed -i -e '/$(kcmd)/d' "${WORKDIR}/${P}/Makefile"
 
 	emake DESTDIR="${D}" install || die "make install failed"
 	linux-mod_src_install
 
 	exeinto /usr/bin/
-	doexe ${S}/kvm ${S}/kvm_stat
+	doexe "${S}/kvm" "${S}/kvm_stat"
 
-	mv ${D}/usr/share/doc/qemu ${D}/usr/share/doc/kvm
-	mv ${D}/usr/share/man/man1/qemu.1 ${D}/usr/share/man/man1/kvm.1
+	mv "${D}/usr/share/doc/qemu" "${D}/usr/share/doc/kvm"
+	mv "${D}/usr/share/man/man1/qemu.1" "${D}/usr/share/man/man1/kvm.1"
 
 	insinto /etc/udev/rules.d/
-	doins ${WORKDIR}/${P}/scripts/65-kvm.rules
+	doins "${WORKDIR}/${P}/scripts/65-kvm.rules"
 
 	insinto /etc/kvm/
 	insopts -m0755
-	doins ${WORKDIR}/${P}/scripts/qemu-ifup
+	doins "${WORKDIR}/${P}/scripts/qemu-ifup"
 }
 
 pkg_postinst() {