New version

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

6 files changed, 186 insertions, 16 deletions

diff --git a/app-emulation/qemu-softmmu/ChangeLog b/app-emulation/qemu-softmmu/ChangeLog
index 0146f9a0b4cb..75f9e19498a0 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.55 2008/07/28 19:11:06 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-softmmu/ChangeLog,v 1.56 2009/03/06 22:41:31 lu_zero Exp $
+
+*qemu-softmmu-0.10.0 (06 Mar 2009)
+
+  06 Mar 2009; Luca Barbato <lu_zero@gentoo.org> +files/qemu-ifdown,
+  +files/qemu-ifup, +qemu-softmmu-0.10.0.ebuild:
+  New release
 
   28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-emulation/qemu-softmmu/Manifest b/app-emulation/qemu-softmmu/Manifest
index b15a64eda429..1a847277a869 100644
--- a/app-emulation/qemu-softmmu/Manifest
+++ b/app-emulation/qemu-softmmu/Manifest
@@ -1,25 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX qemu-ifdown 478 RMD160 2187fbf352e6b84686f0cf0e9e9ebe5d26359858 SHA1 1daccb4785fe503687562798f90be1414267e27d SHA256 7d90c39184fd7531d9b8ae787122b68ac768b41afeb0ef2b3baa6461f77af03d
+AUX qemu-ifup 554 RMD160 9769d79ab6456bdd7e3e689005f629e2a67b858d SHA1 dde2b27acabe6fe23ca40f90ff6950bb12a4b506 SHA256 eae9b50680442acc29c65a245a2d26a63756ad4cb894e08cb5ea249686801f1d
 AUX qemu-softmmu-0.9.0-block-qcow2.patch 346 RMD160 d9c11c082fce158e5fbdaceb5e87a327877de58c SHA1 976bd2727f8bdbad999ea2c23112dcbe550bbf4c SHA256 bfea37a8fc718bcee6f31df02c3095094c58d3ace952a7e7789784d6b3471c5a
 AUX qemu-softmmu-0.9.0-ide-cd.patch 1764 RMD160 5d19bd67c74734c4e66f67dc136adb6f08fa418f SHA1 152fd0403c0644c275ac4aee539139ee5bffd262 SHA256 1f0d9d52e3ead71f0f250902993d1a7d3fb9c88be23870f5559a1596c42bdaf5
 AUX qemu-softmmu-0.9.1-CVE-2008-0928.patch 9346 RMD160 79e4dbf7643d7057da4a74350833c907342fba1e SHA1 2ec9c89e6a995db97aa03cdab490fc0e5cef650c SHA256 ca040bdb401e6cdfe4f009e6874d25853103965370b19756724127b0fd4df559
 AUX qemu-softmmu-0.9.1-CVE-2008-2004.patch 2002 RMD160 88f121766426b1b564d829bf6287aa0b99733ca7 SHA1 208701bd008b119f80553ff4dc441de87ddc98aa SHA256 15918d0e46a23d9b7283088489ce08be41a6ec9ced5df0f55ce1f8bcaa50fac3
 AUX qemu-softmmu-0.9.1-block-device-address-range.patch 7904 RMD160 5653db42b048a0f1748b5394b7382fa3f2edc2a8 SHA1 258a10d73348683fbc7659110b0da57e0003cc46 SHA256 39268b7caebe64d11cd538974def842bedccca0894423f1d003574b8f39e9ecf
+DIST qemu-0.10.0.tar.gz 3657649 RMD160 d9175b98d161d2eca0fa61471506e98f3d8f26af SHA1 87b6aa3b201dcdfd91d83c27b2d3e4495770c351 SHA256 3c5ecf320996ad243b7adc4798ad5dbfd58a6d5562cc0317a4cde7c7fb3edbb2
 DIST qemu-0.9.0.tar.gz 1901741 RMD160 4296542b6da18a6ac93d20787330d3c1c2ac0a19 SHA1 1e57e48a06eb8729913d92601000466eecef06cb SHA256 491facf9335654967ee53d8fb3540a274bfcbdcc225506bd38c4ee8e9ab405c1
 DIST qemu-0.9.1.tar.gz 2804104 RMD160 ee7bdb55a4540df2082d4bde9ebfd2f4e6f201a5 SHA1 630ea20b5989f0df00128de7f7be661c573ed041 SHA256 4756d0b4a4dc7dd88354bc6b37d381e4462dd328d0feef94803e90c0455835a5
+EBUILD qemu-softmmu-0.10.0.ebuild 3492 RMD160 5b1baebe7012d949b2fc6fd51905d131c89f7ffc SHA1 28592529836cd5ad2df384eb50ece788c7969198 SHA256 f384cc931e7e1d4f8ab395329ddf94424ec30919d1a0b3a1edb81b5505dfbc5d
 EBUILD qemu-softmmu-0.9.0-r1.ebuild 3175 RMD160 8a7d2bc7dd359671e5350537da075fc169168b60 SHA1 681d7c1f8ff28c30a4e9135e1e54d4075cd8fe7b SHA256 a381f8a2e983e6e6266657adab2cc59605bb3efc416dec4b7f901a51e0666412
 EBUILD qemu-softmmu-0.9.0.ebuild 3129 RMD160 dc0666aa7499db65af3f78d0d94a4253750927d5 SHA1 7493550b324f11ee72aa5ca994cdd207eb383c6f SHA256 ddd4eb920698c27d70a27d20eb1877b37a7824689340821f8cfe16698100942c
 EBUILD qemu-softmmu-0.9.1-r1.ebuild 2904 RMD160 102b8519c20d6df891b9373e0c0f0ca13bafc82d SHA1 b9c737efb10f7bb120956d0ccf9281a3417e3f76 SHA256 ade319575b20682fdcfc0084f6234348e72fac742db179f97c2d55881a1d2a49
 EBUILD qemu-softmmu-0.9.1-r2.ebuild 3449 RMD160 8710a61749937c51bc2bd8e0d089cde0bcc6c4ef SHA1 4b89d7278be7673732b7f9041b42968e0c401a80 SHA256 98c1893c363600d859cb1ba1b6c59d1aa70125d082f1fbb0ed2fae28a39bfab8
 EBUILD qemu-softmmu-0.9.1-r3.ebuild 3504 RMD160 0fd34c21dbabf5f53d2327cf74edf2f2e5226244 SHA1 ff5cf3195a0cede66d4bb406031bb9e215d85e33 SHA256 7e888ccdf6018845995c392172229218702452a3abea6bd877bd9ab480464c3e
 EBUILD qemu-softmmu-0.9.1.ebuild 2832 RMD160 150a50f0010d93200e611af2181cc5df76a91781 SHA1 213f88845793c90dd59e6eff978d839e9d0da3fe SHA256 2c11e38b4b501ef9300e35eeec00236feedad5bcc69decfb839ad52260609f13
-MISC ChangeLog 9553 RMD160 8f8bd1c79ea13d18d2dff387cab19611114b9386 SHA1 c4648c024c2507421e212e7d4d66b723bbbbd80a SHA256 f0a6e4970b1f13ec5f2cb7f449beb0b388698e6bcfac305e1bb1ed51c52df223
-MISC metadata.xml 317 RMD160 ec5f64543d9db447cef26e8c71489ec7c732385c SHA1 f159811a9bba96ae163582b6d2aea10fc238f32b SHA256 46819898b75a387dea3828f35205aa0caab4a9b6fe7b44fea8f7b694e9fcbafd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiOGdAACgkQoeSe8B0zEfxk/ACffZfkV8UdIs+POwo27HjRnBKj
-3KkAniKqhldVnukkdgVRIkqJsHjhzHQx
-=ImtA
------END PGP SIGNATURE-----
+MISC ChangeLog 9723 RMD160 d32d89ffd98a7c393e36c57247e0d263745f18d3 SHA1 955cd823ce7b1fe2c9986c772a54b3214b8cb41d SHA256 b49b9cb23f52e75effbb738e4efcbdcb27aacdc8f58b7fe83946203727e6163d
+MISC metadata.xml 781 RMD160 74450132e66859323be46c121f5eecefb17bf582 SHA1 e1b83da2aeb047e497f2296c8a75d5ff29e3ee72 SHA256 09da74da4568ada6f342113ee454230473c8324cb74957028bf6f1d8864cac22
diff --git a/app-emulation/qemu-softmmu/files/qemu-ifdown b/app-emulation/qemu-softmmu/files/qemu-ifdown
new file mode 100755
index 000000000000..c173e43a9813
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-ifdown
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ -x /sbin/brctl ]; then
+  BRCTL="/sbin/brctl"
+elif [ -x /usr/sbin/brctl ]; then
+  BRCTL="/usr/sbin/brctl"
+else
+  echo "no bridge utils installed"
+  exit 1
+fi
+
+if [ -x /sbin/ip ]; then
+  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
+  ${BRCTL} delif ${switch} $1
+  /sbin/ip link set $1 down
+else
+  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
+  ${BRCTL} delif ${switch} $1
+  /sbin/ifconfig $1 down
+fi
diff --git a/app-emulation/qemu-softmmu/files/qemu-ifup b/app-emulation/qemu-softmmu/files/qemu-ifup
new file mode 100755
index 000000000000..4a30e7d5645f
--- /dev/null
+++ b/app-emulation/qemu-softmmu/files/qemu-ifup
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ -x /sbin/brctl ]; then
+  BRCTL="/sbin/brctl"
+elif [ -x /usr/sbin/brctl ]; then
+  BRCTL="/usr/sbin/brctl"
+else
+  echo "no bridge utils installed"
+  exit 1
+fi
+
+if [ -x /sbin/ip ]; then
+  switch=( $(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }') )
+  /sbin/ip link set $1 up
+else
+  switch=( $(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }') )
+  /sbin/ifconfig $1 0.0.0.0 up
+fi
+
+[[ ${switch#} -ne "1" ]] && logger -t qemu "$0 found more than one bridge connecting $1 to ${switch}"
+${BRCTL} addif ${switch} $1
+
diff --git a/app-emulation/qemu-softmmu/metadata.xml b/app-emulation/qemu-softmmu/metadata.xml
index 07a9d9719a99..7328ec82873a 100644
--- a/app-emulation/qemu-softmmu/metadata.xml
+++ b/app-emulation/qemu-softmmu/metadata.xml
@@ -6,7 +6,13 @@
   <email>lu_zero@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='kqemu'>Enables the kernel acceleration module on a x86
-		cpu</flag>
+		<flag name='kqemu'>Enables the kernel acceleration module on a x86/x86-64 cpu</flag>
+		<flag name='alsa'>Enable alsa output for sound emulation</flag>
+		<flag name='esd'>Enable esound output for sound emulation</flag>
+		<flag name='gnutls'>Enable TLS support for the VNC console server</flag>
+		<flag name='ncurses'>Enable the ncurses-based console</flag>
+		<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
+		<flag name='sdl'>Enable the SDL-based console</flag>
+		<flag name='vde'>Enable VDE-based networking</flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
new file mode 100644
index 000000000000..e04095ec92d3
--- /dev/null
+++ b/app-emulation/qemu-softmmu/qemu-softmmu-0.10.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2009 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.10.0.ebuild,v 1.1 2009/03/06 22:41:31 lu_zero Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+EAPI=1
+
+MY_PN=${PN/-softmmu/}
+MY_P=${P/-softmmu/}
+
+
+SRC_URI="http://savannah.nongnu.org/download/${MY_PN}/${MY_P}.tar.gz"
+
+DESCRIPTION="Open source processor emulator"
+HOMEPAGE="http://bellard.org/qemu/index.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc ~ppc64"
+
+IUSE="alsa esd gnutls ncurses pulseaudio +sdl vde kqemu"
+RESTRICT="test binchecks"
+
+RDEPEND="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 )
+	fdt? ( sys-apps/dtc )
+	kqemu? ( >=app-emulation/kqemu-1.4.0_pre1 )"
+
+DEPEND="${RDEPEND}
+	gnutls? ( dev-util/pkgconfig )
+	app-text/texi2html"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	# 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
+	[[ -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
+}
+
+src_compile() {
+	local mycc conf_opts audio_opts
+
+	audio_opts="oss"
+	conf_opts="--disable-linux-user --disable-darwin-user --disable-bsd-user"
+	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 fdt || conf_opts="--disable-fdt"
+
+	conf_opts="$conf_opts --prefix=/usr --disable-bluez --disable-kvm"
+
+	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"
+
+	./configure ${conf_opts} --audio-drv-list="$audio_opts" || die "econf failed"
+
+	mycc=$(cat qemu/config-host.mak | egrep "^CC=" | cut -d "=" -f 2)
+
+	filter-flags -fpie -fstack-protector
+
+	# If using gentoo's compiler set the SPEC to non-hardened
+	if [ ! -z ${GCC_SPECS} -a -f ${GCC_SPECS} ]; then
+		local myccver=$(${mycc} -dumpversion)
+		local gccver=$($(tc-getBUILD_CC) -dumpversion)
+
+		#Is this a SPEC for the right compiler version?
+		myspec="${GCC_SPECS/${gccver}/${myccver}}"
+		if [ "${myspec}" == "${GCC_SPECS}" ]; then
+			shopt -s extglob
+			GCC_SPECS="${GCC_SPECS/%hardened*specs/vanilla.specs}"
+			shopt -u extglob
+		else
+			unset GCC_SPECS
+		fi
+	fi
+
+	emake || die "emake qemu failed"
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc/qemu
+	dobin "${FILESDIR}/qemu-ifup"
+	dobin "${FILESDIR}/qemu-ifdown"
+
+	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
+}