Version bump (bug #335931), also solves bug #335752. Thanks to fkhp for the patches.

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

6 files changed, 293 insertions, 2 deletions

diff --git a/app-emulation/qemu-kvm-spice/ChangeLog b/app-emulation/qemu-kvm-spice/ChangeLog
index 75e43a2be84a..49f602cd21c0 100644
--- a/app-emulation/qemu-kvm-spice/ChangeLog
+++ b/app-emulation/qemu-kvm-spice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/qemu-kvm-spice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm-spice/ChangeLog,v 1.1 2010/08/12 08:41:58 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm-spice/ChangeLog,v 1.2 2010/10/21 12:29:58 dev-zero Exp $
+
+*qemu-kvm-spice-18.9999 (21 Oct 2010)
+
+  21 Oct 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +files/18.9999-cmd-vga-qxl.patch, +qemu-kvm-spice-18.9999.ebuild,
+  +files/18.9999-pc_piix.patch, +files/18.9999-qxl-640x480x8.patch:
+  Version bump (bug #335931), also solves bug #335752. Thanks to fkhp for
+  the patches.
 
 *qemu-kvm-spice-14.9999 (12 Aug 2010)
 
diff --git a/app-emulation/qemu-kvm-spice/Manifest b/app-emulation/qemu-kvm-spice/Manifest
index a75503adddae..53f79bc2c412 100644
--- a/app-emulation/qemu-kvm-spice/Manifest
+++ b/app-emulation/qemu-kvm-spice/Manifest
@@ -1,6 +1,10 @@
+AUX 18.9999-cmd-vga-qxl.patch 369 RMD160 4a091863896d02e4fb308b629d7f7ba84916174a SHA1 361aa3a1636dc094983b0f2f9e9dee9fc0049df9 SHA256 9e4b76ef334d24db460ad7bcfbaea4f2c267203720e56a34d0640bf92315ee39
+AUX 18.9999-pc_piix.patch 566 RMD160 0596696881059f5e7a4f116a7baf9c8e1654d3ca SHA1 749e1de6835614b8816b5481b57784ac1bce4f7c SHA256 73cb374e47495138a2593d33a67e38e070dbe7b8e78632d1ec4d9d1fe3f5ea58
+AUX 18.9999-qxl-640x480x8.patch 398 RMD160 b74241fab7a2006af9afb4c23554b38626621e74 SHA1 9efa47f8fa43a97994d0cd37d98c13946d71034b SHA256 b35ec01e3e860062ee66d24623c4904b63d87e1d52406cb92f32437f8f03a686
 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.3-include-madvise-defines.patch 274 RMD160 2b2b454fabc3b5362c0479d581e5fb038e02aa97 SHA1 c34b51b9c0b5a69ab2ab7a8a64c804f7cbbbebf5 SHA256 0d33d22a853e9b1d19786c9ac53a515587a9753ff69a2f53e61c4764590e7821
 EBUILD qemu-kvm-spice-14.9999.ebuild 7989 RMD160 9af871afb8c54a1661ee16aa07bcf72d088dfac2 SHA1 7ae49c1ac4a2bc2d4d1a1b43368d969329f1f189 SHA256 8a34f69cc7801408353c760e06b9a258e8bb3094a2ab6d87eeff1788b03e39b1
-MISC ChangeLog 553 RMD160 45686e04af8366644e209c6afe8eb3205476a5bb SHA1 a4e58c28fff4ffbd09bf0f7f45085933d79537dc SHA256 6677a2b9230973611227445a74144d73185042121cfbbb0fb29f1ce48a7181f4
+EBUILD qemu-kvm-spice-18.9999.ebuild 8113 RMD160 af8b91fb8d6fb86455a419252505e243019105ff SHA1 04cad1e5d22dd6b07afadbf781c60ce9ef9d2f83 SHA256 3be66b3319b87ffd05631c62abf9e1e77645f27ffee3e2ea6d77775ab5d4d7fc
+MISC ChangeLog 871 RMD160 3157edeec8afe8d26e96c7ba5c1e3ade92067b48 SHA1 51850fc8f98544164913d8b52224a7addbf06c3e SHA256 0354cbd10697e1b87a89663893d7497c157e1205cdaf3e71174d320ba1c4f810
 MISC metadata.xml 1022 RMD160 33768c171441c6fcfab3f91c3ff7b038ec890bd0 SHA1 d9eedb9ff71bac5e829915454087049e8e91084d SHA256 3e5fc23deaa498da4b0e671b434576f173abdf8a231a4cb1a52c3a40c736efc8
diff --git a/app-emulation/qemu-kvm-spice/files/18.9999-cmd-vga-qxl.patch b/app-emulation/qemu-kvm-spice/files/18.9999-cmd-vga-qxl.patch
new file mode 100644
index 000000000000..420c9ea55bf0
--- /dev/null
+++ b/app-emulation/qemu-kvm-spice/files/18.9999-cmd-vga-qxl.patch
@@ -0,0 +1,11 @@
+--- qemu-options.hx.o	2010-09-04 14:45:09.044685370 +0800
++++ qemu-options.hx	2010-09-04 14:45:46.535315718 +0800
+@@ -752,7 +752,7 @@
+ ETEXI
+ 
+ DEF("vga", HAS_ARG, QEMU_OPTION_vga,
+-    "-vga [std|cirrus|vmware|xenfb|none]\n"
++    "-vga [std|cirrus|vmware|xenfb|qxl|none]\n"
+     "                select video card type\n", QEMU_ARCH_ALL)
+ STEXI
+ @item -vga @var{type}
diff --git a/app-emulation/qemu-kvm-spice/files/18.9999-pc_piix.patch b/app-emulation/qemu-kvm-spice/files/18.9999-pc_piix.patch
new file mode 100644
index 000000000000..3657087f9460
--- /dev/null
+++ b/app-emulation/qemu-kvm-spice/files/18.9999-pc_piix.patch
@@ -0,0 +1,11 @@
+--- hw/pc_piix.c.o	2010-09-09 21:42:49.774121727 +0800
++++ hw/pc_piix.c	2010-09-09 21:43:22.194191370 +0800
+@@ -366,7 +366,7 @@
+     snprintf(buf, sizeof(buf), "KVM");
+     smbios_add_field(1, offsetof(struct smbios_type_1, product_name_str),
+                      strlen(buf) + 1, buf);
+-    snprintf(buf, sizeof(buf), type1_version);
++    snprintf(buf, sizeof(buf), "%s", type1_version);
+     smbios_add_field(1, offsetof(struct smbios_type_1, version_str),
+                      strlen(buf) + 1, buf);
+     snprintf(buf, sizeof(buf), "Red Hat Enterprise Linux");
diff --git a/app-emulation/qemu-kvm-spice/files/18.9999-qxl-640x480x8.patch b/app-emulation/qemu-kvm-spice/files/18.9999-qxl-640x480x8.patch
new file mode 100644
index 000000000000..9ff6537c6c5c
--- /dev/null
+++ b/app-emulation/qemu-kvm-spice/files/18.9999-qxl-640x480x8.patch
@@ -0,0 +1,13 @@
+--- hw/qxl.c.o	2010-09-05 15:49:07.155580239 +0800
++++ hw/qxl.c	2010-09-05 16:03:02.143974552 +0800
+@@ -63,6 +63,10 @@
+     QXL_MODE_16_32(y_res, x_res, 3)
+ 
+ static QXLMode qxl_modes[] = {
++    QXL_MODE(640, 480, 8, 0),
++    QXL_MODE(640, 480, 8, 1),
++    QXL_MODE(640, 480, 8, 2),
++    QXL_MODE(640, 480, 8, 3),
+     QXL_MODE_EX(640, 480),
+     QXL_MODE_EX(800, 480),
+     QXL_MODE_EX(800, 600),
diff --git a/app-emulation/qemu-kvm-spice/qemu-kvm-spice-18.9999.ebuild b/app-emulation/qemu-kvm-spice/qemu-kvm-spice-18.9999.ebuild
new file mode 100644
index 000000000000..ef24090a5719
--- /dev/null
+++ b/app-emulation/qemu-kvm-spice/qemu-kvm-spice-18.9999.ebuild
@@ -0,0 +1,244 @@
+# 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-spice/qemu-kvm-spice-18.9999.ebuild,v 1.1 2010/10/21 12:29:58 dev-zero Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic git linux-info toolchain-funcs
+
+DESCRIPTION="Spiced QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org http://spice-space.org/"
+EGIT_REPO_URI="git://git.freedesktop.org/git/spice/qemu"
+EGIT_BRANCH="spice.kvm.v${PV/.9999}"
+EGIT_COMMIT="${EGIT_BRANCH}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+# 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"
+
+# Updated targets to use the only supported upstream target - x86_64-softmmu
+COMMON_TARGETS=""
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64"
+IUSE_USER_TARGETS=""
+#COMMON_TARGETS="i386 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
+#IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} x86_64 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
+	!app-emulation/qemu-kvm
+	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 )
+	app-emulation/spice"
+
+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}/qemu-kvm-0.12.3-include-madvise-defines.patch" \
+		"${FILESDIR}/${PV}-qxl-640x480x8.patch" \
+		"${FILESDIR}/${PV}-pc_piix.patch" \
+		"${FILESDIR}/${PV}-cmd-vga-qxl.patch"
+}
+
+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)" \
+		--enable-spice \
+		|| 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_compile() {
+	# spice patchset introduces some parallel make issues
+	# will be fixed when patches arrive at qemu-kvm upstream
+	emake -j1 || die "emake failed"
+}
+
+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
+	ewarn "In case you haven't noted: this is a live ebuild of qemu-kvm with"
+	ewarn "spice patches on top of it."
+	ewarn "Version tag is changed when the spice devs rebase their patches to a new tip"
+	ewarn "of the qemu-kvm git repository."
+	ewarn "This package is going away as soon as the spice patches get merged at qemu-kvm upstream."
+}