Update homepage and clean really old versions

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

11 files changed, 22 insertions, 1085 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index ad144e17b234..704e33f4f9e0 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/kvm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.30 2009/04/13 14:08:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.31 2009/04/14 17:36:03 dang Exp $
+
+  14 Apr 2009; Daniel Gryniewicz <dang@gentoo.org> -kvm-75.ebuild,
+  -kvm-77.ebuild, -kvm-78.ebuild, -kvm-79.ebuild, -kvm-79-r1.ebuild,
+  kvm-81.ebuild, kvm-82.ebuild, kvm-83.ebuild, kvm-84.ebuild:
+  Update homepage and clean really old versions
 
   13 Apr 2009; Daniel Gryniewicz <dang@gentoo.org> kvm-84.ebuild:
   Add support for 32bit userland
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index 15173791c453..9bee8b80850e 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -2,38 +2,24 @@
 Hash: SHA1
 
 AUX kvm-83-vtd.patch 1286 RMD160 0dffa8d385f88c7452c5fbee9e8af8373f6b3ea7 SHA1 696d03063413ecb17658452957fbf2fcc44f9ce0 SHA256 b0fcda4000c1f8e52098593838127a180599f535cea318880169cf9d0b890c73
-DIST kvm-75.tar.gz 4108859 RMD160 e536cce39653111c1eb4d9eda8e908ae381362b8 SHA1 6b86df5554748998a31a1609cd8b4593af7cd3f0 SHA256 fff3add1e16b3ece8edfb29b10cbdcefed95d8a18ceac77b008a241a2427d0bf
-DIST kvm-77.tar.gz 7320987 RMD160 3bb7cf48af0af2062769b95485c4a504a1274cd7 SHA1 bb3d0d09b369a4561e4cfe5de58bdf77b1d6a16e SHA256 9b6c1d61d27e5e67daea751b908927fc7290e0f15b3f4bbe391e154404d8abca
-DIST kvm-78.tar.gz 4231476 RMD160 b4b06a717f6d9212feebd2b2744f3fc89a586a45 SHA1 18d0cb5958d9d3968710cd7a62349ae3d23ca830 SHA256 1ade8847ea3f72b662eedb01f7447325915ca243c3ea86b22ecbb5fafbed6217
-DIST kvm-79.tar.gz 4263614 RMD160 006ed209cea5eb1936ce93fb773783b93cbd08fa SHA1 7e97f7f71b6891ecbe0daf3b0af30e124ecd1dd4 SHA256 8b3c43cf559308a30cef0152323c99d9398ab8ba1754a7b16cedb1601462383e
 DIST kvm-81.tar.gz 4292487 RMD160 726abaf75da51d391c59e73669e9013035b178ce SHA1 3982fd20e3469d1279b5e70efcef9682758eb839 SHA256 19d71a028af2d019ed713a3a74d52a20ccbbe73ae6426ec256b7c71ddbecf9ad
 DIST kvm-82.tar.gz 4301055 RMD160 c463160047f4de95b2d9ad45456a3166e754793e SHA1 9b4ea2c910683667d787ff623d001aa98d0d009e SHA256 fa9bc496db07d4eef738b0feaf3f72986a24b006f89be3b720ffecf4d14365ba
 DIST kvm-83.tar.gz 4318840 RMD160 56c5b00a86e665647b1e338b593131871a4dbecf SHA1 aee1c8fdd788a26fdeefe40f81a0e13168e28611 SHA256 8c08827a4d150d765d466d745e08a7ebd7bd7f06e4a4ba56bcf335c12afe2134
 DIST kvm-84.tar.gz 4453159 RMD160 2b03bba6dd1249c5792cc27350615f5ddb737055 SHA1 ebdceb52227e2473ffefcadc7c4eaaa4190c2f7e SHA256 934a2d670314580e192f6c8d83e7aef2b071e46a2cd021f1f10bf74b8987988e
-DIST kvm-patches-20080822.tar.gz 25178 RMD160 4640f1da457b3ab2da66f8ef6dc98f83464b741e SHA1 827f7a932968e4027902892191cf29cafc5f662a SHA256 811d8541f395c682d98384c7304486e0b47d8fcf6e3df2e02f5ccd7dee353dfb
-DIST kvm-patches-20081020.tar.gz 21961 RMD160 8c51fa76fb0ec7b8bc4734c6b42e7dcd078bedcd SHA1 470678a4ffe7a25f2ab957ce5eaf5ab6fd730920 SHA256 424d13f264a65de2919bb37af3059391dcaf5fc82e304c6f4366f619c38cd478
-DIST kvm-patches-20081106.tar.gz 21997 RMD160 f5585a2a3d8bb6e55827a85a689699e10c3338a6 SHA1 0b72d22b65bb01d3d1f4d190290bb0ee59a47f6b SHA256 3077741aff3aaf3b114fc9dd6bc15633ca043c6161ca58535bff0bd5bc21cc73
-DIST kvm-patches-20081124.tar.gz 20255 RMD160 2af97b634060f5107b73534b7cc1d3de4f7e7b73 SHA1 93d64ba64c7cb0a5e1231b74514a809e4f2e8fd5 SHA256 67dbee0682df543e3cf9a67b8743b154af0e30fbb7caebdcbb7f329f6e870df1
-DIST kvm-patches-20081210.tar.gz 22522 RMD160 4fe324a5913c1e951e4660cbcb0cd29102b923ba SHA1 803085a476d1228ace5a4ebe712b9f7a7a77281a SHA256 77f235dda72df526f824712e314d108777d8d6fd6f7bf7617662496feea786cd
 DIST kvm-patches-20081216.tar.gz 23095 RMD160 f82d44f6eff2e49a59ff391e197f3b2fb8e951c6 SHA1 b49b82813162218ab8f08aa1905f63ee4f4d277b SHA256 e8197f8176756d9d8352f4d6eae7443b8977cefc92435c30538a7095d4704be8
 DIST kvm-patches-20090104.tar.gz 23149 RMD160 1ce67d586a2a93cd7bf3e45161c24daeff9f1314 SHA1 b0013ddf9a2faeb35a519d263ffadaa795cff50d SHA256 384dfbf579aa3adef52e8050e29806cbf0bf6bc36c27dbd08f7584c5c8a2286f
 DIST kvm-patches-20090126.tar.gz 22957 RMD160 5769eddc537265e9e095d4d062e167770642a44b SHA1 c120fa3990a58798995ad04eb6a137f2a5678ab2 SHA256 96105571525ca3f6eccdca857893a98989a182e97ee83803cce8948d73299b98
 DIST kvm-patches-20090218.tar.gz 4129 RMD160 aaa3a90f722b496f69f5506ce2c5412fc3e740fc SHA1 f7b87872540cc70a29856cb50e7e1bf878df9e30 SHA256 7897c184094af1bb24676eeba0da68ae55488dfda8e02564626b3f76c60a760f
-EBUILD kvm-75.ebuild 6884 RMD160 aa189a1a1bd03e5088377742697a7ce8987de42c SHA1 e16a3d60e9e3be82e2d2c919eeb90c16e728d341 SHA256 f3561a33882a46235ea57a770a327449fd62dab95ddb38f4e892f28aac988ef6
-EBUILD kvm-77.ebuild 6785 RMD160 4a95b99f9327c01d6b42ad2d97761208fd137e43 SHA1 a439d709ded61094c89a6a283a020c338da76436 SHA256 17f4905e61b79c41640ad411f96237ae20158af5331a6db0840e30075a6ceda1
-EBUILD kvm-78.ebuild 6844 RMD160 de0d0f759f9d5d335bbdad908313099395bbb20b SHA1 858b87435a03f2940158b0ab6dae17dacb22d349 SHA256 e88f89f9b038d107a71d221f64047e3a41530421c2731ba5725a376df797bb4e
-EBUILD kvm-79-r1.ebuild 6847 RMD160 6c956f6eee0253e0fb12b86235b7c87cdc1a582d SHA1 c19d6e9f23ca41aad34b6990ad5890d93eb10c12 SHA256 8aff31e884111e554303a4e8d9f1350da3ca33f7080e3aea1fd6d3fd1330af88
-EBUILD kvm-79.ebuild 6844 RMD160 b81124ea07c87970460fc62168f7d6be46d50596 SHA1 4a2c098cdf52ddcbc720df5b3d18ccfedbd332c2 SHA256 4a9f9461f5acd8f53cd59b39a21420cde59a3f7257ae35d5e66c2f2d101c12eb
-EBUILD kvm-81.ebuild 6994 RMD160 4ad0d79d6543c836f6d9c6b4f0d34daf400b1f1d SHA1 33d30a519f6ff405ea89351691b28a271adad931 SHA256 241a3422de81b30b083969c9ece3d34f55af89affeb4b3af3dd430ca04f999fd
-EBUILD kvm-82.ebuild 6950 RMD160 f379ec52f9ca2957bef915c507195a2ce6fff45c SHA1 30c211ef5f192fbb0438d036d44a9fc28ceffcdf SHA256 02b34f93f24b5ce9245dce2e8ac8e77bb3b5b6af6f2c98cd80b5ac1a09dc59e3
-EBUILD kvm-83.ebuild 7026 RMD160 22762b31ff3fcfede53eba6e0e3c469d13e422af SHA1 c258b36a2fb5d2c75449ab1e4ab46bce458b8fda SHA256 2b22318aa2af01591ecd51cd6771d4dcd50885b5beb652a3d82bb16c6fab9f14
-EBUILD kvm-84.ebuild 7071 RMD160 7a888d07793551410a83e4a8620bc13f106475b7 SHA1 80eafb4a8bc0af960349b6aab369f46b3dbd8cb2 SHA256 07e6ea58555fae74b17d4bf01c7121c6fb2489f838a213bc8e40f030eac5b24b
-MISC ChangeLog 7956 RMD160 2294dffd74fa747c2b176f975640cab651bbda0c SHA1 b3dfe8b26405641c6e7c3ee3a429d02071afbbdc SHA256 7ddfe05073a99f857b74022d4b4144cba046f4e956351edc058a576fd3277627
+EBUILD kvm-81.ebuild 6987 RMD160 3c6536c037bc6eb73c87227a7513a04e953bf026 SHA1 8462583753fc9622cc7b53dda41a525e3ab29146 SHA256 27607a6ab4b9c482417d7e669a169ba3dfda17dfc7fd0d368b6fc822d646cdea
+EBUILD kvm-82.ebuild 6943 RMD160 cb9fbc23b3c3d349004ff20bc435960bddc10ec4 SHA1 f22d1e936c478259bcedf1eb516f1e6050ba08fb SHA256 79ae74786d62e8845a0264db0908e6a9d6e00e43df6cc8209efc330690583292
+EBUILD kvm-83.ebuild 7019 RMD160 4789a565463a3202365438a724c127f74c8fd7d6 SHA1 d5a2ef27dd7aa04f8d0a99909251d075f0ef9e3a SHA256 2e6b247aaee72c9e5c1d7632f7348927bdce2e723cfd7c888f70c1febec54393
+EBUILD kvm-84.ebuild 7064 RMD160 2c15c4866c504d26aa7117ebdb5a9a9cb7b73f98 SHA1 620204d39a2a7cb1dffe7a46886304418f8f4a3a SHA256 d80adf7abc6ddb0a852ef2b6cacc84fdcb71867d3c7499ebb36993a201a69d3d
+MISC ChangeLog 8203 RMD160 dcad69969ce615c3449b6e12b98e27cb2c7fd2e3 SHA1 b47e2c7ebf053c972b5d6e0f387622563fcb97be SHA256 1c504412e86a355944ce07f4f8a8f7662808e4e6eb51a845823716af69efebbf
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFJ40g5omPajV0RnrERAiNuAJ9TCqLCd4lOw3TR8elykp+VfnlT1ACeJRa2
-wtEEBUqFTLAMeVhEQdVy2OQ=
-=L8f2
+iD8DBQFJ5MmhomPajV0RnrERAq/OAJsEfrh7MQS+XG790SkBk7GkIG0vQQCeO0k7
+uASBiDAlCiqRX6CYmG75jRk=
+=h0F1
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-75.ebuild b/app-emulation/kvm/kvm-75.ebuild
deleted file mode 100644
index cc286e8d3215..000000000000
--- a/app-emulation/kvm/kvm-75.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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-75.ebuild,v 1.1 2008/09/15 14:12:11 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
-PATCHSET="kvm-patches-20080822"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-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"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-QA_TEXTRELS="usr/bin/kvm"
-
-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"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		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
-		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."
-		die "kvm version not compatible"
-	elif ! linux_chkconfig_present KVM; then
-		eerror "Please enable KVM support in your kernel, found at:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# 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
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-77.ebuild b/app-emulation/kvm/kvm-77.ebuild
deleted file mode 100644
index 752307e689d6..000000000000
--- a/app-emulation/kvm/kvm-77.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.3 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-20081020"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-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"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-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"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		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 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:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-78.ebuild b/app-emulation/kvm/kvm-78.ebuild
deleted file mode 100644
index 162992cbad4d..000000000000
--- a/app-emulation/kvm/kvm-78.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# 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-78.ebuild,v 1.2 2008/11/11 03:10:09 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-20081106"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-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"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-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"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		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 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:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-79-r1.ebuild b/app-emulation/kvm/kvm-79-r1.ebuild
deleted file mode 100644
index 96bfc1b603a0..000000000000
--- a/app-emulation/kvm/kvm-79-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# 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-79-r1.ebuild,v 1.1 2008/12/16 15:30:13 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-20081210"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-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"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-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"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		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 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:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-79.ebuild b/app-emulation/kvm/kvm-79.ebuild
deleted file mode 100644
index 8abc1affe2f5..000000000000
--- a/app-emulation/kvm/kvm-79.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# 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-79.ebuild,v 1.2 2008/11/25 14:41:05 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-20081124"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PATCHSET}.tar.gz"
-
-DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
-
-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"
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	esd? ( media-sound/esound )
-	pulseaudio? ( media-sound/pulseaudio )
-	gnutls? ( net-libs/gnutls )
-	ncurses? ( sys-libs/ncurses )
-	sdl? ( >=media-libs/libsdl-1.2.11 )
-	vde? ( net-misc/vde )"
-
-#    bios? (
-#        sys-devel/dev86
-#        dev-lang/perl
-#        sys-power/iasl
-#    )
-DEPEND="${RDEPEND}
-	gnutls? ( dev-util/pkgconfig )
-	app-text/texi2html"
-
-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"
-		ewarn "be built.  You must ensure you have a compatible kernel"
-		ewarn "with the kvm modules on your own"
-	elif use havekernel ; then
-		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 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:"
-		eerror
-		eerror "  Virtualization"
-		eerror "    Kernel-based Virtual Machine (KVM) support"
-		eerror
-		eerror "or enable the 'modules' USE flag."
-		die "KVM support not detected!"
-	fi
-
-	enewgroup kvm
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# prevent docs to get automatically installed
-	sed -i '/$(DESTDIR)$(docdir)/d' qemu/Makefile
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		qemu/Makefile qemu/Makefile.target
-	[[ -x /sbin/paxctl ]] && \
-		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
-			qemu/Makefile.target
-	# avoid strip
-	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' qemu/Makefile
-
-	# apply patchset
-	EPATCH_SOURCE="${WORKDIR}/${PATCHSET}"
-	EPATCH_SUFFIX="patch"
-	epatch
-}
-
-src_compile() {
-	local mycc conf_opts audio_opts
-
-	audio_opts="oss"
-	use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
-	use ncurses || conf_opts="$conf_opts --disable-curses"
-	use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
-	use vde || conf_opts="$conf_opts --disable-vde"
-	use alsa && audio_opts="alsa $audio_opts"
-	use esd && audio_opts="esd $audio_opts"
-	use pulseaudio && audio_opts="pa $audio_opts"
-	use sdl && audio_opts="sdl $audio_opts"
-	use modules && conf_opts="$conf_opts --kerneldir=$KV_DIR"
-	conf_opts="$conf_opts --disable-gcc-check"
-	conf_opts="$conf_opts --prefix=/usr"
-	#conf_opts="$conf_opts --audio-drv-list=\"$audio_opts\""
-
-	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
-
-	emake libkvm || die "emake libkvm failed"
-
-	if use test; then
-		emake user || die "emake user failed"
-	fi
-
-	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
-
-	filter-flags -fpie -fstack-protector
-
-	# If using gentoo's compiler set the SPEC to non-hardened
-	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
-		local myccver=$(${mycc} -dumpversion)
-		local gccver=$($(tc-getBUILD_CC) -dumpversion)
-
-		#Is this a SPEC for the right compiler version?
-		myspec="${GCC_SPECS/${gccver}/${myccver}}"
-		if [ "${myspec}" == "${GCC_SPECS}" ]; then
-			shopt -s extglob
-			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
-			shopt -u extglob
-		else
-			unset GCC_SPECS
-		fi
-	fi
-
-#    if use bios; then
-#        emake bios || die "emake bios failed"
-#        emake vgabios || die "emake vgabios failed"
-#    fi
-
-	emake qemu || die "emake qemu failed"
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	# kcmd so we don't install kernel modules which weren't build
-	emake DESTDIR="${D}" kcmd='#' install || die "make install failed"
-
-	exeinto /usr/bin/
-	doexe "${S}/kvm_stat"
-
-	mv "${D}"/usr/share/man/man1/qemu.1 "${D}"/usr/share/man/man1/kvm.1
-	mv "${D}"/usr/share/man/man1/qemu-img.1 "${D}"/usr/share/man/man1/kvm-img.1
-	mv "${D}"/usr/share/man/man8/qemu-nbd.8 "${D}"/usr/share/man/man8/kvm-nbd.8
-	mv "${D}"/usr/bin/qemu-img "${D}"/usr/bin/kvm-img
-	mv "${D}"/usr/bin/qemu-nbd "${D}"/usr/bin/kvm-nbd
-
-	insinto /etc/udev/rules.d/
-	doins scripts/65-kvm.rules
-
-	insinto /etc/kvm/
-	insopts -m0755
-	newins scripts/qemu-ifup kvm-ifup
-	newins scripts/qemu-ifdown kvm-ifdown
-
-	dodoc qemu/pc-bios/README
-	newdoc qemu/qemu-doc.html kvm-doc.html
-	newdoc qemu/qemu-tech.html kvm-tech.html
-
-	if use modules && ! use havekernel ; then
-		linux-mod_src_install
-	fi
-}
-
-pkg_postinst() {
-	elog "If you don't have kvm compiled into the kernel, make sure you have"
-	elog "the kernel module loaded before running kvm. The easiest way to"
-	elog "ensure that the kernel module is loaded is to load it on boot."
-	elog "For AMD CPUs the module is called 'kvm-amd'"
-	elog "For Intel CPUs the module is called 'kvm-intel'"
-	elog "Please review /etc/conf.d/modules for how to load these"
-	elog
-	elog "Make sure your user is in the 'kvm' group"
-	elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-	elog
-	elog "You will need the Universal TUN/TAP driver compiled into your"
-	elog "kernel or loaded as a module to use the virtual network device"
-	elog "if using -net tap.  You will also need support for 802.1d"
-	elog "Ethernet Bridging and a configured bridge if using the provided"
-	elog "kvm-ifup script from /etc/kvm."
-	echo
-}
diff --git a/app-emulation/kvm/kvm-81.ebuild b/app-emulation/kvm/kvm-81.ebuild
index 737fd9d229ab..3d88f289690b 100644
--- a/app-emulation/kvm/kvm-81.ebuild
+++ b/app-emulation/kvm/kvm-81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-81.ebuild,v 1.2 2009/01/05 01:30:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-81.ebuild,v 1.3 2009/04/14 17:36:03 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
 
 DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/kvm/kvm-82.ebuild b/app-emulation/kvm/kvm-82.ebuild
index 1e773e327bca..6033fd9d6c47 100644
--- a/app-emulation/kvm/kvm-82.ebuild
+++ b/app-emulation/kvm/kvm-82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-82.ebuild,v 1.1 2009/01/05 01:30:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-82.ebuild,v 1.2 2009/04/14 17:36:03 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
 
 DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/kvm/kvm-83.ebuild b/app-emulation/kvm/kvm-83.ebuild
index 15ffd6b70db6..f58486777dfb 100644
--- a/app-emulation/kvm/kvm-83.ebuild
+++ b/app-emulation/kvm/kvm-83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.2 2009/02/08 19:36:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.3 2009/04/14 17:36:03 dang Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-mod
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
 
 DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-emulation/kvm/kvm-84.ebuild b/app-emulation/kvm/kvm-84.ebuild
index 8789693097a7..5ccf988e298d 100644
--- a/app-emulation/kvm/kvm-84.ebuild
+++ b/app-emulation/kvm/kvm-84.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-84.ebuild,v 1.3 2009/04/13 14:08:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-84.ebuild,v 1.4 2009/04/14 17:36:03 dang Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	http://apollo.fprintf.net/downloads/${PATCHSET}.tar.gz"
 
 DESCRIPTION="Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://kvm.qumranet.com/kvmwiki"
+HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"