Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog
Date: Tue, 29 Jul 2014 10:17:32
Message-Id: 20140729101724.5B25A2004E@flycatcher.gentoo.org
1 vapier 14/07/29 10:17:23
2
3 Modified: qemu-9999.ebuild qemu-2.0.0-r1.ebuild ChangeLog
4 Log:
5 Add USE=nls support #515544 by Nikoli.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.78 app-emulation/qemu/qemu-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.78&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.78&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.77&r2=1.78
15
16 Index: qemu-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
19 retrieving revision 1.77
20 retrieving revision 1.78
21 diff -u -r1.77 -r1.78
22 --- qemu-9999.ebuild 29 Jul 2014 10:09:28 -0000 1.77
23 +++ qemu-9999.ebuild 29 Jul 2014 10:17:23 -0000 1.78
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.77 2014/07/29 10:09:28 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.78 2014/07/29 10:17:23 vapier Exp $
29
30 EAPI=5
31
32 @@ -31,7 +31,7 @@
33 SLOT="0"
34 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
35 gtk iscsi +jpeg \
36 -kernel_linux kernel_FreeBSD ncurses opengl +png pulseaudio python \
37 +kernel_linux kernel_FreeBSD ncurses nls opengl +png pulseaudio python \
38 rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
39 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
40 virtfs +vnc xattr xen xfs"
41 @@ -125,6 +125,7 @@
42 sys-apps/texinfo
43 virtual/pkgconfig
44 kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
45 + gtk? ( nls? ( sys-devel/gettext ) )
46 static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
47 static-user? ( ${USER_LIB_DEPEND} )
48 test? (
49 @@ -236,6 +237,9 @@
50 -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
51 Makefile Makefile.target || die
52
53 + # Cheap hack to disable gettext .mo generation.
54 + use nls || rm -f po/*.po
55 +
56 epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
57 [[ -n ${BACKPORTS} ]] && \
58 EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
59
60
61
62 1.8 app-emulation/qemu/qemu-2.0.0-r1.ebuild
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.8&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?rev=1.8&content-type=text/plain
66 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild?r1=1.7&r2=1.8
67
68 Index: qemu-2.0.0-r1.ebuild
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v
71 retrieving revision 1.7
72 retrieving revision 1.8
73 diff -u -r1.7 -r1.8
74 --- qemu-2.0.0-r1.ebuild 29 Jul 2014 10:09:28 -0000 1.7
75 +++ qemu-2.0.0-r1.ebuild 29 Jul 2014 10:17:23 -0000 1.8
76 @@ -1,6 +1,6 @@
77 # Copyright 1999-2014 Gentoo Foundation
78 # Distributed under the terms of the GNU General Public License v2
79 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.7 2014/07/29 10:09:28 vapier Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.0.0-r1.ebuild,v 1.8 2014/07/29 10:17:23 vapier Exp $
81
82 EAPI=5
83
84 @@ -31,7 +31,7 @@
85 SLOT="0"
86 IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
87 gtk iscsi +jpeg \
88 -kernel_linux kernel_FreeBSD ncurses opengl +png pulseaudio python \
89 +kernel_linux kernel_FreeBSD ncurses nls opengl +png pulseaudio python \
90 rbd sasl +seccomp sdl selinux smartcard spice ssh static static-softmmu \
91 static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
92 virtfs +vnc xattr xen xfs"
93 @@ -125,6 +125,7 @@
94 sys-apps/texinfo
95 virtual/pkgconfig
96 kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
97 + gtk? ( nls? ( sys-devel/gettext ) )
98 static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
99 static-user? ( ${USER_LIB_DEPEND} )
100 test? (
101 @@ -236,6 +237,9 @@
102 -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
103 Makefile Makefile.target || die
104
105 + # Cheap hack to disable gettext .mo generation.
106 + use nls || rm -f po/*.po
107 +
108 epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
109 epatch "${FILESDIR}"/qemu-9999-virtfs-proxy-helper-accept.patch #486714
110 epatch "${FILESDIR}"/${P}-CVE-2013-4541.patch #510208
111
112
113
114 1.271 app-emulation/qemu/ChangeLog
115
116 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.271&view=markup
117 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.271&content-type=text/plain
118 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.270&r2=1.271
119
120 Index: ChangeLog
121 ===================================================================
122 RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
123 retrieving revision 1.270
124 retrieving revision 1.271
125 diff -u -r1.270 -r1.271
126 --- ChangeLog 29 Jul 2014 10:09:28 -0000 1.270
127 +++ ChangeLog 29 Jul 2014 10:17:23 -0000 1.271
128 @@ -1,6 +1,10 @@
129 # ChangeLog for app-emulation/qemu
130 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
131 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.270 2014/07/29 10:09:28 vapier Exp $
132 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.271 2014/07/29 10:17:23 vapier Exp $
133 +
134 + 29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild,
135 + qemu-9999.ebuild:
136 + Add USE=nls support #515544 by Nikoli.
137
138 29 Jul 2014; Mike Frysinger <vapier@g.o> qemu-2.0.0-r1.ebuild,
139 qemu-9999.ebuild: