summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2009-11-23 00:20:33 +0000
committerLuca Barbato <lu_zero@gentoo.org>2009-11-23 00:20:33 +0000
commitdf0761851e028dbe0820618e62bed05412eb3f4d (patch)
treec59951f7db7d2161b89866717c53acd79a06d327 /app-emulation/qemu
parentOnly use LDFLAGS when linking. (diff)
downloadgentoo-2-df0761851e028dbe0820618e62bed05412eb3f4d.tar.gz
gentoo-2-df0761851e028dbe0820618e62bed05412eb3f4d.tar.bz2
gentoo-2-df0761851e028dbe0820618e62bed05412eb3f4d.zip
Fix bug #286012 also in qemu
(Portage version: 2.1.7.4/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r--app-emulation/qemu/ChangeLog6
-rw-r--r--app-emulation/qemu/qemu-0.11.0.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index ce7d66fa2319..04f81e48b91d 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.73 2009/11/22 23:51:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.74 2009/11/23 00:20:33 lu_zero Exp $
+
+ 23 Nov 2009; Luca Barbato <lu_zero@gentoo.org> qemu-0.11.0.ebuild:
+ fix bug #286012, thanks to Thomas Kister <leander256@gmail.com> for the
+ patch
22 Nov 2009; Luca Barbato <lu_zero@gentoo.org> qemu-0.11.0.ebuild:
use --disable-strip instead of sed
diff --git a/app-emulation/qemu/qemu-0.11.0.ebuild b/app-emulation/qemu/qemu-0.11.0.ebuild
index db365108117a..ef02b3a64e5c 100644
--- a/app-emulation/qemu/qemu-0.11.0.ebuild
+++ b/app-emulation/qemu/qemu-0.11.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v 1.4 2009/11/22 23:51:36 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-0.11.0.ebuild,v 1.5 2009/11/23 00:20:33 lu_zero Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa bluetooth esd gnutls ncurses pulseaudio +sdl vde kqemu kvm"
+IUSE="alsa bluetooth esd gnutls ncurses pulseaudio sasl +sdl vde kqemu kvm"
COMMON_TARGETS="i386 x86_64 arm cris m68k mips mipsel mips64 mips64el ppc ppc64 sh4 sh4eb sparc"
@@ -37,6 +37,7 @@ RDEPEND="!app-emulation/qemu-softmmu
pulseaudio? ( media-sound/pulseaudio )
gnutls? ( net-libs/gnutls )
ncurses? ( sys-libs/ncurses )
+ sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11 )
vde? ( net-misc/vde )
kvm? ( >=sys-kernel/linux-headers-2.6.29 )
@@ -83,6 +84,7 @@ src_configure() {
einfo "Building following softmmu targets: ${softmmu_targets}"
use gnutls || conf_opts="$conf_opts --disable-vnc-tls"
use ncurses || conf_opts="$conf_opts --disable-curses"
+ use sasl || conf_opts="$conf_opts --disable-vnc-sasl"
use sdl || conf_opts="$conf_opts --disable-sdl"
use vde || conf_opts="$conf_opts --disable-vde"
use bluetooth || conf_opts="$conf_opts --disable-bluez"