Pull in a lot of stable patches from upstream stable repos.

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

3 files changed, 251 insertions, 12 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 08f29a8607cc..16818c289f7a 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-kvm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.31 2010/06/30 21:46:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.32 2010/07/20 22:58:39 cardoe Exp $
+
+*qemu-kvm-0.12.4-r2 (20 Jul 2010)
+
+  20 Jul 2010; Doug Goldstein <cardoe@gentoo.org>
+  +qemu-kvm-0.12.4-r2.ebuild:
+  Pull in a lot of stable patches from upstream stable repos.
 
   30 Jun 2010; Harald van Dijk <truedfx@gentoo.org> qemu-kvm-0.11.1.ebuild,
   qemu-kvm-0.11.1-r1.ebuild, qemu-kvm-0.12.3.ebuild,
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index dc2de82ce4c5..27fe9e640a5b 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
 AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e303d583bd541c9d8fff2214262e6b SHA256 211d51f0a7d3d2ba8c53016c75e2b483feadbb65e383b1eec81d9cebf6a22c29
 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff
@@ -10,20 +7,15 @@ AUX qemu-kvm-0.12.3-include-madvise-defines.patch 274 RMD160 2b2b454fabc3b5362c0
 AUX qemu-kvm-0.12.4-large-virtio-corruption.patch 1291 RMD160 66ae04ddfbb6d2e6ce55d109917b231cf354dcbf SHA1 2dc977ce2de3a9b129688d62b04dde079070b97f SHA256 ee279695557224a0f1d1eddf7739932f93abfd781724ac7768a7d1b6a6d61a14
 DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b
 DIST qemu-kvm-0.12.3.tar.gz 4718791 RMD160 fe88117e6e32188e097a86f95bffc4b74422a5e6 SHA1 235a790056a1b751791e64dd499129b2dbf55be8 SHA256 77cccdc8938b33f3ed74763d01deaad58918c85f04a06afd10f00857b504c2b2
+DIST qemu-kvm-0.12.4-backports-1.tar.bz2 23357 RMD160 04241776737f33214ef7c957c83252e67126d73e SHA1 798b2838ef2e077c84a98fd1d73b36aa9d2a5765 SHA256 50e567bc7c85166050ba12756d3b662b9f7f04ba48fe3d0b949f204f4ac31146
 DIST qemu-kvm-0.12.4.tar.gz 4720232 RMD160 63a18ff3b95de2b4d0dfac130cf850c1cd7caec0 SHA1 955c8dad1f65df0eb5403f40a6c92d93a0a252be SHA256 1489fe5a0def7b857256817a998768bb21662167d10e7c372312c5939e64181e
 EBUILD qemu-kvm-0.11.1-r1.ebuild 5802 RMD160 188295cf003751c89fa2323b143f57f13ff0a124 SHA1 56cbc1b3a5654abe68979e372d84c9efa5985661 SHA256 404cda40869f1ba8cfbd67f45e271c3bc940aa51c393dbaabaaf9b1cdf5c706a
 EBUILD qemu-kvm-0.11.1.ebuild 5730 RMD160 ecce6cd88f263b57065fd961c7b0fbd5b1d6af05 SHA1 e04bfa27a3c3d939259840537278f898be3f159f SHA256 ec0a17126355fbf8ddc417e109c216b372433605f8dee890b0b72f8d98587859
 EBUILD qemu-kvm-0.12.3-r1.ebuild 7458 RMD160 be242c57d61934138ac184966976e8920f82da19 SHA1 79f732878641962c67034f5b6625b24bc3e1ab35 SHA256 f31657a575f03bb954b93ed1b7e991a8502c443381c61c5a64a9a68bfff3752d
 EBUILD qemu-kvm-0.12.3.ebuild 7297 RMD160 5f59c2e87f734d8f32e0e8fcfc33911b4cf64561 SHA1 6af83d6146afb37300497388b7be378fc1dee163 SHA256 8edb8cd077017c5dc48e012bf54f9c4f2ce08a9800fd8a4e3ba7ba8789e29cb2
 EBUILD qemu-kvm-0.12.4-r1.ebuild 7470 RMD160 e7193821e681903148303ecbc68eff418d2ab354 SHA1 8819586f093d45963a6240f09bf1a8092674a414 SHA256 fea6400fbd08aac09526fb71c1adbf67a5e6e0d9fcf1207c734f5ed88726e06b
+EBUILD qemu-kvm-0.12.4-r2.ebuild 7586 RMD160 bbe62bedb11f3bc729aaf9ce94051d22b6e62443 SHA1 d358bd153828cf9070683ba08cc45e04dd3fadc4 SHA256 9c609f7053eec521858d557fe9d6305b66af8aab077083d40eb81dd34c4d22af
 EBUILD qemu-kvm-0.12.4.ebuild 7414 RMD160 8101fb6b97d3335a1171de0ab473bdce2dbbed45 SHA1 2f99b920cb80986dc63c3a76ac1a8493c5ebb6ad SHA256 4f6898d320ae26922e55f5b3942ca344667bed652fd3d0f5db7efe55df95faca
 EBUILD qemu-kvm-9999.ebuild 7578 RMD160 1fd9e503dfad252993c18f11ae80d102b7fb32e6 SHA1 df5421c3152ba336da34b3da0798e9ca53e2361b SHA256 5ebc6c2bdaba5dddc01f56cb6236ccac84db0ed39b40c0ce7e80b746546d5fe1
-MISC ChangeLog 6935 RMD160 5a04b7f0ee39b78e7c16f6e7efe981b6c84c8429 SHA1 4411f8094773c2df03339287ac6f2c5f6867b655 SHA256 0a7284983a863e2a3449615ad716e149ea52048ea67421a6aefde93dfe3c50b0
+MISC ChangeLog 7112 RMD160 3e65bc69e01641f6e0e5eaf6fe6342652b43d5ae SHA1 80b8207ff15b39206028b92e9a5c44aa47459557 SHA256 fbfec8850c47642ec4200b4c8708b172169d28fe7679110255fa9737014112e2
 MISC metadata.xml 978 RMD160 2e120b8332c7fc1d6b4baa4149b0f13a73c74fb2 SHA1 5fe37c22d64ca52ef6d26debc46b23b415e04a7a SHA256 76676f1a327e743dd3579109250ace6012ac93ffea5d1daab0a24b194b55164f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwru4EACgkQwnQyISwouHy5rQCfdsIdDWn4CBFRpHBynHf1gH3V
-LggAnR7ZU7fMfAZ0XqQ0NU+g8YFqrq1i
-=xuyN
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild
new file mode 100644
index 000000000000..382d12af34b6
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.4-r2.ebuild,v 1.1 2010/07/20 22:58:39 cardoe Exp $
+
+BACKPORTS=1
+
+EAPI="2"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	GIT_ECLASS="git"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+		${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+# xen is disabled until the deps are fixed
+IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \
+pulseaudio qemu-ifup sasl sdl static vde"
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+
+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/kqemu
+	!app-emulation/qemu
+	!app-emulation/qemu-softmmu
+	!app-emulation/qemu-user
+	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 )
+	curl? ( net-misc/curl )
+	esd? ( media-sound/esound )
+	fdt? ( sys-apps/dtc )
+	gnutls? ( net-libs/gnutls )
+	ncurses? ( sys-libs/ncurses )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( >=media-libs/libsdl-1.2.11[X] )
+	vde? ( net-misc/vde )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	>=sys-kernel/linux-headers-2.6.29
+	gnutls? ( dev-util/pkgconfig )"
+
+kvm_kern_warn() {
+	eerror "Please enable KVM support in your kernel, found at:"
+	eerror
+	eerror "  Virtualization"
+	eerror "    Kernel-based Virtual Machine (KVM) support"
+	eerror
+}
+
+pkg_setup() {
+
+	local counter="0" check
+	use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	for check in ${IUSE_SOFTMMU_TARGETS} ; do
+		use "qemu_softmmu_targets_${check}" && counter="1"
+	done
+	[[ ${counter} == 0 ]] && die "You need to set at least 1 target in QEMU_SOFTMMU_TARGETS"
+
+	if 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"
+	else
+		if ! linux_config_exists; then
+			eerror "Unable to check your kernel for KVM support"
+			kvm_kern_warn
+		elif ! linux_chkconfig_present KVM; then
+			kvm_kern_warn
+		fi
+	fi
+
+	enewgroup kvm
+}
+
+src_prepare() {
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+	# append CFLAGS while linking
+	sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
+
+	# remove part to make udev happy
+	sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
+
+	epatch "${FILESDIR}"/qemu-0.11.0-mips64-user-fix.patch \
+		"${FILESDIR}"/${PN}-0.12.3-fix-crash-with-sdl.patch \
+		"${FILESDIR}"/${PN}-0.12.3-include-madvise-defines.patch
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" epatch
+}
+
+src_configure() {
+	local conf_opts audio_opts softmmu_targets 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
+		einfo "Building the following softmmu targets: ${softmmu_targets}"
+	fi
+
+	if [ ! -z "${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"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	#config options
+	conf_opts="${conf_opts} $(use_enable aio linux-aio)"
+	use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+	conf_opts="${conf_opts} $(use_enable curl)"
+	use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
+	conf_opts="${conf_opts} $(use_enable fdt)"
+	use hardened && conf_opts="${conf_opts} --enable-user-pie"
+	use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
+	use ncurses || conf_opts="${conf_opts} --disable-curses"
+	use sasl || conf_opts="${conf_opts} --disable-vnc-sasl"
+	use sdl || conf_opts="${conf_opts} --disable-sdl"
+	use vde || conf_opts="${conf_opts} --disable-vde"
+#	conf_opts="${conf_opts} $(use_enable xen)"
+	conf_opts="${conf_opts} --disable-xen"
+	conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+
+	# audio options
+	audio_opts="oss"
+	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}"
+	./configure --prefix=/usr \
+		--disable-strip \
+		--enable-kvm \
+		--enable-nptl \
+		--enable-uuid \
+		${conf_opts} \
+		--audio-drv-list="${audio_opts}" \
+		--target-list="${softmmu_targets} ${user_targets}" \
+		--cc="$(tc-getCC)" \
+		--host-cc="$(tc-getBUILD_CC)" \
+		|| 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"
+
+	insinto /etc/udev/rules.d/
+	doins kvm/scripts/65-kvm.rules || die
+
+	if use qemu-ifup; then
+		insinto /etc/qemu/
+		insopts -m0755
+		doins kvm/scripts/qemu-ifup || die
+	fi
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+	newdoc pc-bios/README README.pc-bios || die
+	dohtml qemu-doc.html qemu-tech.html || die
+
+	if use qemu_softmmu_targets_x86_64 ; then
+		dobin "${FILESDIR}"/qemu-kvm
+		dosym /usr/bin/qemu-kvm /usr/bin/kvm
+	else
+		elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+		elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+	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
+}