Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@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 ChangeLog vlc-9999.ebuild
Date: Sat, 03 Jul 2010 04:48:15
Message-Id: 20100703044810.2A9F02CE15@corvid.gentoo.org
1 zmedico 10/07/03 04:48:09
2
3 Modified: vlc-1.1.0.ebuild vlc-1.1.9999.ebuild ChangeLog
4 vlc-9999.ebuild
5 Log:
6 Bug #326179 - Move vlc blockers to DEPEND and bump to EAPI 3 so that die in pkg_setup is unnecessary.
7 (Portage version: 2.2_rc67_p182/cvs/Linux i686)
8
9 Revision Changes Path
10 1.8 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.8&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild?rev=1.8&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild?r1=1.7&r2=1.8
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.7
20 retrieving revision 1.8
21 diff -u -r1.7 -r1.8
22 --- vlc-1.1.0.ebuild 27 Jun 2010 18:06:11 -0000 1.7
23 +++ vlc-1.1.0.ebuild 3 Jul 2010 04:48:09 -0000 1.8
24 @@ -1,8 +1,8 @@
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.7 2010/06/27 18:06:11 armin76 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.8 2010/07/03 04:48:09 zmedico Exp $
29
30 -EAPI="2"
31 +EAPI="3"
32
33 SCM=""
34 if [ "${PV%9999}" != "${PV}" ] ; then
35 @@ -56,7 +56,6 @@
36 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
37
38 RDEPEND="
39 - !!<=media-video/vlc-1.0.99999
40 sys-libs/zlib
41 >=media-libs/libdvbpsi-0.1.6
42 a52? ( >=media-libs/a52dec-0.7.4-r3 )
43 @@ -144,6 +143,7 @@
44 "
45
46 DEPEND="${RDEPEND}
47 + !!<=media-video/vlc-1.0.99999
48 dvb? ( sys-kernel/linux-headers )
49 kde? ( >=kde-base/kdelibs-4 )
50 v4l? ( sys-kernel/linux-headers )
51 @@ -170,13 +170,6 @@
52 }
53
54 pkg_setup() {
55 - if has_version '<=media-video/vlc-1.0.99999'; then
56 - eerror "Please unmerge vlc-1.0.x first before installing ${P}"
57 - eerror "If you don't do that, some plugins will get linked against"
58 - eerror "the old ${PN} version and will not work."
59 - die "Unmerge vlc 1.0.x first"
60 - fi
61 -
62 # Useflags we need to forcefuly enable
63 vlc_use_force remoteosd gcrypt
64 vlc_use_force gnutls gcrypt
65
66
67
68 1.13 media-video/vlc/vlc-1.1.9999.ebuild
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.13&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.13&content-type=text/plain
72 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.12&r2=1.13
73
74 Index: vlc-1.1.9999.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v
77 retrieving revision 1.12
78 retrieving revision 1.13
79 diff -u -r1.12 -r1.13
80 --- vlc-1.1.9999.ebuild 25 Jun 2010 11:30:50 -0000 1.12
81 +++ vlc-1.1.9999.ebuild 3 Jul 2010 04:48:09 -0000 1.13
82 @@ -1,8 +1,8 @@
83 # Copyright 1999-2010 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.12 2010/06/25 11:30:50 aballier Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.13 2010/07/03 04:48:09 zmedico Exp $
87
88 -EAPI="2"
89 +EAPI="3"
90
91 SCM=""
92 if [ "${PV%9999}" != "${PV}" ] ; then
93 @@ -56,7 +56,6 @@
94 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
95
96 RDEPEND="
97 - !!<=media-video/vlc-1.0.99999
98 sys-libs/zlib
99 >=media-libs/libdvbpsi-0.1.6
100 a52? ( >=media-libs/a52dec-0.7.4-r3 )
101 @@ -144,6 +143,7 @@
102 "
103
104 DEPEND="${RDEPEND}
105 + !!<=media-video/vlc-1.0.99999
106 dvb? ( sys-kernel/linux-headers )
107 kde? ( >=kde-base/kdelibs-4 )
108 v4l? ( sys-kernel/linux-headers )
109 @@ -170,13 +170,6 @@
110 }
111
112 pkg_setup() {
113 - if has_version '<=media-video/vlc-1.0.99999'; then
114 - eerror "Please unmerge vlc-1.0.x first before installing ${P}"
115 - eerror "If you don't do that, some plugins will get linked against"
116 - eerror "the old ${PN} version and will not work."
117 - die "Unmerge vlc 1.0.x first"
118 - fi
119 -
120 # Useflags we need to forcefuly enable
121 vlc_use_force remoteosd gcrypt
122 vlc_use_force gnutls gcrypt
123
124
125
126 1.601 media-video/vlc/ChangeLog
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.601&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.601&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.600&r2=1.601
131
132 Index: ChangeLog
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
135 retrieving revision 1.600
136 retrieving revision 1.601
137 diff -u -r1.600 -r1.601
138 --- ChangeLog 27 Jun 2010 18:06:11 -0000 1.600
139 +++ ChangeLog 3 Jul 2010 04:48:09 -0000 1.601
140 @@ -1,6 +1,11 @@
141 # ChangeLog for media-video/vlc
142 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
143 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.600 2010/06/27 18:06:11 armin76 Exp $
144 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.601 2010/07/03 04:48:09 zmedico Exp $
145 +
146 + 03 Jul 2010; Zac Medico <zmedico@g.o> vlc-1.1.0.ebuild,
147 + vlc-1.1.9999.ebuild, vlc-9999.ebuild:
148 + Bug #326179 - Move vlc blockers to DEPEND and bump to EAPI 3 so that die
149 + in pkg_setup is unnecessary.
150
151 27 Jun 2010; Raúl Porcel <armin76@g.o> vlc-1.1.0.ebuild:
152 Re-add ~alpha/~arm/~sparc wrt #325007
153
154
155
156 1.80 media-video/vlc/vlc-9999.ebuild
157
158 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.80&view=markup
159 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.80&content-type=text/plain
160 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.79&r2=1.80
161
162 Index: vlc-9999.ebuild
163 ===================================================================
164 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
165 retrieving revision 1.79
166 retrieving revision 1.80
167 diff -u -r1.79 -r1.80
168 --- vlc-9999.ebuild 25 Jun 2010 11:30:50 -0000 1.79
169 +++ vlc-9999.ebuild 3 Jul 2010 04:48:09 -0000 1.80
170 @@ -1,8 +1,8 @@
171 # Copyright 1999-2010 Gentoo Foundation
172 # Distributed under the terms of the GNU General Public License v2
173 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.79 2010/06/25 11:30:50 aballier Exp $
174 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.80 2010/07/03 04:48:09 zmedico Exp $
175
176 -EAPI="2"
177 +EAPI="3"
178
179 SCM=""
180 if [ "${PV%9999}" != "${PV}" ] ; then
181 @@ -56,7 +56,6 @@
182 vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
183
184 RDEPEND="
185 - !!<=media-video/vlc-1.0.99999
186 sys-libs/zlib
187 >=media-libs/libdvbpsi-0.1.6
188 a52? ( >=media-libs/a52dec-0.7.4-r3 )
189 @@ -144,6 +143,7 @@
190 "
191
192 DEPEND="${RDEPEND}
193 + !!<=media-video/vlc-1.0.99999
194 dvb? ( sys-kernel/linux-headers )
195 kde? ( >=kde-base/kdelibs-4 )
196 v4l? ( sys-kernel/linux-headers )
197 @@ -170,13 +170,6 @@
198 }
199
200 pkg_setup() {
201 - if has_version '<=media-video/vlc-1.0.99999'; then
202 - eerror "Please unmerge vlc-1.0.x first before installing ${P}"
203 - eerror "If you don't do that, some plugins will get linked against"
204 - eerror "the old ${PN} version and will not work."
205 - die "Unmerge vlc 1.0.x first"
206 - fi
207 -
208 # Useflags we need to forcefuly enable
209 vlc_use_force remoteosd gcrypt
210 vlc_use_force gnutls gcrypt
Report Message
Find on MARC Find on Google Groups