Version bump.

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

5 files changed, 230 insertions, 8 deletions

diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 2d9f96ad3134..b54900812bd7 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.12 2009/12/30 02:17:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.13 2009/12/31 16:29:24 jmbsvicetto Exp $
+
+*qemu-kvm-0.12.1.2 (31 Dec 2009)
+
+  31 Dec 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  qemu-kvm-0.12.1.1.ebuild, +qemu-kvm-0.12.1.2.ebuild, qemu-kvm-9999.ebuild:
+  Version bump.
 
 *qemu-kvm-9999 (30 Dec 2009)
 
diff --git a/app-emulation/qemu-kvm/Manifest b/app-emulation/qemu-kvm/Manifest
index 7203dc3b9b99..dd82edc4b19b 100644
--- a/app-emulation/qemu-kvm/Manifest
+++ b/app-emulation/qemu-kvm/Manifest
@@ -3,10 +3,12 @@ AUX qemu-kvm 61 RMD160 83882e881a067065258f562ad1e60440666c85d3 SHA1 a965f19031e
 AUX qemu-kvm-0.12.1-kvm_save_mpstate-workaround.patch 622 RMD160 d3add3022d9eba3ec07ccade6f169b4d758d23e8 SHA1 b41e9516d69c179701906f157750e72a82c650ca SHA256 f51a7b3ea49f814a5f7726daeac08e5ab641d2e0ea72e90b4b83dd914ca742ff
 DIST qemu-kvm-0.11.1.tar.gz 4384334 RMD160 0f945f1812b3a42a5642698d2f15bd8f456612f8 SHA1 291d0b771feb4c67bce71d393868a6d1a1db345b SHA256 7df5b589fabb1f0f35a06abce7e34c81574e09ade538ba883ef5b43ccbd8458b
 DIST qemu-kvm-0.12.1.1.tar.gz 4712192 RMD160 bb457854c79951bdb0db90da30bd31ac6a033d02 SHA1 0383219e824dff766821444c42c962d21e56a63f SHA256 38b3e272704bf53c1198ccc2d1492df656bcc1da53f1e04c56d9ee4063e2286f
+DIST qemu-kvm-0.12.1.2.tar.gz 4712236 RMD160 55052450668310d6e167fe12e6a7a933cee62a3a SHA1 dee7359094757af77ea839bbfd9dca8826edcbd2 SHA256 472ddba26c30390dfcb3eb5f7925b442f6152062e919badf0a61586073eabdcc
 DIST qemu-kvm-0.12.1.tar.gz 4712004 RMD160 f2c7842301e5c68e91f291bb3d74e2019bb7ee3c SHA1 0c2a8bb7dd98a5214bbad5bc954ae3111646c8cd SHA256 c65c5afc43176b3031b52b664704269a79e40e9acdc0c1aae2bcc46875d3051a
 EBUILD qemu-kvm-0.11.1.ebuild 5682 RMD160 a16161e7671b31eaf21d729360a1e559166a5011 SHA1 faa910b330daba597afe4caf363c0dc3fb291610 SHA256 94ec5101929f2b1ad90d60aebc3173086f2e8d8e7032a8fc3ac1a38adb2f7ac0
-EBUILD qemu-kvm-0.12.1.1.ebuild 6609 RMD160 de7ce08157ab999b5ec50e318ce665b574793233 SHA1 387086af1cf579569e68b0d37a98db658699001f SHA256 c03163fbe2aa704c3641b550eb9c91d4bed1510dddccb5bfb1b5e0987dd2fb2f
+EBUILD qemu-kvm-0.12.1.1.ebuild 6613 RMD160 12f47421fdb446da32aad1d2cfe32aaf93c4072a SHA1 17898db2aac83096d93e745230eec23b820723bc SHA256 6f1dab2e8aed8584d0c5c62546b614ef6f694aac14aae274911af909ff9a449b
+EBUILD qemu-kvm-0.12.1.2.ebuild 6613 RMD160 b45a2464d260b0b7d26bea209c03c2d850011514 SHA1 19a6135bb54d68924f832b18dff9fb881bf90b9c SHA256 dc2f96546cfc6088b2f083571590984ccaf85d0452b14bf9bb4754ef40a65438
 EBUILD qemu-kvm-0.12.1.ebuild 6534 RMD160 9f2c9dec92f2d616e0e90ccb084d98fb1779e168 SHA1 614ae2fcae7b747a445be5fbb27fd07f72437d3f SHA256 bb8454aec6f12524e3ec92d5e544c2c4e1f4bf8066ab79011207829c6c553d73
-EBUILD qemu-kvm-9999.ebuild 6605 RMD160 82c56f5113e675c89f2d117c086058dec206d1fc SHA1 d30ba7fcb8cd641a49082c3469e97d5f17684d6d SHA256 779226fdca31751b8f9d484dd20170deb0d30e81cf62b6c7446c9d52df10b2b5
-MISC ChangeLog 2416 RMD160 599ef0f49520666fb0b20d373e1aa61727e98f29 SHA1 071e5a9be5dfbdd6debb0ec63c5532a2378735db SHA256 283f5decf76c3ee18442c50d3c153c13c09d541c0fc72e54b50ec0e8c18e5282
+EBUILD qemu-kvm-9999.ebuild 6609 RMD160 ae87229ae1c962704b2a863bc68a2a2d1aca64cf SHA1 e48275f4b704f412cee90ce175320c17e9e980bb SHA256 7dea263c2140309338faa1d431d9557b5e20cb2ca4de5a96af47916919a05b90
+MISC ChangeLog 2611 RMD160 f0092b4c62eb747fdf59ecb8839af56b0dd2da8d SHA1 ba7b863098c5e8505aeeb52192c616fe292b95b1 SHA256 aefa5541ecd3f333d0fcf731c9c6880804db0a13b59b47a1bb57a4887cc27ed1
 MISC metadata.xml 875 RMD160 b6e13e707e44cca041e3b7aee9d72549fa7213dd SHA1 8c93960e7dcaa70f1f55e232da369198cc3a0884 SHA256 c3722e9d38f5be2b2a107d8355dd3e16d86e127376edee9b8154716c28dd1592
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild
index b219fb2d3256..d1e699640a2c 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1.1.ebuild,v 1.4 2009/12/30 02:17:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild,v 1.5 2009/12/31 16:29:24 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
diff --git a/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild
new file mode 100644
index 000000000000..62f86eba81e3
--- /dev/null
+++ b/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2009 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.1.2.ebuild,v 1.1 2009/12/31 16:29:24 jmbsvicetto Exp $
+
+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"
+	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 sasl +sdl 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 )
+	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_war() {
+	eerror "Please enable KVM support in your kernel, found at:"
+	eerror
+	eerror "  Virtualization"
+	eerror "    Kernel-based Virtual Machine (KVM) support"
+	eerror
+}
+
+pkg_setup() {
+	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"
+		die "qemu-kvm version not compatible"
+	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() {
+	# avoid fdt till an updated release appears
+	sed -i -e 's:fdt="yes":fdt="no":' configure || die
+	# 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"
+}
+
+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
+
+	#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-getCC) \
+		|| 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
+
+	insinto /etc/qemu/
+	insopts -m0755
+	doins kvm/scripts/qemu-ifup || die
+
+	dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
+	newdoc pc-bios/README README.pc-bios || die
+	dohtml qemu-doc.html qemu-tech.html || die
+
+	dobin "${FILESDIR}"/qemu-kvm
+	dosym /usr/bin/qemu-kvm /usr/bin/kvm
+}
+
+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
+}
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 30b01cc2318f..3ad47fa9fa9b 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.1 2009/12/30 02:17:53 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.2 2009/12/31 16:29:24 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi