New version

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

3 files changed, 157 insertions, 12 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 4a2ce198731e..b6c60769967a 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.64 2009/05/17 21:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.65 2009/05/19 07:27:03 lu_zero Exp $
+
+*qemu-0.10.4 (19 May 2009)
+
+  19 May 2009; Luca Barbato <lu_zero@gentoo.org> +qemu-0.10.4.ebuild:
+  New version
 
   17 May 2009; Diego E. Pettenò <flameeyes@gentoo.org> qemu-0.10.3.ebuild,
   +files/qemu-ifdown, +files/qemu-ifup:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 31de5a0af7cf..5e02067f174c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qemu-0.10.3-nopl-fix.patch 1118 RMD160 849e4b88ca7985dc3faae0a225181205043f0265 SHA1 70cf0727a7cbdd79243ae6768f34c07c6e9c5aec SHA256 24656137f1f38aed2c2661ebd20d9a6d86eaf9768c3e239b971f01418b396028
 AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
 AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 DIST qemu-0.10.3.tar.gz 3661566 RMD160 785262c98fd07431068627284eee400bb962b7ef SHA1 272dbb61ddfdb717982d39472bda1b5fd0b81e9f SHA256 89540d7a8c880a6ae33f8a55d55d580f3f03c10b02e32b7323719b3354f7b077
+DIST qemu-0.10.4.tar.gz 3749481 RMD160 13e1a55dc9031a4a003d2694169ff3ec0681d504 SHA1 6ab5012aacea97e79ab3833d41f1067a8b270017 SHA256 bc370b4096fd516142cc5d8cbbae599cde8ef3f2bec33b21c95c2c5e3e3f3e5e
 EBUILD qemu-0.10.0.ebuild 523 RMD160 3ed38003b3d0f40e4ef5c878b6e179d82e8c7dc3 SHA1 feb4b6f73ad34b5e944bc322313a8e8366f52e63 SHA256 a8fd334edf8d63615a7e556a9d2acd12b91437c00287b2a887515f3d7a563056
 EBUILD qemu-0.10.1.ebuild 523 RMD160 f0bcfa00d5c1d8bb746f77e9e9d8f4a91862f632 SHA1 58e0e0cd1f90ab699fcc3f6f4f280c6515bd6397 SHA256 cb86803cd8fa2985373717c209b4f8bddd5f0ca3de32f3ecce84883468c8a946
 EBUILD qemu-0.10.3.ebuild 4703 RMD160 e852ff28e625bc8f768a188ae71d66dbb23979f0 SHA1 ed61fd6b4a21c8854f4a65e54757c1ed59787521 SHA256 833daa66b0f562fb6649c968ab1447d6b287330175ed7777610297061a71d494
+EBUILD qemu-0.10.4.ebuild 4701 RMD160 b4a4e424a86136d10267944f2e809ed033cad6b9 SHA1 d7424c85d67618c5e1fd43cc4d21985c4339c7fd SHA256 11e78e562efe0ab51f4df5c10ee1a4dd1c845a0179c5528c6a360cd828a99f8b
 EBUILD qemu-0.9.0.ebuild 503 RMD160 e6261c120b646da7f2106984ab8a833da1eaa095 SHA1 c4ec2424d608d4b38f395dbfe8f761ba4fbab835 SHA256 baa5050753763d8c20384f22de5e70748b100c66b8aa8a54107917519d00db4c
 EBUILD qemu-0.9.1.ebuild 515 RMD160 51683f0657c0e4ac6fbfa403fa9b81f027c9a830 SHA1 87031abd8579289862a692d32845b131f4cb3e1b SHA256 cd2b063cf0f40a170abfcbe2593ae1a82e99e3262d321a5bfdf02b5b62eab1e9
-MISC ChangeLog 8351 RMD160 42682d79539810476306f6a29638ce9a9f05bb3d SHA1 f680ec323c149567533d9d0c84a961c2a63c4223 SHA256 51c35ae7bd84baecb040bf900a65bb84372dfaa04234e69d924c0a8de1874d5f
+MISC ChangeLog 8462 RMD160 c5c32d4dfc44e08a1accd9c01bd7cefed50bd7f7 SHA1 4ac152e15f45d5991042ea37c31de11ff9e31f0f SHA256 ce4bef3721aaeed3a6a4c592ef50cdb2908bf12c0f3a09ffd6e8b78db3562290
 MISC metadata.xml 882 RMD160 259583b24a6eec2cbcca323e754f677041d44d54 SHA1 690460cdb502fd47b51eb1d51938d1c7629f7918 SHA256 8584426258959783d4da117036fa1d773b91b8f90d6a3c1ee7d065446e3d91f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoQf6MACgkQAiZjviIA2XhFxgCfft2Xv/b9Ko+lGVYlvkp6BrfO
-1+gAoK0LZSS4tsQrpEA7tcMpCsmYxjzD
-=Ggnu
------END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/qemu-0.10.4.ebuild b/app-emulation/qemu/qemu-0.10.4.ebuild
new file mode 100644
index 000000000000..a6e7f6fa011f
--- /dev/null
+++ b/app-emulation/qemu/qemu-0.10.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.10.4.ebuild,v 1.1 2009/05/19 07:27:03 lu_zero Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs linux-info
+
+DESCRIPTION="QEMU emulator and ABI wrapper"
+HOMEPAGE="http://www.qemu.org"
+SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu kvm"
+
+COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc"
+
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} ppcemb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc64 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
+
+RDEPEND="!app-emulation/qemu-softmmu
+	!app-emulation/qemu-user
+	!<app-emulation/qemu-0.10.3
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	esd? ( media-sound/esound )
+	pulseaudio? ( media-sound/pulseaudio )
+	gnutls? ( net-libs/gnutls )
+	ncurses? ( sys-libs/ncurses )
+	sdl? ( >=media-libs/libsdl-1.2.11 )
+	vde? ( net-misc/vde )
+	kvm? ( >=sys-kernel/linux-headers-2.6.29 )
+	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
+#	fdt? ( sys-apps/dtc )
+
+DEPEND="${RDEPEND}
+		gnutls? ( dev-util/pkgconfig )
+		app-text/texi2html"
+
+src_prepare() {
+	# avoid fdt till an updated release appears
+	sed -i -e 's:fdt="yes":fdt="no":' configure
+	# prevent docs to get automatically installed
+	sed -i '/$(DESTDIR)$(docdir)/d' Makefile
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target tests/Makefile
+	[[ -x /sbin/paxctl ]] && \
+		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
+			Makefile.target
+	# avoid strip
+	sed -i 's/$(INSTALL) -m 755 -s/$(INSTALL) -m 755/' \
+		Makefile Makefile.target */Makefile
+	epatch "${FILESDIR}/${P}-nopl-fix.patch"
+}
+
+src_configure() {
+	local mycc conf_opts audio_opts softmmu_targets user_targets target_list
+
+	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
+
+	conf_opts="--disable-darwin-user --disable-bsd-user"
+
+	if test ! -z "${softmmu_targets}" ; then
+		einfo "Building following softmmu targets: ${softmmu_targets}"
+		use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
+		use ncurses || conf_opts="$conf_opts --disable-curses"
+		use sdl || conf_opts="$conf_opts --disable-gfx-check --disable-sdl"
+		use vde || conf_opts="$conf_opts --disable-vde"
+		use kqemu || conf_opts="$conf_opts --disable-kqemu"
+		use kvm || conf_opts="$conf_opts --disable-kvm"
+
+		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"
+	else
+		einfo "Disabling softmmu emulation (no softmmu targets specified)"
+		conf_opts="$conf_opts --disable-system --disable-vnc-tls \
+		--disable-curses --disable-gfx-check --disable-sdl --disable-vde \
+		--disable-kqemu --disable-kvm"
+	fi
+
+	if test ! -z "${user_targets}" ; then
+		einfo "Building following user targets: ${user_targets}"
+		conf_opts="$conf_opts --enable-linux-user"
+	else
+		einfo "Disabling usermode emulation (no usermode targets specified)"
+		conf_opts="--disable-linux-user"
+	fi
+
+#	use fdt || conf_opts="$conf_opts --disable-fdt"
+
+	conf_opts="$conf_opts --prefix=/usr --disable-bluez"
+
+	target_list="${softmmu_targets} ${user_targets}"
+
+	filter-flags -fpie -fstack-protector
+
+	./configure ${conf_opts} \
+		--audio-drv-list="$audio_opts" \
+		--kerneldir="${KV_DIR}" \
+		--cc=$(tc-getCC) --host-cc=$(tc-getCC) \
+		--target-list="${target_list}" \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	exeinto /etc/qemu
+	doexe \
+		"${FILESDIR}/qemu-ifup" \
+		"${FILESDIR}/qemu-ifdown" \
+		|| die "qemu interface scripts failed"
+
+	dodoc pc-bios/README
+	dodoc qemu-doc.html
+	dodoc qemu-tech.html
+}
+
+pkg_postinst() {
+	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 "qemu-ifup script from /etc/qemu."
+	echo
+}