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
commit44bbb2385b412b29cb4a33cad4ea0d3bb2153b0f (patch)
tree64cbd4e6bf4157357c7fe5e7e7bbc36f2dbd6663 /app-emulation
parentmask app-emulation/kvm-kmod until it can be fixed up (diff)
downloadhistorical-44bbb2385b412b29cb4a33cad4ea0d3bb2153b0f.tar.gz
historical-44bbb2385b412b29cb4a33cad4ea0d3bb2153b0f.tar.bz2
historical-44bbb2385b412b29cb4a33cad4ea0d3bb2153b0f.zip
Fix bug #286012 also in qemu
Package-Manager: portage-2.1.7.4/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu/ChangeLog6
-rw-r--r--app-emulation/qemu/Manifest4
-rw-r--r--app-emulation/qemu/qemu-0.11.0.ebuild6
3 files changed, 11 insertions, 5 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/Manifest b/app-emulation/qemu/Manifest
index 9e6832852109..fc23fdf407dc 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -13,8 +13,8 @@ EBUILD qemu-0.10.3.ebuild 4703 RMD160 e852ff28e625bc8f768a188ae71d66dbb23979f0 S
EBUILD qemu-0.10.4.ebuild 4787 RMD160 0214208a4161cfa6e2d2d75a572379fc50d23dc1 SHA1 fb06754c253ca7f63a71f06e9e09feefa2ed284c SHA256 4c7dfada2f271567e6e10d2aeaabb7b7bfe67968668759ea12669db633ce0280
EBUILD qemu-0.10.5.ebuild 4872 RMD160 4f1a41ec6567564968baa7c8790f7232f866a511 SHA1 781f1f5f1eaba1d8f99e9877bc3d55cf3f806a93 SHA256 fbedf067e0ebb55ab457dd2b2c648b8a5255d3b863ef2ecdf8db74ffc19a0b1c
EBUILD qemu-0.10.6.ebuild 4844 RMD160 a4d3eabaf2fd25cc6fa4f4f9dbbb7147fefe246c SHA1 128bd72d72901ab07d6fe1223f36df0e30edd5b6 SHA256 b4b63038dbf1a1894c64943d72f9fcca4f1d86eafbb2b274b45de652df62d85a
-EBUILD qemu-0.11.0.ebuild 4803 RMD160 b14b3d3325dbbf78f71c72bcc31e5a20ec32cc25 SHA1 7311e39533ab25f4071b9088db441cb11629c3f0 SHA256 eb6b2a8857d33a211ba45df5a9c7afdb1d4a205e56fbe3287a08342701658902
+EBUILD qemu-0.11.0.ebuild 4895 RMD160 9524e43fef968a3849737bb944eaff30dd17183d SHA1 ca475ab11b9ec015144c0280ac5f5bd928994a03 SHA256 10829e5169f7e603f13ebc66fbc5790170666d02a6c24361997631748c13e0f3
EBUILD qemu-0.9.0.ebuild 503 RMD160 e6261c120b646da7f2106984ab8a833da1eaa095 SHA1 c4ec2424d608d4b38f395dbfe8f761ba4fbab835 SHA256 baa5050753763d8c20384f22de5e70748b100c66b8aa8a54107917519d00db4c
EBUILD qemu-0.9.1.ebuild 515 RMD160 51683f0657c0e4ac6fbfa403fa9b81f027c9a830 SHA1 87031abd8579289862a692d32845b131f4cb3e1b SHA256 cd2b063cf0f40a170abfcbe2593ae1a82e99e3262d321a5bfdf02b5b62eab1e9
-MISC ChangeLog 9625 RMD160 03af9f83c0009c8b7acf7b903182af57221473e7 SHA1 9e20629a0234e14c5f4ea4659699353d0f6fbb9e SHA256 b54e7369ab8cd6a0fe1afdcbcd4aa6db204cf447bd35bd0c1f8cf6602930997c
+MISC ChangeLog 9777 RMD160 ca0cd0434dd1ac125baac084807ae566690fadcf SHA1 5aaf7fe10c1c9b254714b80fd68343070742bb5f SHA256 9cfec5d001e15b7d7059c39d3ba2465f9d25d11e638a252d8dfa8cc59d4b643e
MISC metadata.xml 882 RMD160 259583b24a6eec2cbcca323e754f677041d44d54 SHA1 690460cdb502fd47b51eb1d51938d1c7629f7918 SHA256 8584426258959783d4da117036fa1d773b91b8f90d6a3c1ee7d065446e3d91f8
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"