Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-1.1.0.ebuild vlc-1.1.9999.ebuild vlc-9999.ebuild
Date: Fri, 25 Jun 2010 11:30:54
Message-Id: 20100625113051.1AF152CF5F@corvid.gentoo.org
1 aballier 10/06/25 11:30:50
2
3 Modified: vlc-1.1.0.ebuild vlc-1.1.9999.ebuild
4 vlc-9999.ebuild
5 Log:
6 cosmetics
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.6 media-video/vlc/vlc-1.1.0.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild?r1=1.5&r2=1.6
15
16 Index: vlc-1.1.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- vlc-1.1.0.ebuild 25 Jun 2010 09:18:24 -0000 1.5
23 +++ vlc-1.1.0.ebuild 25 Jun 2010 11:30:50 -0000 1.6
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.5 2010/06/25 09:18:24 aballier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.6 2010/06/25 11:30:50 aballier Exp $
29
30 EAPI="2"
31
32 @@ -67,16 +67,14 @@
33 bidi? ( >=dev-libs/fribidi-0.10.4 )
34 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
35 dbus? ( >=sys-apps/dbus-1.0.2 )
36 - dc1394? ( >=sys-libs/libraw1394-2.0.1
37 - >=media-libs/libdc1394-2.0.2 )
38 + dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
39 dirac? ( >=media-video/dirac-0.10.0 )
40 directfb? ( dev-libs/DirectFB sys-libs/zlib )
41 dts? ( media-libs/libdca )
42 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
43 elibc_glibc? ( >=sys-libs/glibc-2.8 )
44 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
45 - flac? ( media-libs/libogg
46 - >=media-libs/flac-1.1.2 )
47 + flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
48 fluidsynth? ( media-sound/fluidsynth )
49 fontconfig? ( media-libs/fontconfig )
50 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
51 @@ -95,9 +93,7 @@
52 lirc? ( app-misc/lirc )
53 live? ( >=media-plugins/live-2008.07.06 )
54 lua? ( >=dev-lang/lua-5.1 )
55 - matroska? (
56 - >=dev-libs/libebml-0.7.6
57 - >=media-libs/libmatroska-0.8.0 )
58 + matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
59 modplug? ( >=media-libs/libmodplug-0.8 )
60 mp3? ( media-libs/libmad )
61 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
62 @@ -113,8 +109,7 @@
63 !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
64 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
65 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
66 - samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
67 - <net-fs/samba-3.4 ) )
68 + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
69 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
70 sdl? ( >=media-libs/libsdl-1.2.8
71 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
72 @@ -130,8 +125,7 @@
73 svga? ( media-libs/svgalib )
74 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
75 theora? ( >=media-libs/libtheora-1.0_beta3 )
76 - truetype? ( media-libs/freetype
77 - media-fonts/dejavu )
78 + truetype? ( media-libs/freetype media-fonts/dejavu )
79 twolame? ( media-sound/twolame )
80 udev? ( >=sys-fs/udev-142 )
81 upnp? ( net-libs/libupnp )
82
83
84
85 1.12 media-video/vlc/vlc-1.1.9999.ebuild
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.12&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.12&content-type=text/plain
89 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.11&r2=1.12
90
91 Index: vlc-1.1.9999.ebuild
92 ===================================================================
93 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v
94 retrieving revision 1.11
95 retrieving revision 1.12
96 diff -u -r1.11 -r1.12
97 --- vlc-1.1.9999.ebuild 25 Jun 2010 09:18:24 -0000 1.11
98 +++ vlc-1.1.9999.ebuild 25 Jun 2010 11:30:50 -0000 1.12
99 @@ -1,6 +1,6 @@
100 # Copyright 1999-2010 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.11 2010/06/25 09:18:24 aballier Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.12 2010/06/25 11:30:50 aballier Exp $
104
105 EAPI="2"
106
107 @@ -67,16 +67,14 @@
108 bidi? ( >=dev-libs/fribidi-0.10.4 )
109 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
110 dbus? ( >=sys-apps/dbus-1.0.2 )
111 - dc1394? ( >=sys-libs/libraw1394-2.0.1
112 - >=media-libs/libdc1394-2.0.2 )
113 + dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
114 dirac? ( >=media-video/dirac-0.10.0 )
115 directfb? ( dev-libs/DirectFB sys-libs/zlib )
116 dts? ( media-libs/libdca )
117 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
118 elibc_glibc? ( >=sys-libs/glibc-2.8 )
119 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
120 - flac? ( media-libs/libogg
121 - >=media-libs/flac-1.1.2 )
122 + flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
123 fluidsynth? ( media-sound/fluidsynth )
124 fontconfig? ( media-libs/fontconfig )
125 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
126 @@ -95,9 +93,7 @@
127 lirc? ( app-misc/lirc )
128 live? ( >=media-plugins/live-2008.07.06 )
129 lua? ( >=dev-lang/lua-5.1 )
130 - matroska? (
131 - >=dev-libs/libebml-0.7.6
132 - >=media-libs/libmatroska-0.8.0 )
133 + matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
134 modplug? ( >=media-libs/libmodplug-0.8 )
135 mp3? ( media-libs/libmad )
136 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
137 @@ -113,8 +109,7 @@
138 !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
139 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
140 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
141 - samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
142 - <net-fs/samba-3.4 ) )
143 + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
144 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
145 sdl? ( >=media-libs/libsdl-1.2.8
146 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
147 @@ -130,8 +125,7 @@
148 svga? ( media-libs/svgalib )
149 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
150 theora? ( >=media-libs/libtheora-1.0_beta3 )
151 - truetype? ( media-libs/freetype
152 - media-fonts/dejavu )
153 + truetype? ( media-libs/freetype media-fonts/dejavu )
154 twolame? ( media-sound/twolame )
155 udev? ( >=sys-fs/udev-142 )
156 upnp? ( net-libs/libupnp )
157
158
159
160 1.79 media-video/vlc/vlc-9999.ebuild
161
162 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.79&view=markup
163 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.79&content-type=text/plain
164 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.78&r2=1.79
165
166 Index: vlc-9999.ebuild
167 ===================================================================
168 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
169 retrieving revision 1.78
170 retrieving revision 1.79
171 diff -u -r1.78 -r1.79
172 --- vlc-9999.ebuild 25 Jun 2010 09:18:24 -0000 1.78
173 +++ vlc-9999.ebuild 25 Jun 2010 11:30:50 -0000 1.79
174 @@ -1,6 +1,6 @@
175 # Copyright 1999-2010 Gentoo Foundation
176 # Distributed under the terms of the GNU General Public License v2
177 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.78 2010/06/25 09:18:24 aballier Exp $
178 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.79 2010/06/25 11:30:50 aballier Exp $
179
180 EAPI="2"
181
182 @@ -67,16 +67,14 @@
183 bidi? ( >=dev-libs/fribidi-0.10.4 )
184 cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
185 dbus? ( >=sys-apps/dbus-1.0.2 )
186 - dc1394? ( >=sys-libs/libraw1394-2.0.1
187 - >=media-libs/libdc1394-2.0.2 )
188 + dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
189 dirac? ( >=media-video/dirac-0.10.0 )
190 directfb? ( dev-libs/DirectFB sys-libs/zlib )
191 dts? ( media-libs/libdca )
192 dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
193 elibc_glibc? ( >=sys-libs/glibc-2.8 )
194 ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
195 - flac? ( media-libs/libogg
196 - >=media-libs/flac-1.1.2 )
197 + flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
198 fluidsynth? ( media-sound/fluidsynth )
199 fontconfig? ( media-libs/fontconfig )
200 gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
201 @@ -95,9 +93,7 @@
202 lirc? ( app-misc/lirc )
203 live? ( >=media-plugins/live-2008.07.06 )
204 lua? ( >=dev-lang/lua-5.1 )
205 - matroska? (
206 - >=dev-libs/libebml-0.7.6
207 - >=media-libs/libmatroska-0.8.0 )
208 + matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
209 modplug? ( >=media-libs/libmodplug-0.8 )
210 mp3? ( media-libs/libmad )
211 mpeg? ( >=media-libs/libmpeg2-0.3.2 )
212 @@ -113,8 +109,7 @@
213 !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
214 qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
215 remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
216 - samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
217 - <net-fs/samba-3.4 ) )
218 + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
219 schroedinger? ( >=media-libs/schroedinger-1.0.6 )
220 sdl? ( >=media-libs/libsdl-1.2.8
221 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
222 @@ -130,8 +125,7 @@
223 svga? ( media-libs/svgalib )
224 taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
225 theora? ( >=media-libs/libtheora-1.0_beta3 )
226 - truetype? ( media-libs/freetype
227 - media-fonts/dejavu )
228 + truetype? ( media-libs/freetype media-fonts/dejavu )
229 twolame? ( media-sound/twolame )
230 udev? ( >=sys-fs/udev-142 )
231 upnp? ( net-libs/libupnp )