add alsa, adlib and tc-getCC support, fix kqemu deps, see bug #116599, bug #132602, bug #141721

Package-Manager: portage-2.1.1_pre5-r1

6 files changed, 154 insertions, 20 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 77f48251160f..b199edb04e42 100644
--- a/app-emulation/qemu-softmmu/ChangeLog
+++ b/app-emulation/qemu-softmmu/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/qemu-softmmu
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.23 2006/08/01 19:09:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.24 2006/08/17 07:37:25 lu_zero Exp $
+
+*qemu-softmmu-0.8.2-r1 (17 Aug 2006)
+
+  17 Aug 2006;  Luca Barbato <lu_zero@gentoo.org>
+  qemu-softmmu-0.8.2-r1.ebuild, files/digest-qemu-softmmu-0.8.2-r1:
+  Added alsa support as requested in bug #116599 by Ivan Yosifov <ivan@yosifov.net>
+  and adlib support as requested by Jan Simons <gentoo@onkos.de> on the same bug;
+  use tc-getCC, patch from Damien THEBAULT <damien.thebault@laposte.net> in
+  bug #132602, set correct kqemu deps, should solve bug #141721
 
   01 Aug 2006; Luca Barbato <lu_zero@gentoo.org> qemu-softmmu-0.8.2.ebuild:
   False hope, gcc-3 is still required.
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index 6ca2d570ed0c..d6e4faffbded 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -11,6 +11,7 @@ MD5 b3e7fd1797acd3ca68ffa4a31750d518 files/qemu-0.8.2-sparc-fp.patch 591
 RMD160 bbce6e754d32e8e5cb4c28e534b7a8ae27bee4b7 files/qemu-0.8.2-sparc-fp.patch 591
 SHA256 839166847b3b39fa481b49e27110aaf207067cc5acecaf55131d2ec31d92ad59 files/qemu-0.8.2-sparc-fp.patch 591
 DIST kqemu-0.7.2.tar.gz 79314 RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 SHA1 39dda2566a9c47bfc5e76c76cf9aa41500d708f3 SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b
+DIST kqemu-1.3.0pre7.tar.gz 189920 RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 SHA1 8d853bac016a1c78d7da22dea4b9a1619a1dadf3 SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead
 DIST qemu-0.8.0.20060329.tar.bz2 1325034 RMD160 a6ec15e1b08dd6e2dd88d953bfa31e3db1dc212e SHA256 4ccb27692ffaee119728442298da84198d6319de79a18d497d14604e140c3eb0
 DIST qemu-0.8.0.tar.gz 1497965 RMD160 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7 SHA256 de388539ce86971a2cbe8474fca8b6160898c95772e3e6e08a7794d48db32a61
 DIST qemu-0.8.1.tar.gz 1623264 RMD160 04d163d4792bbea39fc0b1e52af124cdb7e907dc SHA1 72c943c24bed6aa066dcc3012b198c20f04aef30 SHA256 a1f83666f5c05eaee9bfc608a3a5034ad95d0fd3c99937bb399bf9235a6aa0c9
@@ -31,14 +32,18 @@ EBUILD qemu-softmmu-0.8.1.ebuild 2657 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a
 MD5 2121a62301cd1069aed299801a6cd0e4 qemu-softmmu-0.8.1.ebuild 2657
 RMD160 8cc0ecdd505369b7e83fd258d3ff7b0ec6a5ee10 qemu-softmmu-0.8.1.ebuild 2657
 SHA256 ea3f39de2f13c8dc376299513b0231414fd3da6bd4cd01d4792329efb63420ad qemu-softmmu-0.8.1.ebuild 2657
-EBUILD qemu-softmmu-0.8.2.ebuild 2799 RMD160 c25fec2f2de6b9e551bc9bbf9a99599b70d30ce6 SHA1 2f394dc9ef02bc16c86dc2745ce23b52b72d7b4e SHA256 d8b8ec68a9dd27eb57ee414e67a0fda2747385fd2ae009822fe6f7bc5df15c91
-MD5 e4dc7221fbef9c234e4a49a849d03218 qemu-softmmu-0.8.2.ebuild 2799
-RMD160 c25fec2f2de6b9e551bc9bbf9a99599b70d30ce6 qemu-softmmu-0.8.2.ebuild 2799
-SHA256 d8b8ec68a9dd27eb57ee414e67a0fda2747385fd2ae009822fe6f7bc5df15c91 qemu-softmmu-0.8.2.ebuild 2799
-MISC ChangeLog 4279 RMD160 bfda1e51961fc847f9913a76394c7fac3c5f3b6a SHA1 1d8299a10c2a88538c24826d1fa328a5917a4084 SHA256 9e03f29b6845e135c5915c2fc57d556a806bbbaced419d17c1c6467214432abb
-MD5 13ae96c7d6da032a4ddfcd938a4fe60e ChangeLog 4279
-RMD160 bfda1e51961fc847f9913a76394c7fac3c5f3b6a ChangeLog 4279
-SHA256 9e03f29b6845e135c5915c2fc57d556a806bbbaced419d17c1c6467214432abb ChangeLog 4279
+EBUILD qemu-softmmu-0.8.2-r1.ebuild 2898 RMD160 88c67878d2f41ab7267b1189e4a5e3ce4541fed1 SHA1 7480ff8886810c5d241baf969ecbdf90b05b6701 SHA256 df54cebb6867988db832bf0699caa1e8721b92ba4ba7fe4255cb9425d9dd88ef
+MD5 c64dc9dc52195cebaedd43df410b9652 qemu-softmmu-0.8.2-r1.ebuild 2898
+RMD160 88c67878d2f41ab7267b1189e4a5e3ce4541fed1 qemu-softmmu-0.8.2-r1.ebuild 2898
+SHA256 df54cebb6867988db832bf0699caa1e8721b92ba4ba7fe4255cb9425d9dd88ef qemu-softmmu-0.8.2-r1.ebuild 2898
+EBUILD qemu-softmmu-0.8.2.ebuild 2840 RMD160 2e9eb1568f09b7ade9bdcd88f2720f4e6ec4136c SHA1 aadb6b0d96680a9f1ac7f8f059ae65e122342cea SHA256 5b967476c478a4059c9ca220038e431af06f55f911f4bb253589a22fb0ee5af9
+MD5 cd22ceec657ab57f2230c565c4e5a904 qemu-softmmu-0.8.2.ebuild 2840
+RMD160 2e9eb1568f09b7ade9bdcd88f2720f4e6ec4136c qemu-softmmu-0.8.2.ebuild 2840
+SHA256 5b967476c478a4059c9ca220038e431af06f55f911f4bb253589a22fb0ee5af9 qemu-softmmu-0.8.2.ebuild 2840
+MISC ChangeLog 4742 RMD160 f34ff4c62f699b12bcd664a8fa011549240c2263 SHA1 7c89f044f349ee2ade8f0197f9a034f3baa83871 SHA256 b4826b0927da0a5347289252ef39eefd6ef7261ca70781bcbe7a3e93b82e6539
+MD5 556b1a89a9f0913cc93af4fb0d5caf82 ChangeLog 4742
+RMD160 f34ff4c62f699b12bcd664a8fa011549240c2263 ChangeLog 4742
+SHA256 b4826b0927da0a5347289252ef39eefd6ef7261ca70781bcbe7a3e93b82e6539 ChangeLog 4742
 MISC metadata.xml 223 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 SHA1 fcf66d2b271369d296150dde06603d850623ed27 SHA256 64a96c3c9929aec46b50a63ae1fd8c46cef4a8423f448d6f6fff09e20510c98b
 MD5 898131aae735c3477ff2f9c6882f1178 metadata.xml 223
 RMD160 f054e67dff10c87ea1d0b5753124445be6bd4610 metadata.xml 223
@@ -55,6 +60,9 @@ SHA256 481e1b6318003b8c8ba25549d433906ba919f8fafb261ac46442a4cc60f6ae84 files/di
 MD5 ceaf884835c3e3e52be03e21a6c5d135 files/digest-qemu-softmmu-0.8.1-r1 467
 RMD160 d3095e4fe78dd0357858259ccf9d4868f8acd61b files/digest-qemu-softmmu-0.8.1-r1 467
 SHA256 481e1b6318003b8c8ba25549d433906ba919f8fafb261ac46442a4cc60f6ae84 files/digest-qemu-softmmu-0.8.1-r1 467
-MD5 129eedd92cb019aff2ad7cb10c54903d files/digest-qemu-softmmu-0.8.2 467
-RMD160 b22455b20483a884a0c119cc495ccffb172d5508 files/digest-qemu-softmmu-0.8.2 467
-SHA256 ef9a971f1f35a4cfe24252db94af88a975db970ea7ff0d7f342887185615fa27 files/digest-qemu-softmmu-0.8.2 467
+MD5 c353639d1739a23ad62723df63775a62 files/digest-qemu-softmmu-0.8.2 482
+RMD160 c3792751dd488d6e4ec5ef39a0a458bde1b7ea78 files/digest-qemu-softmmu-0.8.2 482
+SHA256 e1efc0b6697ed63d0bbbfa2ba277bd98b88d03cc885f6609f01175b39b02a04e files/digest-qemu-softmmu-0.8.2 482
+MD5 c353639d1739a23ad62723df63775a62 files/digest-qemu-softmmu-0.8.2-r1 482
+RMD160 c3792751dd488d6e4ec5ef39a0a458bde1b7ea78 files/digest-qemu-softmmu-0.8.2-r1 482
+SHA256 e1efc0b6697ed63d0bbbfa2ba277bd98b88d03cc885f6609f01175b39b02a04e files/digest-qemu-softmmu-0.8.2-r1 482
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
index e882cdf637e4..f4e0a49eb203 100644
--- a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2
@@ -1,6 +1,6 @@
-MD5 02cfdecda90458d6393781496ec6b48b kqemu-0.7.2.tar.gz 79314
-RMD160 cdb154d51eb616d6ad9924da0175276a655edba7 kqemu-0.7.2.tar.gz 79314
-SHA256 4158b2c67603f5256a78d0065d715bde068a457aa58bbfef12dda20fe7f7ad8b kqemu-0.7.2.tar.gz 79314
+MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920
+RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920
+SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920
 MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909
 RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909
 SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909
diff --git a/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1 b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1
new file mode 100644
index 000000000000..f4e0a49eb203
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/digest-qemu-softmmu-0.8.2-r1
@@ -0,0 +1,6 @@
+MD5 3b77edbada790f924456aa4675edd0be kqemu-1.3.0pre7.tar.gz 189920
+RMD160 9f8e5dd7e1a901d939fc5e8b3be1a10e396f9ab3 kqemu-1.3.0pre7.tar.gz 189920
+SHA256 cf29505b3d07d5e31080aa677a4254f5770f273e9bd05ef2df956b87d248cead kqemu-1.3.0pre7.tar.gz 189920
+MD5 5b3a89eb2f256a8a6f3bb07f7b3f1b07 qemu-0.8.2.tar.gz 1810909
+RMD160 715c24997330352aa675cd7279731cec251f833a qemu-0.8.2.tar.gz 1810909
+SHA256 2a20d811296c859d678bdd002222aa7ca7951a641327234f3af144e822d078f3 qemu-0.8.2.tar.gz 1810909
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..b22542d17505
--- /dev/null
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2006 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.8.2-r1.ebuild,v 1.1 2006/08/17 07:37:25 lu_zero Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
+HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
+SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz
+	kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 KQEMU"
+SLOT="0"
+KEYWORDS="-alpha ~amd64 ~ppc -sparc ~x86"
+IUSE="sdl kqemu alsa"  #qvm86 debug nptl qemu-fast nptlonly"
+RESTRICT="nostrip test"
+
+DEPEND="virtual/libc
+	sdl? ( media-libs/libsdl )
+	alsa? ( media-libs/alsa-lib )
+	!<=app-emulation/qemu-0.7.0
+	kqemu? ( >=app-emulation/kqemu-1.3.0_pre7 )
+	app-text/texi2html"
+RDEPEND="sdl? ( media-libs/libsdl )"
+
+S="${WORKDIR}/${P/-softmmu/}"
+
+set_target_list() {
+	TARGET_LIST="i386-softmmu ppc-softmmu sparc-softmmu x86_64-softmmu arm-softmmu mips-softmmu"
+	export TARGET_LIST
+}
+
+pkg_setup() {
+	if [ "$(gcc-major-version)" == "4" ]; then
+	eerror "qemu requires gcc-3 in order to build and work correctly"
+	eerror "please compile it with gcc-3"
+	die "gcc 4 cannot build qemu"
+	fi
+}
+
+#RUNTIME_PATH="/emul/gnemul/"
+src_unpack() {
+	unpack ${A}
+	if use kqemu; then
+		mv ${WORKDIR}/kqemu ${S}
+		cd ${S}/kqemu
+		#Let the configure find kqemu but NOT build it
+		sed -i -e 's:$(MAKE) -C kqemu*::' ${S}/Makefile
+	fi
+
+	cd ${S}
+	epatch "${FILESDIR}/qemu-${PV}-sparc-fp.patch"
+	# 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
+
+	set_target_list
+
+	myconf="--disable-gcc-check"
+	if ! use sdl ; then
+		myconf="$myconf --disable-gfx-check"
+	fi
+	./configure \
+		--prefix=/usr \
+		--target-list="${TARGET_LIST}" \
+		--enable-slirp --enable-adlib \
+		--cc=$(tc-getCC) \
+		--host-cc=$(tc-getCC) \
+		--kernel-path=${KV_DIR} \
+		$(use_enable sdl)\
+		$(use_enable kqemu) \
+		$(use_enable alsa) \
+		${myconf} \
+		|| 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/*/*
+}
+
+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."
+}
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
index e6e07cc74ab2..9a27a9d7f70b 100644
--- a/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 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.8.2.ebuild,v 1.2 2006/08/01 19:09:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/qemu-softmmu-0.8.2.ebuild,v 1.3 2006/08/17 07:37:25 lu_zero Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Multi-platform & multi-targets cpu emulator and dynamic translator"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemu/"
 SRC_URI="${HOMEPAGE}${P/-softmmu/}.tar.gz
-	kqemu? ( ${HOMEPAGE}kqemu-0.7.2.tar.gz )"
+	kqemu? ( ${HOMEPAGE}kqemu-1.3.0pre7.tar.gz )"
 
 LICENSE="GPL-2 LGPL-2.1 KQEMU"
 SLOT="0"
@@ -17,6 +17,7 @@ RESTRICT="nostrip test"
 
 DEPEND="virtual/libc
 	sdl? ( media-libs/libsdl )
+	alsa? ( media-libs/alsa-lib )
 	!<=app-emulation/qemu-0.7.0
 	kqemu? ( app-emulation/kqemu )
 	app-text/texi2html"
@@ -67,20 +68,23 @@ src_compile() {
 	# Switch off hardened tech
 	filter-flags -fpie -fstack-protector
 
+	set_target_list
+
 	myconf="--disable-gcc-check"
 	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 \
+		--cc=$(tc-getCC) \
+		--host-cc=$(tc-getCC) \
 		--kernel-path=${KV_DIR} \
+		$(use_enable sdl)\
 		$(use_enable kqemu) \
 		${myconf} \
-		$(use_enable sdl)\
 		|| die "could not configure"
 
 	emake || die "make failed"