Update to latest version. Fix --enable-vnc-thread as its documented in the ebuild source. bug #425654

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

3 files changed, 31 insertions, 19 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 9cf166976d91..ede3cfe9a3c4 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.134 2012/07/11 01:58:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.135 2012/07/11 02:01:15 cardoe Exp $
+
+  10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-9999.ebuild:
+  Update to latest version. Fix --enable-vnc-thread as its documented in the
+  ebuild source. bug #425654
 
   10 Jul 2012; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-1.1.0.ebuild:
   Attempt to better handle the case when we can't have PIE enabled, which is
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 9146ac1ce0f9..5396bde723e8 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -22,6 +22,6 @@ EBUILD qemu-kvm-1.0-r3.ebuild 11641 SHA256 b9834fb044c515f8c0bfa2aa3770f2ce9de84
 EBUILD qemu-kvm-1.0.1-r1.ebuild 12205 SHA256 2d0937b952b3ef20d9e906341abed691199b2a0cd97ea945e4fde9d4f1889843 SHA512 d1b3ade271a5c8ca3f6dd5e01bd5e1487faefd1657d41cde8b1427d13c1792f3794815d6b4f9b1c044f97dcde28ac9998d56b767fbb39471c17621a454d29a10 WHIRLPOOL 49cc3c97cfdaac12ffd48212a99aaeb9b27af871381d2d5d602c186d1498164d7c2058a75e1590331f99368e6618c959396d16ed9feaebf0d4d1ac1a07108d3e
 EBUILD qemu-kvm-1.0.1.ebuild 11479 SHA256 6da24cfe70e532037576f6893e894686e9af15dd517bfcdb28e2dbc921a3832b SHA512 7b20463967947dc5398c45a5c9cdafb4a489f7acbf921c537f0b7286e07fa687f6f19e47713161c52cc43a9d4d003e706cee5aef2f0ece8bc6a768082cb15390 WHIRLPOOL 3d845dab92364b97545f996adbf7af1b64abd5e1c90c1aacd0d35dab038ea3d024ea086b14a26352f72df1dc290c750f3087a100a5405ddc7bd0f2888f1c58c6
 EBUILD qemu-kvm-1.1.0.ebuild 11775 SHA256 bfb2d973e6357d11c2806c5a859fb842afdf6742dba38c4f36d43a8dd9ce2ec6 SHA512 028ed922a80a9005e1cd77a7356778845778f15f6b62876e983527f8ea46afdfbf67019168182043d41e3959c7c7ccb1065f2938a2dc422bc2b34f4a3b7274d6 WHIRLPOOL 2c8c9654799224bdf030adc3f8c3f106cf1a9e78f9034c4708ed151d16b8007b5474cf45718e67d635024c319fb6c6310c77949bd7b390d9a57438ac636f9b77
-EBUILD qemu-kvm-9999.ebuild 11399 SHA256 702a9b247a1ee72b5983e7aea343e491e63882832f0a4ba39659555585494096 SHA512 b114b0675325a58ff7179abc83e6e70dd4f8efe33082299e561a6a7fa9c05fed6724b1ffc6c734ca42293ca25f7693b7a045ece2c993fe0777242f278413d545 WHIRLPOOL f4b80310109ae355506a5868d606deb0467f0ffbae840a86d49031f31ab80dc358797b2bb8b6caec156683e226a2d9be70df21d4673025a419f32a4497d832cb
-MISC ChangeLog 26759 SHA256 cdd289803ccdf77bee1c63b331293232719fd5c3e4de3d2da104537c0406cd8b SHA512 c9456d8e9633095ee59d7485a26759b996b2f217974a58bd13032fcb17f7f569a9fd7079c0814d6eda101627cf399032bd24569d0cc230d43037b0d47c8f2d5b WHIRLPOOL 6589237f7e5d45cd103aabcaf1d59194693a4b1e253f4de0e6dc33d6843f0025889e13bbc8b48cc7b463f58942e792d00e31b86c0505b7d90e2bce3c5850c427
+EBUILD qemu-kvm-9999.ebuild 11793 SHA256 d4fc2da484a0e8e6610a81dd289b30f78e63a8922e68ef1a95e4dee5720e72ea SHA512 40f5f23cb4a8e6db79364d4b77d484f01f813e739ea77c86a5d79645bf742f84293e0877a73bc1eca3075e8ca1687c5dc438f99d7da441164aac67e037b23bd2 WHIRLPOOL e51161285a530231a82abeb24f499c6964086db9395c08689cdeeac8d5619d9ecd9be94a8d277c92155f198222cbcd71a45da5509aa0c5b84437a5bc9495d3f7
+MISC ChangeLog 26938 SHA256 e2ddc41405a00d17a733a527f06b01f3b4820ffe254f05ffd866f7293645f20c SHA512 30ec1c0df0de750bff57b28b162959893877754dca6dc5585817106de9015ca258b46092ab4a1a5f2555c3ef87c338efac4286b5e9b05b2e8d7ec59b81dbac0f WHIRLPOOL 9a07a35ac3dac25f46c67d471016c255297799bd0e9789f947c0ad8b4475ac4adc0dc9d6423634c2616295642e6a808d29796424c31ca5bb0e9f6f0c3242a298
 MISC metadata.xml 2416 SHA256 1613b0e695f6cdd5c21b0b6e5f470adc250b261a8a40bfb3c7f246d3f590acf9 SHA512 e6906e146aded4f9e182fc8da99a578800b91287f5d5446c53d08ae764304c2ca02002098f61032f547873f808554cac2d4b29115ce0dcea36df41e9e6667ec8 WHIRLPOOL da9ff6660bb89b3b4077bfb52f18098eb7392ac0e1af05028950c9843c03be6f6a0765ec9577e6a0d8f36fd6b130828c52f31a0d020034531a944dca516009e3
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 7f42964ee0bd..6cd85d8bd9ca 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.44 2012/07/10 10:46:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.45 2012/07/11 02:01:15 cardoe Exp $
 
 EAPI="4"
 
@@ -25,9 +25,9 @@ HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty +curl debug doc fdt kernel_linux \
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
 kernel_FreeBSD ncurses opengl pulseaudio python rbd sasl sdl \
-smartcard spice static tci tls usbredir vde +vhost-net xattr xen xfs"
+smartcard spice static tci tls usbredir vde +vhost-net virtfs xattr xen xfs"
 
 COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
@@ -51,8 +51,10 @@ done
 
 REQUIRED_USE="static? ( !alsa !pulseaudio )
 	amd64? ( qemu_softmmu_targets_x86_64 )
-	x86? ( qemu_softmmu_targets_x86_64 )"
+	x86? ( qemu_softmmu_targets_x86_64 )
+	virtfs? ( xattr )"
 
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
 RDEPEND="
 	!app-emulation/kqemu
 	!app-emulation/qemu
@@ -69,6 +71,7 @@ RDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bluetooth? ( net-wireless/bluez )
 	brltty? ( app-accessibility/brltty )
+	caps? ( sys-libs/libcap-ng )
 	curl? ( >=net-misc/curl-7.15.4 )
 	fdt? ( >=sys-apps/dtc-1.2.0 )
 	kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
@@ -90,6 +93,7 @@ RDEPEND="
 	tls? ( net-libs/gnutls )
 	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
+	virtfs? ( sys-libs/libcap )
 	xattr? ( sys-apps/attr )
 	xen? ( app-emulation/xen-tools )
 	xfs? ( sys-fs/xfsprogs )"
@@ -217,7 +221,14 @@ src_configure() {
 	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
 
 	# Add support for static builds
-	use static && conf_opts="${conf_opts} --static"
+	use static && conf_opts="${conf_opts} --static --disable-pie"
+
+	# We always want to attempt to build with PIE support as it results
+	# in a more secure binary. But it doesn't work with static or if
+	# the current GCC doesn't have PIE support.
+	if ! use static && gcc-specs-pie; then
+		conf_opts="${conf_opts} --enable-pie"
+	fi
 
 	# audio options
 	audio_opts="oss"
@@ -237,14 +248,13 @@ src_configure() {
 		--disable-strip \
 		--disable-werror \
 		--enable-guest-agent \
-		--enable-pie \
 		--enable-vnc-jpeg \
 		--enable-vnc-png \
-		--enable-vnc-thread \
 		--python=python2 \
 		$(use_enable aio linux-aio) \
 		$(use_enable bluetooth bluez) \
 		$(use_enable brltty brlapi) \
+		$(use_enable caps cap-ng) \
 		$(use_enable curl) \
 		$(use_enable debug debug-info) \
 		$(use_enable debug debug-mon) \
@@ -268,9 +278,10 @@ src_configure() {
 		$(use_enable usbredir usb-redir) \
 		$(use_enable vde) \
 		$(use_enable vhost-net) \
+		$(use_enable virtfs) \
 		$(use_enable xattr attr) \
-		$(use_enable xattr virtfs) \
 		$(use_enable xen) \
+		$(use_enable xen xen-pci-passthrough) \
 		$(use_enable xfs xfsctl) \
 		--audio-drv-list="${audio_opts}" \
 		--target-list="${softmmu_targets} ${user_targets}" \
@@ -292,12 +303,12 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "make install failed"
+	emake DESTDIR="${ED}" install
 
 	if [[ -n ${softmmu_targets} ]]; then
 		if use kernel_linux; then
 			insinto /lib/udev/rules.d/
-			doins "${FILESDIR}"/65-kvm.rules || die
+			doins "${FILESDIR}"/65-kvm.rules
 		fi
 
 		if use qemu_softmmu_targets_x86_64 ; then
@@ -311,16 +322,14 @@ src_install() {
 		fi
 	fi
 
-	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
-	newdoc pc-bios/README README.pc-bios || die
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
 
 	if use doc; then
 		dohtml qemu-doc.html qemu-tech.html || die
 	fi
 
-	if use python; then
-		dobin scripts/kvm/kvm_stat || die
-	fi
+	use python & dobin scripts/kvm/kvm_stat
 
 	# FIXME: Need to come up with a solution for non-x86 based systems
 	if use x86 || use amd64; then
@@ -343,7 +352,6 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	if [[ -n ${softmmu_targets} ]]; then
 		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"