Bump to kvm-85-r2 with lots of bug fixes

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

6 files changed, 232 insertions, 17 deletions

diff --git a/app-emulation/kvm/ChangeLog b/app-emulation/kvm/ChangeLog
index e400d0ecbe64..8396b17eac40 100644
--- a/app-emulation/kvm/ChangeLog
+++ b/app-emulation/kvm/ChangeLog
@@ -1,6 +1,15 @@
 # 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.34 2009/04/28 17:45:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/ChangeLog,v 1.35 2009/05/14 14:40:02 dang Exp $
+
+*kvm-85-r2 (14 May 2009)
+
+  14 May 2009; Daniel Gryniewicz <dang@gentoo.org> +kvm-85-r2.ebuild:
+  - Remove test use flag; tests are restricted. bug #246441
+  - Fix automagic dep on bluez. bug #261978
+  - Add dep on pciutils. bug #267799
+  - Fix disabling of stripped binaries. bug #268237
+  - Fix help string breaking libvirt. bug #269014
 
   28 Apr 2009; Daniel Gryniewicz <dang@gentoo.org> kvm-85-r1:
   Need linux-info for the kernel version checks
diff --git a/app-emulation/kvm/Manifest b/app-emulation/kvm/Manifest
index e6d81d8bf162..a434857d66f9 100644
--- a/app-emulation/kvm/Manifest
+++ b/app-emulation/kvm/Manifest
@@ -10,18 +10,20 @@ DIST kvm-patches-20081216.tar.gz 23095 RMD160 f82d44f6eff2e49a59ff391e197f3b2fb8
 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
+DIST kvm-patches-20090314.tar.gz 4457 RMD160 3d74233629553a606c9a53c3f2687a0bf6262c46 SHA1 ff4f3d05d63f152e4c1fa1331fedf5e80926f249 SHA256 3baa3faf93b9b31bce630910e6e8cedaf4b8d2f1cbdf487fe7c7f79e6f258924
 DIST qemu-kvm-devel-85.tar.gz 4288372 RMD160 f618dd6e3f43b24392f059a5eccc04cb56b894a5 SHA1 8f1816d1510e2f9d41bc686d19652612e9c2a68a SHA256 8050f7312056d43d1fa4a6efabb75cba30e8fb4134d683188646c7b6b37c8a5d
-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-81.ebuild 6987 RMD160 04e49add21d35b73596d55da2edfcb7a1d6eb827 SHA1 127758cad0ee811097243d5670360546b2025023 SHA256 959fed2f1016b076978e5d445ee0d1b7ee3f3600c4ade902376f2c1e08bdaa33
+EBUILD kvm-82.ebuild 6943 RMD160 dce99d97271acbfc9e9c4badc53f3a467f3cdf50 SHA1 d199578cbe35e2cd607827e758fbff7e43983c53 SHA256 7a5ca2532ace1b8cac98cc957b07fbce7dbfcaa8cff078c5b6034fd00034db6a
+EBUILD kvm-83.ebuild 7019 RMD160 7d563725375da18c0d86196c1ab5ac52e5630e6e SHA1 e336fd3ee10680ee2caa37995becb219096f69be SHA256 01bd007c6844fffa93e04bd474bdf1ddb8560e692fe00d74215322cf0fb44700
 EBUILD kvm-84.ebuild 7064 RMD160 2c15c4866c504d26aa7117ebdb5a9a9cb7b73f98 SHA1 620204d39a2a7cb1dffe7a46886304418f8f4a3a SHA256 d80adf7abc6ddb0a852ef2b6cacc84fdcb71867d3c7499ebb36993a201a69d3d
 EBUILD kvm-85-r1.ebuild 6532 RMD160 810e63e33a4f86a0a8c3942ecf07a09cd7362c84 SHA1 f7e1da841f4bee8680e1e0faf6c6662a367926dd SHA256 eb8d958edcd1268ec17215d3160b4d64ba1df6c1652495d1b033d0454c6282de
-MISC ChangeLog 8703 RMD160 472ae6eb77ebb31762ae8ae6d7265e60726d61f2 SHA1 e8ede50b390e0685b5c5675fb70cd8070b961889 SHA256 bcb5a17a7a7d5ac70043a4e595cb28d711bbf2aa72b2f28b25422881ae63f1ac
+EBUILD kvm-85-r2.ebuild 6541 RMD160 636e23181f330d543ce691f8c8e1db3eecf723b9 SHA1 cbeccf5a51586d1af2997850f0af93c033c0541d SHA256 10c05b411aa996fac2e85d65e543aef42914a38ea2596a8fc65af0403dd94e71
+MISC ChangeLog 9043 RMD160 1b4f955f1ba493d306a7490ff2faca35624db581 SHA1 cca47d700afd9591690475c432331c71891a485c SHA256 4f1e696cac4ad1f83969eead95d49aae27efb3aa77da8180d4e3d288674bd966
 MISC metadata.xml 1282 RMD160 2c8cc65da23f96cfd73f757000192d4af7b29e9f SHA1 3b84cbafe2190715df0310fe8bde8dc6d483e6df SHA256 af8ea32fd7dedeb7401d4df31016c3e6a4a12d9720577bbb9673d4ae22b3dc54
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFJ90DSomPajV0RnrERAhJQAJ9/VOeo8UKqDlU1U7Q3kTgJhptS5QCfS6M1
-rp2SLOzwd0gND/THlJEX0Vg=
-=26dX
+iD8DBQFKDC1womPajV0RnrERAjG6AJsGA48wOcx1+7TBVbbvUoA78yjeOQCdGCno
+s1nAkGOf/MrbvnAOsgqXILs=
+=5kqk
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/kvm/kvm-81.ebuild b/app-emulation/kvm/kvm-81.ebuild
index 3d88f289690b..50b65792eb25 100644
--- a/app-emulation/kvm/kvm-81.ebuild
+++ b/app-emulation/kvm/kvm-81.ebuild
@@ -1,11 +1,11 @@
 # 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.3 2009/04/14 17:36:03 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-81.ebuild,v 1.4 2009/05/14 14:40:02 dang Exp $
 
 EAPI="1"
 
+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-20081216"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
diff --git a/app-emulation/kvm/kvm-82.ebuild b/app-emulation/kvm/kvm-82.ebuild
index 6033fd9d6c47..c49980c43a4e 100644
--- a/app-emulation/kvm/kvm-82.ebuild
+++ b/app-emulation/kvm/kvm-82.ebuild
@@ -1,11 +1,11 @@
 # 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.2 2009/04/14 17:36:03 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-82.ebuild,v 1.3 2009/05/14 14:40:02 dang Exp $
 
 EAPI="1"
 
+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-20090104"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
diff --git a/app-emulation/kvm/kvm-83.ebuild b/app-emulation/kvm/kvm-83.ebuild
index f58486777dfb..efb81b049d5a 100644
--- a/app-emulation/kvm/kvm-83.ebuild
+++ b/app-emulation/kvm/kvm-83.ebuild
@@ -1,11 +1,11 @@
 # 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.3 2009/04/14 17:36:03 dang Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/kvm/kvm-83.ebuild,v 1.4 2009/05/14 14:40:02 dang Exp $
 
 EAPI="1"
 
+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-20090126"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
diff --git a/app-emulation/kvm/kvm-85-r2.ebuild b/app-emulation/kvm/kvm-85-r2.ebuild
new file mode 100644
index 000000000000..6c7880f4971d
--- /dev/null
+++ b/app-emulation/kvm/kvm-85-r2.ebuild
@@ -0,0 +1,204 @@
+# 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-85-r2.ebuild,v 1.1 2009/05/14 14:40:02 dang Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+MY_PN="qemu-${PN}-devel"
+MY_P="${MY_PN}-${PV}"
+
+# Patchset git repo is at http://github.com/dang/kvm-patches/tree/master
+PATCHSET="kvm-patches-20090314"
+SRC_URI="mirror://sourceforge/kvm/${MY_P}.tar.gz
+	http://dev.gentoo.org/~dang/files/${PATCHSET}.tar.gz"
+
+DESCRIPTION="Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+# Add bios back when it builds again
+IUSE="alsa bluetooth esd gnutls havekernel +modules ncurses pulseaudio +sdl vde"
+RESTRICT="test"
+
+RDEPEND="sys-libs/zlib
+	sys-apps/pciutils
+	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[X] )
+	vde? ( net-misc/vde )
+	bluetooth? ( net-wireless/bluez )
+	modules? ( =app-emulation/kvm-kmod-${PV} )"
+
+#    bios? (
+#        sys-devel/dev86
+#        dev-lang/perl
+#        sys-power/iasl
+#    )
+DEPEND="${RDEPEND}
+	gnutls? ( dev-util/pkgconfig )
+	app-text/texi2html"
+
+QA_TEXTRELS="usr/bin/kvm"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+		:;
+	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_prepare() {
+	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
+
+	# Kernel patch; doesn't apply
+	rm "${WORKDIR}/${PATCHSET}"/07_all_kernel-longmode.patch
+	# evdev patch is upstream
+	rm "${WORKDIR}/${PATCHSET}"/10_all_evdev_keycode_map.patch
+
+	# 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;s/kvm-options.texi/qemu-options.texi/' \
+		qemu/qemu-doc.texi qemu/qemu-img.texi qemu/qemu-nbd.texi
+}
+
+src_configure() {
+	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 bluetooth || conf_opts="$conf_opts --disable-bluez"
+	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 --prefix=/usr"
+	conf_opts="$conf_opts --disable-strip"
+	if has_multilib_profile && [[ "${DEFAULT_ABI}" == "x86" ]] ; then
+		conf_opts="$conf_opts --arch=i686"
+	fi
+
+	# set up asm symlink; not done now there's no kernel source
+	cd kernel/include && ln -sf asm-x86 asm && cd ../..
+
+	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
+}
+
+src_compile() {
+	emake libkvm || die "emake libkvm failed"
+
+	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"
+}
+
+src_install() {
+	emake DESTDIR="${D}" 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
+}
+
+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
+}