1 |
jmbsvicetto 10/09/06 10:56:40 |
2 |
|
3 |
Modified: metadata.xml ChangeLog qemu-kvm-0.12.5-r1.ebuild |
4 |
Log: |
5 |
[app-emulation/qemu-kvm-0.12.5-r1] Synced the updates on qemu-kvm-9999. |
6 |
Fixed the brltty configure option - fixes bug 336162. |
7 |
Applied the gnutls to ssl use flag change - fixes bug 311627. |
8 |
|
9 |
(Portage version: 2.2_rc73/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.7 app-emulation/qemu-kvm/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/metadata.xml?rev=1.7&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/metadata.xml?rev=1.7&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/metadata.xml?r1=1.6&r2=1.7 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/metadata.xml,v |
21 |
retrieving revision 1.6 |
22 |
retrieving revision 1.7 |
23 |
diff -u -r1.6 -r1.7 |
24 |
--- metadata.xml 6 Sep 2010 01:16:15 -0000 1.6 |
25 |
+++ metadata.xml 6 Sep 2010 10:56:40 -0000 1.7 |
26 |
@@ -1,21 +1,24 @@ |
27 |
<?xml version="1.0" encoding="UTF-8"?> |
28 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
29 |
<pkgmetadata> |
30 |
-<herd>qemu</herd> |
31 |
-<use> |
32 |
- <flag name='aio'>Enables support for Linux's Async IO</flag> |
33 |
- <flag name='alsa'>Enable alsa output for sound emulation</flag> |
34 |
- <flag name='brltty'>Adds support for braille displays using brltty</flag> |
35 |
- <flag name='esd'>Enable esound output for sound emulation</flag> |
36 |
- <flag name='fdt'>Enables firmware device tree support</flag> |
37 |
- <flag name='gnutls'>Enable TLS support for the VNC console server</flag> |
38 |
- <flag name='kvm-trace'>Allows you to use KVM tracing</flag> |
39 |
- <flag name='ncurses'>Enable the ncurses-based console</flag> |
40 |
- <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag> |
41 |
- <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's |
42 |
- built in bridging</flag> |
43 |
- <flag name='sdl'>Enable the SDL-based console</flag> |
44 |
- <flag name='vde'>Enable VDE-based networking</flag> |
45 |
- <flag name='xen'>Enables support for Xen backends</flag> |
46 |
+ <herd>qemu</herd> |
47 |
+ <use> |
48 |
+ <flag name='aio'>Enables support for Linux's Async IO</flag> |
49 |
+ <flag name='alsa'>Enable alsa output for sound emulation</flag> |
50 |
+ <flag name='brltty'>Adds support for braille displays using brltty</flag> |
51 |
+ <flag name='esd'>Enable esound output for sound emulation</flag> |
52 |
+ <flag name='fdt'>Enables firmware device tree support</flag> |
53 |
+ <flag name='gnutls'>Enable TLS support for the VNC console server</flag> |
54 |
+ <flag name='jpeg'>Enable JPEG compression for the VNC console server</flag> |
55 |
+ <flag name='kvm-trace'>Allows you to use KVM tracing</flag> |
56 |
+ <flag name='ncurses'>Enable the ncurses-based console</flag> |
57 |
+ <flag name='png'>Enable PNG compression for the VNC console server</flag> |
58 |
+ <flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag> |
59 |
+ <flag name='qemu-ifup'>Provides the qemu-ifup script for use with QEMU's |
60 |
+ built in bridging</flag> |
61 |
+ <flag name='sdl'>Enable the SDL-based console</flag> |
62 |
+ <flag name='ssl'>Enable TLS support for the VNC console server</flag> |
63 |
+ <flag name='vde'>Enable VDE-based networking</flag> |
64 |
+ <flag name='xen'>Enables support for Xen backends</flag> |
65 |
</use> |
66 |
</pkgmetadata> |
67 |
|
68 |
|
69 |
|
70 |
1.42 app-emulation/qemu-kvm/ChangeLog |
71 |
|
72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.42&view=markup |
73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.42&content-type=text/plain |
74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.41&r2=1.42 |
75 |
|
76 |
Index: ChangeLog |
77 |
=================================================================== |
78 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v |
79 |
retrieving revision 1.41 |
80 |
retrieving revision 1.42 |
81 |
diff -u -r1.41 -r1.42 |
82 |
--- ChangeLog 6 Sep 2010 10:49:53 -0000 1.41 |
83 |
+++ ChangeLog 6 Sep 2010 10:56:40 -0000 1.42 |
84 |
@@ -1,6 +1,11 @@ |
85 |
# ChangeLog for app-emulation/qemu-kvm |
86 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
87 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.41 2010/09/06 10:49:53 lu_zero Exp $ |
88 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.42 2010/09/06 10:56:40 jmbsvicetto Exp $ |
89 |
+ |
90 |
+ 06 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
91 |
+ qemu-kvm-0.12.5-r1.ebuild, metadata.xml: |
92 |
+ [app-emulation/qemu-kvm-0.12.5-r1] Synced the updates on qemu-kvm-9999. |
93 |
+ Applied the gnutls to ssl use flag change - fixes bug 311627. |
94 |
|
95 |
06 Sep 2010; Luca Barbato <lu_zero@g.o> qemu-kvm-0.12.5-r1.ebuild: |
96 |
Fix typo in brltty vs brlapi |
97 |
|
98 |
|
99 |
|
100 |
1.5 app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild |
101 |
|
102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild?rev=1.5&view=markup |
103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild?rev=1.5&content-type=text/plain |
104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild?r1=1.4&r2=1.5 |
105 |
|
106 |
Index: qemu-kvm-0.12.5-r1.ebuild |
107 |
=================================================================== |
108 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild,v |
109 |
retrieving revision 1.4 |
110 |
retrieving revision 1.5 |
111 |
diff -u -r1.4 -r1.5 |
112 |
--- qemu-kvm-0.12.5-r1.ebuild 6 Sep 2010 10:49:53 -0000 1.4 |
113 |
+++ qemu-kvm-0.12.5-r1.ebuild 6 Sep 2010 10:56:40 -0000 1.5 |
114 |
@@ -1,6 +1,6 @@ |
115 |
# Copyright 1999-2010 Gentoo Foundation |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild,v 1.4 2010/09/06 10:49:53 lu_zero Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.5-r1.ebuild,v 1.5 2010/09/06 10:56:40 jmbsvicetto Exp $ |
119 |
|
120 |
BACKPORTS=1 |
121 |
|
122 |
@@ -19,7 +19,6 @@ |
123 |
else |
124 |
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz |
125 |
${BACKPORTS:+mirror://gentoo/${P}-backports-${BACKPORTS}.tar.bz2}" |
126 |
- #KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
127 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
128 |
fi |
129 |
|
130 |
@@ -29,8 +28,8 @@ |
131 |
LICENSE="GPL-2" |
132 |
SLOT="0" |
133 |
# xen is disabled until the deps are fixed |
134 |
-IUSE="+aio alsa bluetooth brltty curl esd gnutls fdt hardened kvm-trace \ |
135 |
-ncurses pulseaudio qemu-ifup sasl sdl static vde" |
136 |
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened kvm-trace \ |
137 |
+ncurses pulseaudio qemu-ifup sasl sdl ssl static vde" |
138 |
|
139 |
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" |
140 |
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" |
141 |
@@ -58,23 +57,24 @@ |
142 |
aio? ( dev-libs/libaio ) |
143 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
144 |
bluetooth? ( net-wireless/bluez ) |
145 |
+ brltty? ( app-accessibility/brltty ) |
146 |
curl? ( net-misc/curl ) |
147 |
esd? ( media-sound/esound ) |
148 |
fdt? ( sys-apps/dtc ) |
149 |
- gnutls? ( net-libs/gnutls ) |
150 |
ncurses? ( sys-libs/ncurses ) |
151 |
pulseaudio? ( media-sound/pulseaudio ) |
152 |
qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils ) |
153 |
- brltty? ( app-accessibility/brltty ) |
154 |
sasl? ( dev-libs/cyrus-sasl ) |
155 |
sdl? ( >=media-libs/libsdl-1.2.11[X] ) |
156 |
+ ssl? ( net-libs/gnutls ) |
157 |
vde? ( net-misc/vde ) |
158 |
" |
159 |
|
160 |
DEPEND="${RDEPEND} |
161 |
app-text/texi2html |
162 |
>=sys-kernel/linux-headers-2.6.29 |
163 |
- gnutls? ( dev-util/pkgconfig )" |
164 |
+ ssl? ( dev-util/pkgconfig ) |
165 |
+" |
166 |
|
167 |
kvm_kern_warn() { |
168 |
eerror "Please enable KVM support in your kernel, found at:" |
169 |
@@ -161,17 +161,17 @@ |
170 |
|
171 |
#config options |
172 |
conf_opts="${conf_opts} $(use_enable aio linux-aio)" |
173 |
- use bluetooth || conf_opts="${conf_opts} --disable-bluez" |
174 |
+ conf_opts="${conf_opts} $(use_enable bluetooth bluez)" |
175 |
+ conf_opts="${conf_opts} $(use_enable brltty brlapi)" |
176 |
conf_opts="${conf_opts} $(use_enable curl)" |
177 |
- use gnutls || conf_opts="${conf_opts} --disable-vnc-tls" |
178 |
conf_opts="${conf_opts} $(use_enable fdt)" |
179 |
- use hardened && conf_opts="${conf_opts} --enable-user-pie" |
180 |
+ conf_opts="${conf_opts} $(use_enable hardened user-pie)" |
181 |
use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace" |
182 |
- use ncurses || conf_opts="${conf_opts} --disable-curses" |
183 |
- use sasl || conf_opts="${conf_opts} --disable-vnc-sasl" |
184 |
- use sdl || conf_opts="${conf_opts} --disable-sdl" |
185 |
- use vde || conf_opts="${conf_opts} --disable-vde" |
186 |
- conf_opts="${conf_opts} $(use_enable brltty brlapi)" |
187 |
+ conf_opts="${conf_opts} $(use_enable ncurses curses)" |
188 |
+ conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)" |
189 |
+ conf_opts="${conf_opts} $(use_enable sdl)" |
190 |
+ conf_opts="${conf_opts} $(use_enable ssl vnc-tls)" |
191 |
+ conf_opts="${conf_opts} $(use_enable vde)" |
192 |
# conf_opts="${conf_opts} $(use_enable xen)" |
193 |
conf_opts="${conf_opts} --disable-xen" |
194 |
conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user" |
195 |
@@ -242,5 +242,7 @@ |
196 |
elog "if using -net tap. You will also need support for 802.1d" |
197 |
elog "Ethernet Bridging and a configured bridge if using the provided" |
198 |
elog "kvm-ifup script from /etc/kvm." |
199 |
+ elog |
200 |
+ elog "The gnutls use flag was renamed to ssl, so adjust your use flags." |
201 |
echo |
202 |
} |