Version bump

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

3 files changed, 372 insertions, 16 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index a4571372fc77..5317a82d34b7 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.113 2012/03/18 13:34:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.114 2012/04/23 05:14:39 cardoe Exp $
+
+*qemu-kvm-1.0.1 (23 Apr 2012)
+
+  23 Apr 2012; Doug Goldstein <cardoe@gentoo.org> +qemu-kvm-1.0.1.ebuild:
+  Version bump
 
   18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   qemu-kvm-0.15.1-r1.ebuild, qemu-kvm-1.0-r3.ebuild, qemu-kvm-9999.ebuild,
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 90418c4e8384..8cb2552bbc00 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
@@ -13,20 +10,11 @@ AUX qemu-kvm-1.0-fix-qemu-system-ppc.patch 1071 RMD160 113a121abf72c9378f0c231e2
 AUX qemu-kvm-1.0-per-target-i8259.patch 2765 RMD160 53208c75291cf9d16eab990bacdc18e28ec44a13 SHA1 c347ff7fc737af004245d3671ae87c7869b95198 SHA256 42b5905f4e2f0bb5bcdca1e14a669941c2d70ffb1e0b6969b69fc4435772abb2
 AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7cab50e191f1a3ea SHA1 00f36fd0197fa9d359e28a9ef2f56a1ee860fddf SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3
 DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e
+DIST qemu-kvm-1.0.1.tar.gz 6214796 RMD160 b6ad256b94f9c79ab4406019c90b776f30cfa1bf SHA1 4163eeb73f473dd272db6189f0da26ce2e78416a SHA256 57bcd26342af2303663028db9e9956a8b487babfcf2a432ac3351c88b8e2bf4f
 DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e
 EBUILD qemu-kvm-0.15.1-r1.ebuild 9571 RMD160 0fdf15f9e32e1545c01937102fab7feac7c3ee3c SHA1 28ac307371286ca5c1b87f53923c10755026bce8 SHA256 4a1ec0bba2632df1208097bda2baf7fb7c53f78180e0e5efdd0a2f89a0afa528
 EBUILD qemu-kvm-1.0-r3.ebuild 11659 RMD160 97cdd3c5db72af5c2ce70fba5859f39df5bf7d19 SHA1 8aa31efde883219535624a29a9e90481c9205283 SHA256 6c61269b3f3d7ce4e4f15c28b2ecb8159004caa68513f54daf68ba43c1220fd7
+EBUILD qemu-kvm-1.0.1.ebuild 11367 RMD160 e44aae7cfadf590b6f654a7c60973dc92309405d SHA1 063f8ddcbb9e929c39a5cfee96f346d4f3600f61 SHA256 f84cd07175bc786622659a398dc9284159928dab685b5f642422f7f759753a70
 EBUILD qemu-kvm-9999.ebuild 10505 RMD160 05dc69b20c757876bb5cff7aab3e9fd9a8b89186 SHA1 992310655d08a06c0eb94a25bbe26fd63fdf66df SHA256 29c3b8890f2c39e20dba7fdc8951dbce5744cd70ee6b9909c0d215f1924b77af
-MISC ChangeLog 23060 RMD160 709e7aa77357ae01d373bcbdbeaeed3d23bf70c3 SHA1 cb8788d1fda10fa3a9f99cb4a347ae9778d63615 SHA256 31ab6db98cbfa471c2b158363781728ab210d3ad65efbc3bf4f099417be2b613
+MISC ChangeLog 23178 RMD160 8afcc3e770aa39d6c20ce8da1dfb5501dcc21d53 SHA1 99e04ff39ad35fb66a28a94c62178e9a0aa0ddca SHA256 3e4ef5736668b46bb53bb13331ccf5194f3b87e2f50c6c0653d75300bbe10f1a
 MISC metadata.xml 2001 RMD160 b6fb691f711d25dc041b0f3370d320898607fb72 SHA1 372da96b243fe7d9731d2127533fa9edc3c18245 SHA256 e0e7dc3006b9333bc2e1461fc9e145e46c6f8b29cc8281a7c9fae7f6c4c44361
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPZeRuAAoJEEdUh39IaPFN8ocH/1uWDADALh1WFMF3rR8iEFX+
-hhBgCr1gUJuqx/EDkxOK9UOj33nX9c9DaO3j6qtgx5f1tfxt16kapWJi9jF5HnEm
-7ZaaILjR+cdXVYlD1tVLAu/8lHdODx+aGjkbgOgj2/aa9b6GtThhoNtwvYhKGc2p
-HigSd6BHgrDtMr+0ajI24DWOQLGgryXqkPGVl0z8MdQD9vasLhvRO4CEpmf9DHD2
-RhhI/8ptF2eajqrBOUshNDJtvf2jDq5C6J1vIHotRsE7+bnVMXejW+8M3rf9lZaW
-fd8mVUyrF8PqyDcWDqJ2k+SG65D2Vlu6tVIp9HICL86sShLK9EYYugMvP+ldjBo=
-=EgdL
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu-kvm/qemu-kvm-1.0.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-1.0.1.ebuild
new file mode 100644
index 000000000000..0082c2de89fc
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-1.0.1.ebuild
@@ -0,0 +1,363 @@
+# 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-1.0.1.ebuild,v 1.1 2012/04/23 05:14:39 cardoe Exp $
+
+#BACKPORTS=1
+
+EAPI="4"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+	GIT_ECLASS="git-2"
+fi
+
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
+	${BACKPORTS:+
+		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
+		http://dev.gentoo.org/~cardoe/distfiles/${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 brltty +curl debug fdt ncurses \
+opengl pulseaudio qemu-ifup rbd sasl sdl smartcard spice static test
++threads tls usbredir vde +vhost-net xattr xen"
+
+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"
+
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+
+for target in ${IUSE_SOFTMMU_TARGETS}; do
+	if [ "x${target}" = "xx86_64" ]; then
+		continue
+	fi
+	IUSE="${IUSE} qemu_softmmu_targets_${target}"
+done
+
+for target in ${IUSE_USER_TARGETS}; do
+	IUSE="${IUSE} qemu_user_targets_${target}"
+done
+
+RDEPEND="
+	!app-emulation/kqemu
+	!app-emulation/qemu
+	!app-emulation/qemu-user
+	>=dev-libs/glib-2.0
+	media-libs/libpng
+	sys-apps/pciutils
+	>=sys-apps/util-linux-2.16.0
+	virtual/jpeg
+	amd64? ( sys-apps/seabios
+		sys-apps/vgabios )
+	x86? ( sys-apps/seabios
+		sys-apps/vgabios )
+	aio? ( dev-libs/libaio )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
+	brltty? ( app-accessibility/brltty )
+	curl? ( >=net-misc/curl-7.15.4 )
+	fdt? ( >=sys-apps/dtc-1.2.0 )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+		!static? ( >=media-libs/libsdl-1.2.11[X] ) )
+	static? ( sys-libs/zlib[static-libs(+)] )
+	!static? ( sys-libs/zlib )
+	smartcard? ( dev-libs/nss )
+	spice? ( >=app-emulation/spice-0.9.0
+			>=app-emulation/spice-protocol-0.8.1 )
+	tls? ( net-libs/gnutls )
+	usbredir? ( sys-apps/usbredir )
+	vde? ( net-misc/vde )
+	xattr? ( sys-apps/attr )
+	xen? ( app-emulation/xen-tools )
+"
+
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	dev-util/pkgconfig
+	>=sys-kernel/linux-headers-2.6.35
+	test? ( dev-libs/check )"
+
+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"
+
+QA_WX_LOAD="${QA_PRESTRIPPED}
+	usr/bin/qemu-i386
+	usr/bin/qemu-x86_64
+	usr/bin/qemu-alpha
+	usr/bin/qemu-arm
+	usr/bin/qemu-cris
+	usr/bin/qemu-m68k
+	usr/bin/qemu-microblaze
+	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-sparc64
+	usr/bin/qemu-armeb
+	usr/bin/qemu-sparc32plus"
+
+pkg_pretend() {
+	if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
+
+	if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
+		eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+	fi
+
+	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"
+		else
+			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+			ERROR_KVM="You must enable KVM in your kernel to continue"
+			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+			ERROR_KVM_AMD+=" your kernel configuration."
+			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+			ERROR_TUN+=" into your kernel or loaded as a module to use the"
+			ERROR_TUN+=" virtual network device if using -net tap."
+			ERROR_BRIDGE="You will also need support for 802.1d"
+			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+			use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
+			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+			ERROR_VHOST_NET+=" support"
+
+			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
+			fi
+
+			# Now do the actual checks setup above
+			check_extra_config
+		fi
+	fi
+}
+
+pkg_setup() {
+	python_set_active_version 2
+
+	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
+
+	# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
+	# to the qemu-devel ml - bug 337988
+	epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
+
+	# drop '-g' by default as it tends to eat
+	# A LOT (~2GB) of ram for each job #355861
+	sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
+		-i configure || die
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+}
+
+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
+		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 [[ -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"
+
+	# Add support for static builds
+	use static && conf_opts="${conf_opts} --static"
+
+	# Support debug USE flag
+	use debug && conf_opts="${conf_opts} --enable-debug"
+
+	# 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}"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-darwin-user \
+		--disable-bsd-user \
+		--disable-libiscsi \
+		--disable-strip \
+		--disable-werror \
+		--enable-kvm \
+		--enable-kvm-device-assignment \
+		--enable-kvm-pit \
+		--enable-pie \
+		--enable-nptl \
+		--enable-tcg-interpreter \
+		--enable-uuid \
+		--enable-vnc-jpeg \
+		--enable-vnc-png \
+		--python=python2 \
+		$(use_enable aio linux-aio) \
+		$(use_enable bluetooth bluez) \
+		$(use_enable brltty brlapi) \
+		$(use_enable curl) \
+		$(use_enable fdt) \
+		$(use_enable ncurses curses) \
+		$(use_enable opengl) \
+		$(use_enable rbd) \
+		$(use_enable sasl vnc-sasl) \
+		$(use_enable sdl) \
+		$(use_enable smartcard smartcard) \
+		$(use_enable smartcard smartcard-nss) \
+		$(use_enable spice) \
+		$(use_enable test check-utests) \
+		$(use_enable tls vnc-tls) \
+		$(use_enable threads vnc-thread) \
+		$(use_enable usbredir usb-redir) \
+		$(use_enable vde) \
+		$(use_enable vhost-net) \
+		$(use_enable xen) \
+		$(use_enable xattr attr) \
+		--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="${ED}" install || die "make install failed"
+
+	if [[ -n ${softmmu_targets} ]]; then
+		insinto /lib/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
+
+		if use qemu_softmmu_targets_x86_64 ; then
+			dobin "${FILESDIR}"/qemu-kvm
+			ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+			ewarn "your libvirt configs or other wrappers for ${PN}"
+		else
+			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+			elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
+		fi
+	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
+
+	# FIXME: Need to come up with a solution for non-x86 based systems
+	if use x86 || use amd64; then
+		# Remove SeaBIOS since we're using the SeaBIOS packaged one
+		rm "${ED}/usr/share/qemu/bios.bin"
+		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+		# Remove vgabios since we're using the vgabios packaged one
+		rm "${ED}/usr/share/qemu/vgabios.bin"
+		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
+		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+	fi
+}
+
+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"
+		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 "The ssl USE flag was renamed to tls, so adjust your USE flags."
+		elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+	fi
+
+	use qemu-ifup && \
+	ewarn "qemu-ifup is deprecated, be prepared for it to disappear next release"
+}