Minor ebuild fixups, particularly move MODULE_NAMES setting into pkg_setup.

The kqemu-sysfs patch is not compatible with 2.6.13-rc1+ because the new
interfaces are GPL-only, so refrain from applying the patch on those
versions; http://lkml.org/lkml/2005/7/4/5
Package-Manager: portage-2.0.51.20-r5

3 files changed, 42 insertions, 44 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 54863b935726..0419a88a7f2b 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2005/08/06 15:41:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.6 2005/08/19 21:37:02 agriffis Exp $
+
+  19 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  qemu-softmmu-0.7.1-r1.ebuild:
+  Minor ebuild fixups, particularly move MODULE_NAMES setting into pkg_setup.
+  The kqemu-sysfs patch is not compatible with 2.6.13-rc1+ because the new
+  interfaces are GPL-only, so refrain from applying the patch on those
+  versions; http://lkml.org/lkml/2005/7/4/5
 
 *qemu-softmmu-0.7.1-r1 (06 Aug 2005)
 
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index e4a56200893b..b171fcef461e 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b0312772393b62576701f0a0e714cc9e ChangeLog 1048
-MD5 f2e48bae97dad4e6e6bccdb212124ae0 files/digest-qemu-softmmu-0.7.0-r1 127
+MD5 71427aafd803ca5b894962efee04123d qemu-softmmu-0.7.1-r1.ebuild 4035
+MD5 159c47c6f540254c4f4318ed833ad4cb qemu-softmmu-0.7.1.ebuild 3992
+MD5 754955c38d3fe7db22e4bb6842c93c05 qemu-softmmu-0.7.0-r1.ebuild 3956
+MD5 2a8e225909a3327d5814db17177b9d8a ChangeLog 1400
+MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 MD5 fd7335121f3422f52ac0dfe371ffb6b8 files/digest-qemu-softmmu-0.7.1 125
-MD5 72280464fdfd2d1cfe66d86515efdd4d files/digest-qemu-softmmu-0.7.1-r1 127
+MD5 3202f7445799cce82ccaac9749e1443d files/qemu-softmmu-0.7.0-errno.patch 487
 MD5 1d5ef12a594467dced5bfce6c07ed893 files/kqemu-0.7.1-sysfs.patch 1631
+MD5 f2e48bae97dad4e6e6bccdb212124ae0 files/digest-qemu-softmmu-0.7.0-r1 127
+MD5 72280464fdfd2d1cfe66d86515efdd4d files/digest-qemu-softmmu-0.7.1-r1 127
 MD5 87ec2e1fa832612fb834d7dd49cf7e5c files/kqemu-sysfs.patch 2094
-MD5 3202f7445799cce82ccaac9749e1443d files/qemu-softmmu-0.7.0-errno.patch 487
-MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
-MD5 754955c38d3fe7db22e4bb6842c93c05 qemu-softmmu-0.7.0-r1.ebuild 3956
-MD5 b436cfe5986d3b25e7d87df04748e49f qemu-softmmu-0.7.1-r1.ebuild 4062
-MD5 159c47c6f540254c4f4318ed833ad4cb qemu-softmmu-0.7.1.ebuild 3992
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC9Ot5I1lqEGTUzyQRAlhuAJwM/xWZRRiUapWxxb3cxs4uMjnPqQCdEc90
-NqxkGydlMNcH+oQUCWAVbCE=
-=tcpN
------END PGP SIGNATURE-----
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
index 928cd9a94b2a..fd63a4d64868 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2005/08/06 16:54:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.7.1-r1.ebuild,v 1.3 2005/08/19 21:37:02 agriffis 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 )"
+SRC_URI="${HOMEPAGE}${P/-softmmu}.tar.gz
+	kqemu? ( ${HOMEPAGE}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 )
 
@@ -25,12 +25,6 @@ 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
@@ -40,24 +34,35 @@ 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
+
+	MODULE_NAMES="$(useq kqemu && echo "kqemu(misc:${S}/kqemu)")"
+	#	$(useq qvm86 && echo "qvm86(misc:${S}/qvm86)")"
+	#( use kqemu || use qvm86 ) && linux-mod_pkg_setup
 	use kqemu && linux-mod_pkg_setup
+
+	if use kqemu ; then
+		einfo "QEMU Accelerator enabled (USE=kqemu)"
+		einfo "kqemu is binary module with a restricted license."
+		einfo "Please read carefully the KQEMU license"
+		einfo "and ${HOMEPAGE}qemu-accel.html"
+		einfo "if you would like to see it released under the GPL"
+	fi
 }
 
 #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
+	if use kqemu; then
+		mv ${WORKDIR}/kqemu ${S}
+		cd ${S}/kqemu
+		sed -i -e 's:#ifndef PAGE_KERNEL_EXEC:#if 1:' ${S}/kqemu/kqemu-linux.c
+		# The class_simple interfaces were removed in 2.6.13-rc1, leaving only
+		# GPL symbols behind, which this module can't use.  Until there's a fix
+		# from Fabrice, kqemu+udev no worky.
+		if kernel_is le 2 6 12; then
+			epatch ${FILESDIR}/kqemu-${PV}-sysfs.patch
+		fi
 	fi
 	#	if use qvm86; then
 #		mv ${WORKDIR}/qvm86 ${S}
@@ -134,12 +139,8 @@ 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 "Make sure you have the kernel module loaded before running qemu"
 		einfo "and your user is in the qemu group"
 	fi
 }