New version

4 files changed, 87 insertions, 2 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index 08e0f5c82cf5..dd3e1ebe6e48 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.19 2004/11/02 09:08:33 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.20 2004/11/15 13:46:25 lu_zero Exp $
+
+*qemu-0.6.1 (15 Nov 2004)
+
+  15 Nov 2004; Luca Barbato <lu_zero@gentoo.org> +qemu-0.6.1.ebuild:
+  New version, filtering qemu-fast on nptl
 
   02 Nov 2004; Luca Barbato <lu_zero@gentoo.org> qemu-0.6.0.ebuild:
   Minor fix
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 4285311acec3..9bc5325872c5 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,10 +1,11 @@
 MD5 8d1dab5f6756b572fc3b292585d6cc16 qemu-0.6.0.ebuild 1892
 MD5 db6c35fa4ad6e21c959cab27a63e0e84 qemu-0.5.3.ebuild 1129
-MD5 efed19dd36a4eddf4033026a7cd7a074 ChangeLog 2419
+MD5 958616b71cf6bd04578d069322f0d3e9 ChangeLog 2559
 MD5 be42bb328ff24160549960a145f53d42 qemu-0.5.5-r1.ebuild 1515
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 4cb86c404627f57c95e561741dda268f qemu-0.5.5.ebuild 1475
 MD5 b320f3f8c9b4c5695af93a4b8a65ed2e qemu-0.5.4.ebuild 1233
+MD5 7bf4ba70b5da261dae88de1d8c08eb75 qemu-0.6.1.ebuild 2067
 MD5 4b86f5b59feacd176698e9ecb59e7040 qemu-0.5.1.ebuild 1257
 MD5 18dca85a7af16809c4aa1c7c0053e611 qemu-0.5.2.ebuild 1257
 MD5 0b85ac42eaa41830ac9b4eccf4a118bd files/qemu-0.6.0-sigaction.patch 677
@@ -19,3 +20,4 @@ MD5 ed6b8235e3ff239ab99ca1d1a27bb3a3 files/digest-qemu-0.5.5-r1 62
 MD5 db8dd5ec671adf9b083ee0ab605a10b7 files/digest-qemu-0.5.4 62
 MD5 786f98412b9ce8febf208cf9be8e38f6 files/digest-qemu-0.5.2 62
 MD5 ac8cdb7d17555b028d8bd7ace90bee3d files/qemu-0.6.0-configure.patch 270
+MD5 1f8638d68cffbd8b96df97dcb0868b88 files/digest-qemu-0.6.1 63
diff --git a/app-emulation/qemu/files/digest-qemu-0.6.1 b/app-emulation/qemu/files/digest-qemu-0.6.1
new file mode 100644
index 000000000000..1d4f4df7564a
--- /dev/null
+++ b/app-emulation/qemu/files/digest-qemu-0.6.1
@@ -0,0 +1 @@
+MD5 f1b5e103321832d2786dd4110f6c8ae4 qemu-0.6.1.tar.gz 1010121
diff --git a/app-emulation/qemu/qemu-0.6.1.ebuild b/app-emulation/qemu/qemu-0.6.1.ebuild
new file mode 100644
index 000000000000..162c103301d5
--- /dev/null
+++ b/app-emulation/qemu/qemu-0.6.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.6.1.ebuild,v 1.1 2004/11/15 13:46:25 lu_zero Exp $
+
+inherit eutils
+
+DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
+HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
+SRC_URI="http://fabrice.bellard.free.fr/qemu/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ppc -alpha -sparc"
+IUSE="softmmu qemu-fast sdl nptl nptlonly"
+RESTRICT="nostrip"
+
+DEPEND="virtual/libc
+	sdl? ( media-libs/libsdl )"
+RDEPEND=""
+
+set_target_list() {
+	TARGET_LIST="arm-user i386-user ppc-user sparc-user" #i386-softmmu ppc-softmmu
+	use softmmu && TARGET_LIST="${TARGET_LIST} i386-softmmu ppc-softmmu"
+	use qemu-fast && \
+		if [ "`use nptl`" ] # -a "`use nptlonly `" ]
+		then
+			ewarn "qemu-fast won't build with nptl, useflag disabled"
+		else
+			use sdl && \
+			(
+				ewarn "qemu-fast enabled beware you need every library that"
+				ewarn "qemu would link compiled static you may need to emerge"
+				ewarn "again alsa-lib and nas"
+			)
+			TARGET_LIST="${TARGET_LIST} i386"
+		fi
+	export TARGET_LIST
+}
+
+#RUNTIME_PATH="/emul/gnemul/"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
+src_compile() {
+	set_target_list
+#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
+	./configure \
+		--prefix=/usr \
+		--target-list="${TARGET_LIST}" \
+		--enable-slirp \
+		`use_enable sdl`\
+		|| die "could not configure"
+	make || die "make failed"
+}
+
+src_install() {
+	make install \
+		prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		datadir=${D}/usr/share/qemu \
+		docdir=${D}/usr/share/doc/${P} \
+		mandir=${D}/usr/share/man || die
+	chmod -x ${D}/usr/share/man/*/*
+}
+
+pkg_postinst() {
+	einfo "You will need the Universal TUN/TAP driver compiled into"
+	einfo "kernel or as a module to use the virtual network device."
+	use softmmu || \
+	(
+	ewarn "You have the softmmu useflag disabled."
+	ewarn "In order to have the full system emulator (qemu) you have"
+	ewarn "to emerge qemu again with the softmmu useflag enabled"
+	)
+}