Restored USE="opengl qemu-ifup"; added USE="usbredir".

Package-Manager: portage-2.2.0_alpha84_p18/cvs/Linux x86_64

5 files changed, 75 insertions, 64 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 94fca68de5b0..da9084ccbeb3 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.88 2012/01/22 22:49:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.89 2012/01/23 22:10:14 slyfox Exp $
+
+  23 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> +files/qemu-ifup,
+  metadata.xml, qemu-kvm-9999.ebuild:
+  Restored USE="opengl qemu-ifup"; added USE="usbredir".
 
   22 Jan 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 2ba4d83550de..03ef43bab9a4 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX 65-gentoo-kvm.rules 40 RMD160 c3dd691c3857cb7e6623ab2e2ec4a48ba28c1fb0 SHA1 13a9a8e0b9b3b835c92a0241cd5ff691db413a48 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
+AUX qemu-ifup 138 RMD160 1bdeae49d84b1c4ddad0294ebc790dba2836d6cf SHA1 5c84fa7bd69cd03f34513331464012b420497f0c SHA256 a43d8bc11049589e57ce417b6030a216fd04621581a2c7247c69292c51e53c2a
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.3-fix-crash-with-sdl.patch 4003 RMD160 1e8965e94537e24d0903a7a096c91e35f7013118 SHA1 a6a36da9613d90d45148aa133392bd342b83d1cd SHA256 aeca9f133c021726c0e3ce2a58843ee12d592669143d0b75e46b8e301b5cf102
 AUX qemu-kvm-0.12.3-include-madvise-defines.patch 274 RMD160 2b2b454fabc3b5362c0479d581e5fb038e02aa97 SHA1 c34b51b9c0b5a69ab2ab7a8a64c804f7cbbbebf5 SHA256 0d33d22a853e9b1d19786c9ac53a515587a9753ff69a2f53e61c4764590e7821
@@ -20,23 +21,13 @@ EBUILD qemu-kvm-0.14.1-r2.ebuild 9077 RMD160 7d9801a9213e1f28e7f8a4124231fc09091
 EBUILD qemu-kvm-0.15.0.ebuild 9354 RMD160 21aa48176ccdf570322236e6e69d61ebe936214b SHA1 e6785c65674cf97aeb18c5ecca94bff6d1eb9ef1 SHA256 8c99bb5788c9f11185279c57d1ffe05671d17f939d8007dea5743ccd7a5968f7
 EBUILD qemu-kvm-0.15.1-r1.ebuild 9645 RMD160 e3524ee32ab3eeca04aab58152277d48704213e7 SHA1 9f8f8e31950fd8d736ec4b7dbc666f1f3717b62f SHA256 92f90d761adaf317eeed54c1cdd8672e354ca92aa4fb65b1bb270284ad4a235d
 EBUILD qemu-kvm-1.0.ebuild 10527 RMD160 e546e970b45e4b37b8b14cfd929322a12c566767 SHA1 56d2aece028f4c732a49d4b220b0604ab15e7772 SHA256 7aff2550d3ccd4be12eec2c1113a5dfffe32ecd4eb9689316bfe4539dd0a58a0
-EBUILD qemu-kvm-9999.ebuild 10462 RMD160 a74149ae5fb6672a10e48901b96df8f0b42b82d2 SHA1 abd50c5296d750a90075689045032347fc916dae SHA256 c86826b4ee924aec0c98ab87dd07ccec4c925c29cec3c95c6c630321d30fcd3a
-MISC ChangeLog 18541 RMD160 e9fc2f7c0cf93f45269c0279f0e23c3d14e32367 SHA1 f47cbbadac69ae1b7d1652c458fa996d49df4594 SHA256 87efbac90e139c1d6c5cf45398b6a837240c287041ab6bd56dee0a0d4ed8b8e2
-MISC metadata.xml 1790 RMD160 4179a5fe624d3c2ab55ed90d65c473ce644a943e SHA1 bdcfb49dd78aaefdcb8b5c7b92bd7829890df132 SHA256 68ab30c94b1fe8b5e681e936369a9fe39f2b657015c3e1e7e05145026a427ac2
+EBUILD qemu-kvm-9999.ebuild 10054 RMD160 9625f2562e2c8a536743b6b1479c13663a666278 SHA1 59fc06d5afa143ce5b8ac7650a0d9bf077cdb473 SHA256 2b75a00b670713758f5f6cd8e462bcbcf68ec60a7c3e74625120ee570781335d
+MISC ChangeLog 18704 RMD160 50385a170865a968ef5109b9be6eb92f8ebf0bf2 SHA1 be64f26b8ba4c38a87bdbba1f5fed0af3b93eb84 SHA256 e9c9c634b31e8a8bb50dc2bf7e4fbd9848c24d05515f5170d115d18b832b6358
+MISC metadata.xml 1918 RMD160 9aeb9149cd322870ce6948a06def34c1d00418fa SHA1 c5f5a1921552afcad74d263920baac136b2d066f SHA256 5fdbde62a8fa400e9b7a9b0a5d5b5c8c398543dccb0ff6837bed23bf37887741
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPHJH/AAoJEC8ZTXQF1qEP6r4P/1K9eU9f3FNzXaxDV+b5WflG
-peixV6olQijZAJjJR4hJJA+8V5wF8MsJU0aSINf4xrRCCJnogtr8sHC0jtdRmFVt
-4NBdS3lro5VUAMumZxyPx8u2h6lMlOqFmJLQCZdovhRb/NC93379FcMD9QcWALaR
-wgOG/2mASkze0LACjP7kR9Itpm38KJLWQmi4rZ4xle2KezO9XgDT/qBBkBky8Flw
-MILXM2mcYnKuDbt7dFmqo5j2PwXYGqBasub8YdOqUtGTfHGg3OJQtQpJb2so44zh
-E/3w2nJm397RmpsNK0S/OqNjiUkFvBLEGQwy/KxTAOGE1YYfI5c6YwT9E9nzWQAd
-Zbz49YMdxd4KhrnJ8Q0G9EBDLCRFckBLaBY8BAnH5w5kUPcJuvv5TyUdyRLvmGx/
-It8pZVhdkabXNdXJipz2xKT3kk3DKkARTboKTj2ZOnxo7JVnSo638s5/m/xwnqzm
-MVCD0GbqaC5MeA6WSk1qu1zXvB2laLmbPrRX5sjviDXz4iyKAlIc21yRZqxs9Jcj
-2t5Q0RL6Ya5ne6t88ttiXZ2K1LkmHXSV6ait9Ch+V8jTS9/WgkgU5xjsl66iV+II
-5+OdNVriAYQSjOvDS8+T6P7bJDY6HkJD6vkn2VlkY5tVlDmNqUdDmphXq8Yin3NJ
-vVUA3EnBwmX4XhcEkrsr
-=Toov
+iEYEARECAAYFAk8d284ACgkQcaHudmEf86qD4gCfWpIgmyZahe60bpgeryiw67n5
+jjUAn07RmIiEc4CrUHhCtJMmzruNKCAm
+=BUu4
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/files/qemu-ifup b/app-emulation/qemu-kvm/files/qemu-ifup
new file mode 100644
index 000000000000..284b176c19d6
--- /dev/null
+++ b/app-emulation/qemu-kvm/files/qemu-ifup
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+switch=$(/sbin/ip route list | awk '/^default / { print $5 }')
+/sbin/ifconfig $1 0.0.0.0 up
+/usr/sbin/brctl addif ${switch} $1
diff --git a/app-emulation/qemu-kvm/metadata.xml b/app-emulation/qemu-kvm/metadata.xml
index f1714a0f6439..7cc82187aaec 100644
--- a/app-emulation/qemu-kvm/metadata.xml
+++ b/app-emulation/qemu-kvm/metadata.xml
@@ -19,6 +19,8 @@
     <flag name='sdl'>Enable the SDL-based console</flag>
     <flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
     <flag name='ssl'>Enable TLS support for the VNC console server</flag>
+    <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+        devices to another machine over TCP</flag>
     <flag name='vde'>Enable VDE-based networking</flag>
     <flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
     <flag name='xattr'>
@@ -26,5 +28,5 @@
       <pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
     </flag>
     <flag name='xen'>Enables support for Xen backends</flag>
-</use>
+  </use>
 </pkgmetadata>
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 798ee618cf67..40cacccdbee5 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.29 2012/01/22 22:49:21 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.30 2012/01/23 22:10:14 slyfox Exp $
 
 #BACKPORTS=1
 
@@ -29,8 +29,9 @@ HOMEPAGE="http://www.linux-kvm.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
-png pulseaudio rbd sasl sdl spice ssl threads vde +vhost-net xattr xen"
+IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads usbredir vde
++vhost-net xattr xen"
 # static, depends on libsdl being built with USE=static-libs, which can not
 # be expressed in current EAPI's
 
@@ -44,7 +45,7 @@ IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
 IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
 
 for target in ${IUSE_SOFTMMU_TARGETS}; do
-	if [ "x${target}" = "xx86_64" ]; then
+	if [[ ${target} = x86_64 ]]; then
 		continue
 	fi
 	IUSE="${IUSE} qemu_softmmu_targets_${target}"
@@ -76,8 +77,16 @@ RDEPEND="
 	jpeg? ( virtual/jpeg )
 	ncurses? ( sys-libs/ncurses )
 	nss? ( dev-libs/nss )
+	opengl? (
+		virtual/opengl
+		x11-libs/libX11
+	)
 	png? ( media-libs/libpng )
 	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? (
+		sys-apps/iproute2
+		net-misc/bridge-utils
+	)
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	sdl? ( >=media-libs/libsdl-1.2.11[X] )
@@ -86,14 +95,10 @@ RDEPEND="
 		>=app-emulation/spice-protocol-0.8.1
 	)
 	ssl? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
 	vde? ( net-misc/vde )
 	xattr? ( sys-apps/attr )
 	xen? ( app-emulation/xen-tools )
-
-	qemu_softmmu_targets_lm32? (
-		x11-libs/libX11
-		virtual/opengl
-	)
 "
 
 DEPEND="${RDEPEND}
@@ -211,14 +216,14 @@ src_configure() {
 		user_targets="${user_targets} ${target}-linux-user"
 	done
 
-	if [ -z "${softmmu_targets}" ]; then
+	if [[ -z ${softmmu_targets} ]]; then
 		eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
 		die "At least 1 SoftMMU target must be enabled"
 	else
 		einfo "Building the following softmmu targets: ${softmmu_targets}"
 	fi
 
-	if [ ! -z "${user_targets}" ]; then
+	if [[ -n ${user_targets} ]]; then
 		einfo "Building the following user targets: ${user_targets}"
 		conf_opts="${conf_opts} --enable-linux-user"
 	else
@@ -234,32 +239,31 @@ src_configure() {
 	# Support debug USE flag
 	use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
 
-	# Fix the $(prefix)/etc issue
-	conf_opts="${conf_opts} --sysconfdir=/etc"
-
 	#config options
-	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
-	conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
-	conf_opts="${conf_opts} $(use_enable brltty brlapi)"
-	conf_opts="${conf_opts} $(use_enable curl)"
-	conf_opts="${conf_opts} $(use_enable fdt)"
-	conf_opts="${conf_opts} $(use_enable hardened pie)"
-	conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
-	conf_opts="${conf_opts} $(use_enable ncurses curses)"
-	conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
-	conf_opts="${conf_opts} $(use_enable qemu_softmmu_targets_lm32 opengl)" # single opengl user
-	conf_opts="${conf_opts} $(use_enable png vnc-png)"
-	conf_opts="${conf_opts} $(use_enable rbd)"
-	conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
-	conf_opts="${conf_opts} $(use_enable sdl)"
-	conf_opts="${conf_opts} $(use_enable spice)"
-	conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
-	conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
-	conf_opts="${conf_opts} $(use_enable vde)"
-	conf_opts="${conf_opts} $(use_enable vhost-net)"
-	conf_opts="${conf_opts} $(use_enable xen)"
-	conf_opts="${conf_opts} $(use_enable xattr attr)"
-	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+	conf_opts="${conf_opts}
+		$(use_enable aio linux-aio)
+		$(use_enable bluetooth bluez)
+		$(use_enable brltty brlapi)
+		$(use_enable curl)
+		$(use_enable fdt)
+		$(use_enable hardened pie)
+		$(use_enable jpeg vnc-jpeg)
+		$(use_enable ncurses curses)
+		$(use_enable nss smartcard-nss)
+		$(use_enable opengl)
+		$(use_enable png vnc-png)
+		$(use_enable rbd)
+		$(use_enable sasl vnc-sasl)
+		$(use_enable sdl)
+		$(use_enable spice)
+		$(use_enable ssl vnc-tls)
+		$(use_enable threads vnc-thread)
+		$(use_enable vde)
+		$(use_enable vhost-net)
+		$(use_enable xen)
+		$(use_enable xattr attr)
+		--disable-darwin-user --disable-bsd-user
+	"
 
 	# audio options
 	audio_opts="oss"
@@ -268,10 +272,12 @@ src_configure() {
 	use pulseaudio && audio_opts="pa ${audio_opts}"
 	use sdl && audio_opts="sdl ${audio_opts}"
 
-	set -- --prefix=/usr \
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--disable-strip \
 		--disable-werror \
 		--enable-kvm \
+		--disable-libiscsi \
 		--enable-nptl \
 		--enable-uuid \
 		${conf_opts} \
@@ -283,17 +289,12 @@ src_configure() {
 
 	echo ./configure "$@" # show actual options
 	./configure "$@" || die "configure failed"
-		# this is for qemu upstream's threaded support which is
-		# in development and broken
-		# the kvm project has its own support for threaded IO
-		# which is always on and works
-		# --enable-io-thread \
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	if [ ! -z "${softmmu_targets}" ]; then
+	if [[ -n ${softmmu_targets} ]]; then
 		insinto /lib/udev/rules.d/
 		doins "${FILESDIR}"/65-gentoo-kvm.rules || die
 
@@ -304,6 +305,12 @@ src_install() {
 			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
 			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
 		fi
+
+		if use qemu-ifup; then
+			insinto /etc/qemu/
+			insopts -m0755
+			doins "${FILESDIR}"/qemu-ifup || die
+		fi
 	fi
 
 	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
@@ -320,7 +327,7 @@ src_install() {
 
 pkg_postinst() {
 
-	if [ ! -z "${softmmu_targets}" ]; then
+	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"
 		elog "ensure that the kernel module is loaded is to load it on boot."
@@ -333,7 +340,9 @@ pkg_postinst() {
 		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."
+		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 "qemu-ifup script from /etc/qemu."
 		elog
 		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
 	fi