Minor fix

Package-Manager: portage-2.0.51.22-r2

4 files changed, 160 insertions, 5 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index ca5bccf832bf..54863b935726 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.4 2005/07/26 13:51:13 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.5 2005/08/06 15:41:04 lu_zero Exp $
+
+*qemu-softmmu-0.7.1-r1 (06 Aug 2005)
+
+  06 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +qemu-softmmu-0.7.1-r1.ebuild:
+  Fix bug #101524
 
   26 Jul 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/kqemu-0.7.1-sysfs.patch, qemu-softmmu-0.7.1.ebuild:
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index 8803a5b8a2fe..ffe19107841c 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,9 +1,11 @@
-MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 159c47c6f540254c4f4318ed833ad4cb qemu-softmmu-0.7.1.ebuild 3992
+MD5 b0312772393b62576701f0a0e714cc9e ChangeLog 1048
+MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 754955c38d3fe7db22e4bb6842c93c05 qemu-softmmu-0.7.0-r1.ebuild 3956
-MD5 153048c85f2a8790fc470cfbe9cf0ad2 ChangeLog 909
-MD5 f2e48bae97dad4e6e6bccdb212124ae0 files/digest-qemu-softmmu-0.7.0-r1 127
+MD5 9cb566f6e693f0159460155c425bf32f qemu-softmmu-0.7.1-r1.ebuild 4063
+MD5 72280464fdfd2d1cfe66d86515efdd4d files/digest-qemu-softmmu-0.7.1-r1 127
 MD5 fd7335121f3422f52ac0dfe371ffb6b8 files/digest-qemu-softmmu-0.7.1 125
-MD5 87ec2e1fa832612fb834d7dd49cf7e5c files/kqemu-sysfs.patch 2094
 MD5 1d5ef12a594467dced5bfce6c07ed893 files/kqemu-0.7.1-sysfs.patch 1631
+MD5 f2e48bae97dad4e6e6bccdb212124ae0 files/digest-qemu-softmmu-0.7.0-r1 127
+MD5 87ec2e1fa832612fb834d7dd49cf7e5c files/kqemu-sysfs.patch 2094
 MD5 3202f7445799cce82ccaac9749e1443d files/qemu-softmmu-0.7.0-errno.patch 487
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.7.1-r1 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.7.1-r1
new file mode 100644
index 000000000000..3b6cb53eafcc
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.7.1-r1
@@ -0,0 +1,2 @@
+MD5 b0c80d2c082049a5b8ccbc7f55fe165b qemu-0.7.1.tar.gz 1338521
+MD5 012498dac620eb8c212bf5f622414dd0 kqemu-0.7.1-1.tar.gz 76427
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..4c55e8426294
--- /dev/null
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild,v 1.1 2005/08/06 15:41:04 lu_zero Exp $
+
+inherit eutils flag-o-matic linux-mod toolchain-funcs
+
+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/-softmmu}.tar.gz
+	kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-${PV}-1.tar.gz )"
+#qvm86? ( http://dev.gentoo.org/~lu_zero/distfiles/qvm86-20050409.tar.bz2 )"
+#kqemu? ( http://fabrice.bellard.free.fr/qemu/kqemu-${PV%.*}-1.tar.gz )
+
+LICENSE="GPL-2 LGPL-2.1 KQEMU"
+SLOT="0"
+KEYWORDS="~x86 ~ppc -alpha -sparc ~amd64"
+IUSE="sdl kqemu"  #qvm86 debug nptl qemu-fast nptlonly"
+RESTRICT="nostrip"
+
+DEPEND="virtual/libc
+	sdl? ( media-libs/libsdl )
+	!<=app-emulation/qemu-0.7.0
+	app-text/texi2html"
+RDEPEND="sdl? ( media-libs/libsdl )"
+
+S="${WORKDIR}/${P/-softmmu}"
+
+MODULE_NAMES=""
+use kqemu && MODULE_NAMES=$MODULE_NAMES" kqemu(misc:${S}/kqemu)"
+#use qvm86 && MODULE_NAMES=$MODULE_NAMES" qvm86(misc:${S}/qvm86)"
+
+
+
+set_target_list() {
+	TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu"
+	export TARGET_LIST
+}
+
+pkg_setup() {
+	if [ "$(gcc-major-version)" == "4" ]; then
+		ewarn "Qemu could not build with GCC 4"
+	fi
+#	( use kqemu || use qvm86 ) && linux-mod_pkg_setup
+	use kqemu && linux-mod_pkg_setup
+}
+
+#RUNTIME_PATH="/emul/gnemul/"
+src_unpack() {
+	unpack ${A}
+
+	if use kqemu ; then
+	einfo "QEMU Accelerator enabled"
+	einfo "kqemu actually is a closed source software"
+	einfo "Please read carefully the KQEMU license"
+	einfo "and http://fabrice.bellard.free.fr/qemu/qemu-accel.html"
+	einfo "if you want it released under GPL"
+	mv ${S}/../kqemu ${S}
+	cd ${S}/kqemu
+	epatch ${FILESDIR}/kqemu-${PV}-sysfs.patch
+	sed -i -e "s:#ifndef PAGE_KERNEL_EXEC:#if 1:" ${S}/kqemu/kqemu-linux.c
+	fi
+	#	if use qvm86; then
+#		mv ${WORKDIR}/qvm86 ${S}
+#		cd ${S}
+#		epatch qvm86/patch.qvm86
+#	fi
+	cd ${S}
+	#Fix errno mismatch on glibc-2.3.5
+
+	# 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
+	# Ensure mprotect restrictions are relaxed for emulator binaries
+	[[ -x /sbin/paxctl ]] && \
+		sed -i 's/^VL_LDFLAGS=$/VL_LDFLAGS=-Wl,-z,execheap/' \
+			Makefile.target
+	# Prevent install of kernel module by qemu's makefile
+	sed -i 's/\(.\/install.sh\)/#\1/' Makefile
+}
+
+src_compile() {
+	#Let the application set its cflags
+	unset CFLAGS
+
+	# Switch off hardened tech
+	filter-flags -fpie -fstack-protector
+
+	myconf=""
+	if ! use sdl ; then 
+		myconf="$myconf --disable-gfx-check" 
+	fi
+	set_target_list
+#		--interp-prefix=${RUNTIME_PATH}/qemu-%M
+	./configure \
+		--prefix=/usr \
+		--target-list="${TARGET_LIST}" \
+		--enable-slirp \
+		--kernel-path=${KV_DIR} \
+		$(use_enable kqemu) \
+		${myconf} \
+		$(use_enable sdl)\
+		|| die "could not configure"
+
+	emake || 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/*/*
+
+	if use kqemu ; then
+
+		linux-mod_src_install
+
+		# udev rule
+		dodir /etc/udev/rules.d/
+		echo 'KERNEL="kqemu*",           NAME="%k", GROUP="qemu", MODE="0660"' \
+			> ${D}/etc/udev/rules.d/48-qemu.rules
+		enewgroup qemu
+
+		# Module doc
+		dodoc ${S}/kqemu/README
+
+	fi
+}
+
+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."
+	if use kqemu ; then
+		einfo "kqemu actually is a closed source software"
+		einfo "Please read carefully the KQEMU license"
+		einfo "and http://fabrice.bellard.free.fr/qemu/qemu-accel.html"
+		einfo "if you want it released under GPL"
+		linux-mod_pkg_postinst
+		einfo "make sure you have the kernel module loaded before running qemu"
+		einfo "and your user is in the qemu group"
+	fi
+}