summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-09-06 03:06:27 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2010-09-06 03:06:27 +0000
commit0817dcf6957eaae61b397fb24088b233119de893 (patch)
treeb1dd10d736c84264c9a7fdecbad427092b351f15 /app-emulation
parentFix keywords (diff)
downloadgentoo-2-0817dcf6957eaae61b397fb24088b233119de893.tar.gz
gentoo-2-0817dcf6957eaae61b397fb24088b233119de893.tar.bz2
gentoo-2-0817dcf6957eaae61b397fb24088b233119de893.zip
[app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in upstream's build system.
Added use flags to enable jpeg and png compression on vnc. Replaced gnu-tls with ssl use flag - bug 311627. Added use flag to make accessbility support optional - bug 326491. Currently it seems qemu-kvm won't build with -sasl - will check and updated ebuild soon. (Portage version: 2.2_rc73/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/qemu-kvm/ChangeLog12
-rw-r--r--app-emulation/qemu-kvm/qemu-kvm-9999.ebuild41
2 files changed, 35 insertions, 18 deletions
diff --git a/app-emulation/qemu-kvm/ChangeLog b/app-emulation/qemu-kvm/ChangeLog
index 340b77d86c48..e9376d51965a 100644
--- a/app-emulation/qemu-kvm/ChangeLog
+++ b/app-emulation/qemu-kvm/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.38 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.39 2010/09/06 03:06:27 jmbsvicetto Exp $
+
+ 06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ qemu-kvm-9999.ebuild:
+ [app-emulation/qemu-kvm-9999] Updated ebuild to reflect changes in
+ upstream's build system.
+ Added use flags to enable jpeg and png compression on vnc.
+ Replaced gnu-tls with ssl use flag - bug 311627.
+ Added use flag to make accessbility support optional - bug 326491.
+ Currently it seems qemu-kvm won't build with -sasl - will check and
+ updated ebuild soon.
06 Sep 2010; Luca Barbato <lu_zero@gentoo.org> qemu-kvm-0.12.5-r1.ebuild,
qemu-kvm-9999.ebuild:
diff --git a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
index 7b084a1efb85..fecd2cda6075 100644
--- a/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
+++ b/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.10 2010/09/06 01:16:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.11 2010/09/06 03:06:27 jmbsvicetto Exp $
EAPI="2"
@@ -25,8 +25,8 @@ HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2"
SLOT="0"
# xen is disabled until the deps are fixed
-IUSE="+aio alsa bluetooth brltty curl esd gnutls fdt hardened kvm-trace \
-ncurses pulseaudio qemu-ifup sasl sdl static vde"
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
+png pulseaudio qemu-ifup ssl sasl sdl static vde xen"
# Updated targets to use the only supported upstream target - x86_64-softmmu
COMMON_TARGETS=""
@@ -58,23 +58,27 @@ RDEPEND="
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
+ brltty? ( app-accessibility/brltty )
curl? ( net-misc/curl )
esd? ( media-sound/esound )
fdt? ( sys-apps/dtc )
- gnutls? ( net-libs/gnutls )
+ jpeg? ( media-libs/jpeg )
ncurses? ( sys-libs/ncurses )
+ png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
- brltty? ( app-accessibility/brltty )
sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
+ ssl? ( net-libs/gnutls )
vde? ( net-misc/vde )
+ xen? ( app-emulation/xen )
"
DEPEND="${RDEPEND}
app-text/texi2html
>=sys-kernel/linux-headers-2.6.29
- gnutls? ( dev-util/pkgconfig )"
+ ssl? ( dev-util/pkgconfig )
+"
kvm_kern_warn() {
eerror "Please enable KVM support in your kernel, found at:"
@@ -159,19 +163,20 @@ src_configure() {
#config options
conf_opts="${conf_opts} $(use_enable aio linux-aio)"
- use bluetooth || conf_opts="${conf_opts} --disable-bluez"
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)"
conf_opts="${conf_opts} $(use_enable curl)"
- use gnutls || conf_opts="${conf_opts} --disable-vnc-tls"
conf_opts="${conf_opts} $(use_enable fdt)"
- use hardened && conf_opts="${conf_opts} --enable-user-pie"
- use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace"
- 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"
- conf_opts="${conf_opts} $(use_enable brltty)"
-# conf_opts="${conf_opts} $(use_enable xen)"
- conf_opts="${conf_opts} --disable-xen"
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
+ conf_opts="${conf_opts} $(use_enable ncurses curses)"
+ conf_opts="${conf_opts} $(use_enable png vnc-png)"
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
+ conf_opts="${conf_opts} $(use_enable sdl)"
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
+ conf_opts="${conf_opts} $(use_enable vde)"
+ conf_opts="${conf_opts} $(use_enable xen)"
+# conf_opts="${conf_opts} --disable-xen"
conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
# audio options
@@ -240,5 +245,7 @@ pkg_postinst() {
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 "kvm-ifup script from /etc/kvm."
+ elog
+ elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
echo
}