Version bump.

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

4 files changed, 284 insertions, 19 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 53824560293a..a38d67d39166 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.114 2012/08/18 17:24:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.115 2012/08/18 18:51:35 vapier Exp $
+
+*qemu-1.1.1 (18 Aug 2012)
+
+  18 Aug 2012; Mike Frysinger <vapier@gentoo.org> +qemu-1.1.1.ebuild,
+  qemu-9999.ebuild:
+  Version bump.
 
   18 Aug 2012; Mike Frysinger <vapier@gentoo.org>
   +files/qemu-1.0.1-siginfo.patch, qemu-1.0.1.ebuild:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 662b2716cbae..845ecf902243 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,28 +14,30 @@ DIST qemu-0.11.1.tar.gz 3830070 SHA256 2ecd2fc0af2ce5d96067ae82cc98a08275c596de5
 DIST qemu-1.0-patches.tar.xz 43540 SHA256 32a8b98cd5fd661268328d71efbfafd65972102b10da363193f3da98bd9b2d72 SHA512 074d52d716e79abd42dba12723ba4f80148bd6849d627321d65bc29d77b399219adcc9a240f27cd603739295a517a96ae8827d2020934a23e8a1c1be3d504d4f WHIRLPOOL 6b2dbfd4319c6a68e39da95bac0ca5342ab865931d7c2d534c92192daf80fae19b5bb4cf8863faa32008b3721655755d426672897ae02b96807a53b13137c89f
 DIST qemu-1.0.1.tar.gz 10853005 SHA256 198902e10782517f607c9ed9e629b5e7708ea39eb373ed3ec3f1c8a169d98378 SHA512 c3c311288bd9e843c3e9dae9ad36e370ffa6a379878fae1067e656e9a1f38e002314e59f0fc46c84df98bdd4d6b7acc6b99907b3cf04a2b100a752b837da0178 WHIRLPOOL d05e7d97855f67347d7f3e252b7f72f16b112ae2c0b9a9b56e60ab11f78712789d99c35adf09e44c1a4d853a7f24c1dd65ebd7199c5ce66fea00442ff6be6fd0
 DIST qemu-1.0.tar.gz 10848714 SHA256 47674b7da559d5e1b44cc401af9ac5ad962d14e9eede12567b13e4b841989737 SHA512 a49ed9c30f018d361d1cdd71d7149e2373e9243653aee119ece0f2e23d45c61e1fe72412c4a58b6b9906a3003ab70b9a9ba43f090b7edabef3785e04ead5cc70 WHIRLPOOL 850ce298be0c51bfdce3dd987844bda4bd4784016b45f73aab953b56ccde143f67e8a498e3ad1a49b658dcba268b8487ffd0974128342a358ac079055099a0b2
+DIST qemu-1.1.1-1.tar.bz2 9635574 SHA256 6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8 SHA512 4501b024b1d188349ab767f5c4de4a9bd491b7f7cd62ffbcdf49c1983b96ae1c39d9fba170522014b03d15e7fbdcf8c5276e7790818bbeb741f4f9d38e04a4fb WHIRLPOOL 6d8d6758455f3589bb15c4b10e113ef254cff41a1b7eb2e0f8f17da5d39f0b0ac0bc061f36394888fbe7ee44503df03210103e3016e3aa919cc63c5c77b9089b
 EBUILD qemu-0.11.1-r1.ebuild 4894 SHA256 25ef257efc5ee950d5f93ad3dc059c24cc8104e094b62840477ec719c66bd5f5 SHA512 0afcc745a78a23a8fba3cdd518595894f4ed12b4048b128c55be3f53c96f97d7701dd5bebbfcbb06cf37da617a78f3813f847792542e27e85e932ba9395eb542 WHIRLPOOL 3b606df1b67a37b61f858a0e76133867b2c281d0cde1024c510cf4bcdb433e25db117bd817e6e91eadf0d42246c55873e69078bb5f4c212122fc89a36cd7c5c4
 EBUILD qemu-0.11.1.ebuild 4826 SHA256 7aaf359e5b09721faeb9b97ff0fd8ac4c91ba8906d8f9439ac21550af786fcda SHA512 5a9631fe38c86b1fd56519544f381ab4fdb064004a1b229adda361916724ef88451dd72713c61b092a056111a7a66143d9dd0e4b5638a69f9c782f21b63d2289 WHIRLPOOL 2c50d082e32176108d661a199dd9633c4d5bdd94288921d443148c62657cf9f8f24db268f0babf4fdc707d24e3f317e0a019670104849b6b00b272cb505a2006
 EBUILD qemu-1.0-r2.ebuild 6835 SHA256 900cd224d6f05bdbba8c25d0d99e31e9bfbc8c4f4066b7448aff190ba5cc276f SHA512 4ab035da1f3669a0eb39fbc9416a96ac3852d864a708b493cab6486cdea7a5a7da4f3c18ede5c28a6c0bbdfbb0a829f547bbd39d95dafbbd6aaa591b03a8fb77 WHIRLPOOL e5cd010cf00098302647e72210709debbe41c8186f6881895afa47e9c8aa139843dd3daadb0905a56aa13bbe764a99dc1bfe2c0800769ea8e3886e5b03cc6153
 EBUILD qemu-1.0-r3.ebuild 7143 SHA256 b6beb84a33c86ea97eaa1af095da8bbd67bb2104bfe0813f7f1bda81fd2cf7e2 SHA512 8548e165c3ae12e4d56f73fababedf7c904ff191ee39521ebc245c8266089af00b0770599117beba79814a3c22a6e70223139641774e16e507e9e43fe993e2c2 WHIRLPOOL 56e8ac04b29a571ea1d02aa796f5e2b45f3e190ff0d212efcefbc912b829fa5c6157cbeb0f7b9d5a58b76d537168f93287a55e651b95d3e5d7152b05b824e3aa
 EBUILD qemu-1.0.1.ebuild 7151 SHA256 f3c5abf8b37a18e2bf1179b986c9356727eab187ba306bbc08178fc7fb63549b SHA512 33503415ca8a63a24847cd8fddb9a8641b8ac317c74d668654c917ca329e893e142dacf2871396fc1e67870a54b81b0c2b154e4f6f029fce41fc2e6302060715 WHIRLPOOL 9d1d62ff2db37e4cef269c944293712069026565ec5014d2ddcbfef05de9bdfd73ff2a4b5a93c3081518717343a29fd3d036d81d862e59b539e750a6f21eaafa
-EBUILD qemu-9999.ebuild 6719 SHA256 bcdf1c74d38b85b3fb4682f44cad7e5a760163b77cda522a7450b358b6f4fea3 SHA512 4b2311d54de72c704996960b6a8711984d2ae3b87ca9b751fdcf4723ca0ba7bd9263f02cecbb3c4dca58057f03b2fd923780b5cf79c164cc448aa445914fae9c WHIRLPOOL 5ec5d336d7fb68b6ddf1a3dc44205f577cb952d76f45b7196c11ec6195b41c4ac29f34be6f7cf8dc310ac66556b2ce30978b2a3c71205f96762036583242825c
-MISC ChangeLog 17258 SHA256 a7aa04b48842cf0ee4c9d8af7e389bd91da309794e6e8c68483a9641db726abf SHA512 94672ac0e008bd9bfe282d7dc9ab9da5f86e0ad8d38c0892bca8061e0e4427919c2ddb608325d4fcfb7ef4f6c80c6af0663079d3baef3c82fbee8233b3ed1674 WHIRLPOOL 810bc30204f061f2744a04540d6f0b636230e212924cea362b8f5177e7529374cd2e2b370c5a1eb4fad4c989980270523590a1fea915619a6927bfd682b6fd73
+EBUILD qemu-1.1.1.ebuild 6827 SHA256 4b1f548473a0ab8b341bee0e9c1b4171ae10d194f1f366a89fea734664f89ef0 SHA512 daa413e28d7703368bc0fde1fe0a7c8d948ab668bfe32a46baee4decdb679857caf7b108cf75cfa80f0beb37d9fbac8f3cb2f34d5dcb1cef622f3d35576ac43c WHIRLPOOL dd4834559b45b9efe3866aec425962e0db5d24498d0b98189e03d76ec4e756b3c2f583d11427e429ed2773e70f4ed0754d1b5fe61302d643cb9a02a495fe5941
+EBUILD qemu-9999.ebuild 6757 SHA256 7a9ca6ebaf78ffdcf29f5715a1967db88631906d9f084586cdf026b8a4fc0c9a SHA512 11905526e0ae88c3c8c0a549310d372e61eb24d3da8744c1e5abab77678d0e95cd0a2b3336701f4226f998a1e905d8cc3e90d9203ec6f6325fe399545c00679e WHIRLPOOL cae57ba0d83e9f8725129a95e9e10f1a4e7aef75d4ffb6e540f8a7fe15cc8a69594095b19c19f56a1c3965f6c1d8417e85fef121c8b15953416a160c4e0d1791
+MISC ChangeLog 17392 SHA256 6588f37990dbf6e6ca5f2f3433e0de885cc7db9f860606794382a5cd2aa3289f SHA512 c6621ae6606abdd541743e285e0e3de5f62dd6123a7aa4cfe6a637203b49cef408320df646fb8f735c3b39fa09311ecef5d53b7caff00ad06ea25c55c1e68f14 WHIRLPOOL 4e9543c7c71260611c3eeba5c92202fcf27dcba20d1c6afc3ef234084d34a85ca26572f2aee417d20fbe716f3368b6d462a6f64000e6b091061f5887c4dba2fb
 MISC metadata.xml 2506 SHA256 039849ef9550e3ef56d5821e4bd7ef0b8cfad1da24f9bf4476ac6871d0f32357 SHA512 8c9aa246aaaadbc295b5f16e62f33a66ebc88c44551de3b2819d0be088c5912fee45655e1994767c8d1f061887a2a769bae896f6e3eb51f3e31603c9bd3a1eca WHIRLPOOL 7f61ba9dc0c645397795de5547ff219ea430f4a37c5a7c1cedd830eba0e839b70d8a1afca1dec7b381bbafeb8ba786f472a2e0adb0b10300e220cdaf889d0724
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQL9EAAAoJELEHsLL7fEFWhjsP/1Fs0z73xts6NJMegQlNzdzY
-SfMUaW47ky3/clk0hicDV3LaHP6dH75nXX31nAPWwl0cL3ElYd0aNUCjrKMwCqJQ
-FHbztQnDXQeLnYvP5sHmdZnZ6kN5j7Ejr147SbxKGrVhAwHvApFA1eqoQvJ8jtMo
-iO+ZMkZ/dN1j0Pz2Qyv53vnZPDV362a/P3UnVmNSi+9g+dwd28+IrfE8xX8+QKvv
-njhLntEYv7xyTFO6Tnls9cHf13sviR189puVvZULeWJuiRmy9SqZlzSEHQuCCBSq
-gMjHhe+eItdGJ63a38kyRWxRWBajhCQtmRQY4VFMpm20vO70EMvGz/O5bH8dZVkm
-vDA2vyEgEnlDj9N5oDDpWX65ie4oszJYTg7+7eP6Egx2IOp6FSHo9JsSz1yx+Y3J
-QTr9797yFITMGdV8mIfvPgO9vGhGkPZOBZcG/Hs6FiGMdwTuCC822ih58K6cx6q/
-etl9XDhhx9EBLMbC3leQcZk+xgU5pVQBakvUwhd9BqtOh51+cy4pWXlMRy55PCq6
-NsMpS9FWrKb0sL6HnD1AnG+GfaHcapA8LNg4NXH1ilG1C7jplTJXRi4SC1auCZaU
-Hn8r03vhWHOJSVCZ0kSyGqWd+W7Zl370ghgvCkHFLQZ5tGOfqHiwPtDFg6OQhf5W
-659aQ61L7uQDnN19mF6e
-=Nv1f
+iQIcBAEBCAAGBQJQL+Q/AAoJELEHsLL7fEFWIzAQAMNNCyEHhZGVj2w2L+YTP2dA
+YIdRGd04+4ZUcrz8D181mtdP7hic0K3oRgOGejJMoS6K1jy51b0zC4C7uygvMCQw
+AB6L5RsxXe4p8Mb197grvRyJCYLUTgbKQHMLHISL9G79gofqh8Q4GKWp2B/AD9s+
+4RIcHCArq6vUMd/l0Gj7FnvhAep1K0g4uAKJYY62/0oVkmuS5eu8kPmb6o2tcuGu
+tlKiMYfydcHcBvL3YDvYg7xbQUDoDKgxmI5bFGh9QeAleBEOT2zuECXYMjuwuH0t
+MgqadqPyRPq0EkF2AUF2tyHY3UfQsfVqjizptUZm+55l/iIhe2MB0r2VNMPoKwKB
+7IYNFWsBUHvBQWmKv39vYk16y79dTBoBQWwc+IsbSs+yYsT+nMVrg9ZLCNu4CXcF
+dxrXfad5IPa/Sl8wKqfT6Vhg2xdJnXUJwp2GLRLs89U9kbhVnyiyGpTHWRTqu4A6
+yGVjLfjozZrOoGVKtqp/8FCAzl+77xXa0Id8hxhhx+me2GhhiDdgl4Rw+QbnMfnQ
+pSBvB1f+llAxeiqhTbx/CB0HzU6WV/6Z0gfxNNOZ2OpMIFLpbWIsK3I8WSmUsuib
+Xown4fzrA51qpes1p1qICWJxDbZLcJbHhoEz6kJB+Oi3elaiZ6i/ap3IBqNa4Le3
+dFW2k+t+D6fFQ0CNKrvO
+=5lXp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-1.1.1.ebuild b/app-emulation/qemu/qemu-1.1.1.ebuild
new file mode 100644
index 000000000000..758142e11af2
--- /dev/null
+++ b/app-emulation/qemu/qemu-1.1.1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.1.1.ebuild,v 1.1 2012/08/18 18:51:35 vapier Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.qemu.org/qemu.git
+		http://git.qemu.org/git/qemu.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://wiki.qemu.org/download/${P}-1.tar.bz2"
+	# Pending review
+	#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
+opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
++vhost-net 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} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} +qemu_user_targets_${target}"
+done
+
+RESTRICT="test"
+
+RDEPEND="
+	!app-emulation/qemu-kvm
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	sys-libs/zlib
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( net-misc/curl )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	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] )
+	spice? (
+		>=app-emulation/spice-0.9.0
+		>=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 )
+	xfs? ( sys-fs/xfsprogs )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+"
+
+# alpha ELF binary. don't let portage mess with it
+STRIP_MASK="usr/share/qemu/palcode-clipper"
+
+QA_PRESTRIPPED="
+	usr/share/qemu/openbios-ppc
+	usr/share/qemu/openbios-sparc64
+	usr/share/qemu/openbios-sparc32
+	usr/share/qemu/palcode-clipper
+"
+# keep sorted
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-armeb
+	usr/bin/qemu-cris
+	usr/bin/qemu-i386
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	usr/bin/qemu-microblazeel
+	usr/bin/qemu-mips
+	usr/bin/qemu-mipsel
+	usr/bin/qemu-ppc
+	usr/bin/qemu-ppc64
+	usr/bin/qemu-ppc64abi32
+	usr/bin/qemu-sh4
+	usr/bin/qemu-sh4eb
+	usr/bin/qemu-sparc
+	usr/bin/qemu-sparc32plus
+	usr/bin/qemu-sparc64
+	usr/bin/qemu-s390x
+	usr/bin/qemu-unicore32
+	usr/bin/qemu-x86_64
+"
+
+pkg_setup() {
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+
+	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.1-siginfo.patch
+
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+
+	# Fix underlinking.
+	# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
+	sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+}
+
+src_configure() {
+	local conf_opts audio_opts user_targets
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${target}" && \
+		softmmu_targets="${softmmu_targets} ${target}-softmmu"
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		use "qemu_user_targets_${target}" && \
+		user_targets="${user_targets} ${target}-linux-user"
+	done
+
+	if [[ -z ${softmmu_targets} ]]; then
+		conf_opts="${conf_opts} --disable-system"
+	else
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [[ -n ${user_targets} ]]; then
+		einfo "Building the following user targets: ${user_targets}"
+		conf_opts="${conf_opts} --enable-linux-user"
+	else
+		conf_opts="${conf_opts} --disable-linux-user"
+	fi
+
+	# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+	conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	conf_opts="${conf_opts} --disable-debug-info"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	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)
+		$(use_enable xfs xfsctl)
+		--disable-bsd-user
+	"
+
+	# audio options
+	audio_opts="oss"
+	use alsa && audio_opts="alsa ${audio_opts}"
+	use pulseaudio && audio_opts="pa ${audio_opts}"
+	use sdl && audio_opts="sdl ${audio_opts}"
+
+	set -- --prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-strip \
+		--disable-werror \
+		$(use_enable kvm) \
+		--disable-libiscsi \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)"
+
+	echo ./configure "$@" # show actual options
+	./configure "$@" || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		if use qemu-ifup; then
+			exeinto /etc/qemu
+			doexe "${FILESDIR}"/qemu-if{up,down}
+		fi
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dohtml qemu-doc.html qemu-tech.html
+}
+
+pkg_postinst() {
+	use qemu-ifup || return
+	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 "qemu-ifup script from /etc/qemu."
+	echo
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index ee27c2625067..cc1c72827fd5 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-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/qemu-9999.ebuild,v 1.19 2012/06/10 20:15:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.20 2012/08/18 18:51:35 vapier Exp $
 
 EAPI=4
 
@@ -10,10 +10,10 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-2"
 fi
 
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
+	SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -125,6 +125,8 @@ pkg_setup() {
 	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
 
 	use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+
+	python_set_active_version 2
 }
 
 src_prepare() {