Drop 0.15.0 since we favor 0.15.1 over it.

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

3 files changed, 5 insertions, 297 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 36241636230e..863afc05d541 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.91 2012/01/25 06:01:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.92 2012/01/25 06:04:47 cardoe Exp $
+
+  25 Jan 2012; Doug Goldstein <cardoe@gentoo.org> -qemu-kvm-0.15.0.ebuild:
+  Drop 0.15.0 since we favor 0.15.1 over it.
 
 *qemu-kvm-1.0-r1 (25 Jan 2012)
 
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 72eac35652ca..519f87f80360 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -11,15 +11,12 @@ AUX qemu-kvm-9999-fix-nonkvm-arches.patch 932 RMD160 8313ef828bfe7236b8f2e4d5094
 AUX qemu-kvm-guest-hang-on-usb-add.patch 3491 RMD160 7bc186c283b0eb220a47895f7cab50e191f1a3ea SHA1 00f36fd0197fa9d359e28a9ef2f56a1ee860fddf SHA256 d3068a419d69dbe44758830509fc13460d1497b14a5a10ffad910552da0c86b3
 DIST qemu-kvm-0.14.1-backports-2.tar.bz2 20045 RMD160 a6dfdfc4969ff96d287af389c99c9df9df16ff07 SHA1 4ea70f09ca8d24e30d307319352d9857031d3ccb SHA256 ab0e30b550475b379215d2fdeae9be2b8ad4e66a42bfad406683132892ea5982
 DIST qemu-kvm-0.14.1.tar.gz 5321321 RMD160 e3d69b4756bb0e45d14baad72d85827d949e0ae0 SHA1 7378f10ea04db19e5a5009cae1ecb65517e82877 SHA256 a59c4f6ab8646f2f019d2f9f15443e4db8289cf7cf47743d3c63d18fc584da27
-DIST qemu-kvm-0.15.0-backports-1.tar.bz2 1174 RMD160 4ec6259824f18e7704e88b1c348cb21756345ea3 SHA1 c8788c8d9788fe868ece37c00100a17fe402eb84 SHA256 337810cd52fb8002ae39fcc1d486a224419664a064040c887ce66fe889360969
-DIST qemu-kvm-0.15.0.tar.gz 5916130 RMD160 71e32e95368b84e9441a9a1d051b03ed9b04d3ed SHA1 b009c05461fed20f3f3c3a03b153c457e33683d4 SHA256 828e771bffa540b0fbfe6fa5250adc92d5416720134d1f55a45c7926d83a4478
 DIST qemu-kvm-0.15.1.tar.gz 5915998 RMD160 dba914ca40d6c63e9f3abce409d7daee1d33323b SHA1 2716ddfc49d98fee67a1ff0de9b199d211e72bec SHA256 aed6a3faa76c1e9601b4b5b8adbe5867a70c64567175f44944d88e16bd49733e
 DIST qemu-kvm-1.0.tar.gz 6210473 RMD160 6503b6ec9c8d89b785d644f5c4b47b4716e2fab7 SHA1 c16be4924c30747d93d609b7909e9e9239150c9a SHA256 b711ead5a0a28bf43e7e51ce2082e37120a3527ab012c609bc30fb94d37e116e
 EBUILD qemu-kvm-0.14.1-r2.ebuild 9077 RMD160 7d9801a9213e1f28e7f8a4124231fc090917cfa6 SHA1 abcdb49577ce3d900493f55685b02ffe376f24e1 SHA256 d9906fbabb4ba264d5e011db8236e81cafe0e1126e9564550a7a4d1e69c9daba
-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-r1.ebuild 11259 RMD160 0d04427a0b13217c46183c21143f32c90a84f81b SHA1 f2ed5fbf77b3229efa0653a8257130dd6f4a70ee SHA256 49ee93f1bc77f3c55a2baedd018630ab2015e29d58f323f5afd94e5b730c6f18
 EBUILD qemu-kvm-1.0.ebuild 10590 RMD160 514a2002aefeb31f86f1df437708444dff515604 SHA1 6c883f087c01889d77d687137eb79d4457198e87 SHA256 d912c8e2d54a83474160349e37cd6a1b1e6482ee093ea311f9309590b4caab67
 EBUILD qemu-kvm-9999.ebuild 10720 RMD160 a694119758d8e1a39c2194698895cd125eec5b7b SHA1 70ef918efdf750af27c37cd98c348817b036ef6a SHA256 4c97df054a2e2a64a45b850f5deb435e5e294f1d17e003d0c39f6ca72b623d2f
-MISC ChangeLog 19243 RMD160 110f567f377ea70f505fb11d6c490e307919b56e SHA1 25c4bd733f21008ad14d7c327022a345b0b6e4d8 SHA256 8830d5e2f15ba6f6bf0cadecbbfda85132b3e857a41d3c414b9f156bb1b0cdff
+MISC ChangeLog 19364 RMD160 72f109314d5e793ac518d233f00f7bdce5e8aff8 SHA1 5f7439bfb91da8468f5dd4607b8e0d864e62afa2 SHA256 cade0f6acef37d0c1a122b2b8ab05adef270b04e4c4d672fb92302eb596a0207
 MISC metadata.xml 1918 RMD160 9aeb9149cd322870ce6948a06def34c1d00418fa SHA1 c5f5a1921552afcad74d263920baac136b2d066f SHA256 5fdbde62a8fa400e9b7a9b0a5d5b5c8c398543dccb0ff6837bed23bf37887741
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
deleted file mode 100644
index 34c86e9e5469..000000000000
--- a/app-emulation/qemu-kvm/qemu-kvm-0.15.0.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# 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-0.15.0.ebuild,v 1.7 2012/01/22 21:23:30 slyfox Exp $
-
-BACKPORTS=1
-
-EAPI="3"
-
-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
-
-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 esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
-+vhost-net xattr xen"
-# static, depends on libsdl being built with USE=static-libs, which can not
-# be expressed in current EAPI's
-
-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
-
-RESTRICT="test"
-
-RDEPEND="
-	!app-emulation/kqemu
-	!app-emulation/qemu
-	!app-emulation/qemu-softmmu
-	!app-emulation/qemu-user
-	!app-emulation/qemu-kvm-spice
-	>=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-7.15.4 )
-	esd? ( media-sound/esound )
-	fdt? ( >=sys-apps/dtc-1.2.0 )
-	jpeg? ( virtual/jpeg )
-	ncurses? ( sys-libs/ncurses )
-	nss? ( dev-libs/nss )
-	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.6.0 )
-	ssl? ( net-libs/gnutls )
-	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"
-
-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() {
-	if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; 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"
-			kvm_kern_warn
-		elif ! linux_chkconfig_present KVM; then
-			kvm_kern_warn
-		fi
-		if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
-			ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
-			ewarn "to have vhost-net support."
-		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
-
-	# ${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"
-
-	[[ -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 [ ! -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"
-
-	# 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 user-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 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"
-
-	# 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 \
-		--disable-werror \
-		--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"
-
-	if [ ! -z "${softmmu_targets}" ]; then
-		insinto /$(get_libdir)/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
-			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
-	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
-}
-
-pkg_postinst() {
-
-	if [ ! -z "${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 "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."
-		elog
-		elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
-	fi
-}