Bump to kvm-84

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

3 files changed, 232 insertions, 5 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index d42661570972..f196d9ecd250 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.27 2009/02/08 19:36:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.28 2009/02/18 18:17:23 dang Exp $
+
+*kvm-84 (18 Feb 2009)
+
+  18 Feb 2009; Daniel Gryniewicz <dang@gentoo.org> +kvm-84.ebuild:
+  Bump to kvm-84
 
   08 Feb 2009; Daniel Gryniewicz <dang@gentoo.org> +files/kvm-83-vtd.patch,
   kvm-83.ebuild:
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index a851d8266e58..c3aedc344d2a 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -9,6 +9,7 @@ DIST kvm-79.tar.gz 4263614 RMD160 006ed209cea5eb1936ce93fb773783b93cbd08fa SHA1
 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
@@ -17,6 +18,7 @@ DIST kvm-patches-20081210.tar.gz 22522 RMD160 4fe324a5913c1e951e4660cbcb0cd29102
 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
@@ -25,12 +27,13 @@ EBUILD kvm-79.ebuild 6844 RMD160 b81124ea07c87970460fc62168f7d6be46d50596 SHA1 4
 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
-MISC ChangeLog 7660 RMD160 31b6e91a83f34cd787ff54d826dbb0c3aa937cd9 SHA1 3459157bd7aa42f5bb867ce98200f888a230b7a7 SHA256 4c57120caa0d10eb0cfb34fb4e606af80cf8235f12ad5cc2de0d0b9de56d69c6
+EBUILD kvm-84.ebuild 7085 RMD160 190a549b7c3cf2f2f60afe32ea6b094bfab05a0a SHA1 48193dfab35d8c221e4b64a8675ee67ecb28ff25 SHA256 f64ec3dd325561c4a843682230e1e94c02ed7b81df05a0df7975340297e6be10
+MISC ChangeLog 7768 RMD160 6adcc1076bd2f93e915412e3beae3b83afd89d11 SHA1 fecffb0f04e93a60b22309d19aa25ec43e23a644 SHA256 9cf4f3c41f864e077a8790ac20199d3f43c7bf1711226bba805c00923e839d40
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJjzRYomPajV0RnrERAjeMAJ42/+ZJKHt8YYbFHCpQIWtj7xaDjACfQn7b
-77NBOIddl6ciZEpFQI1Kci0=
-=4WLq
+iD8DBQFJnFDAomPajV0RnrERAlxcAJ9SFDzW73a8NH4GgjK1Iizw8HoxrQCfb7FC
+zCiWkHpzWUeofG+l+p+n/zE=
+=LG2n
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-84.ebuild b/app-emulation/kvm/kvm-84.ebuild
new file mode 100644
index 000000000000..89cb6dab1b8d
--- /dev/null
+++ b/app-emulation/kvm/kvm-84.ebuild
@@ -0,0 +1,219 @@
+# 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.1 2009/02/18 18:17:23 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-20090218"
+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"
+
+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
+
+	if use sdl && ! built_with_use media-libs/libsdl X ; then
+		die "You need to rebuild media-libs/libsdl with the X use flag"
+	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
+
+	# Fix docs manually
+	sed -i -e 's/QEMU/KVM/g;s/qemu/kvm/g;s/Qemu/Kvm/g' \
+		qemu/qemu-doc.texi qemu/qemu-img.texi qemu/qemu-nbd.texi
+}
+
+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 --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
+}