| 1 |
aballier 09/04/08 07:54:24 |
| 2 |
|
| 3 |
Modified: vlc-0.9.9999.ebuild vlc-0.9.9.ebuild ChangeLog |
| 4 |
vlc-9999.ebuild vlc-1.0.0_pre1.ebuild |
| 5 |
Log: |
| 6 |
Allow only qt >=4.4 and simplify qt deps; by Davide Pesavento <davidepesa@×××××.com>, bug #264974 |
| 7 |
(Portage version: 2.2_rc28/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 media-video/vlc/vlc-0.9.9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: vlc-0.9.9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- vlc-0.9.9999.ebuild 17 Mar 2009 07:57:14 -0000 1.2 |
| 23 |
+++ vlc-0.9.9999.ebuild 8 Apr 2009 07:54:24 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild,v 1.2 2009/03/17 07:57:14 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9999.ebuild,v 1.3 2009/04/08 07:54:24 aballier Exp $ |
| 29 |
|
| 30 |
EAPI="1" |
| 31 |
|
| 32 |
@@ -115,14 +115,14 @@ |
| 33 |
pda? ( x11-libs/gtk+:2 ) |
| 34 |
png? ( media-libs/libpng ) |
| 35 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) |
| 36 |
- qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 37 |
+ qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 38 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 39 |
samba? ( net-fs/samba ) |
| 40 |
schroedinger? ( >=media-libs/schroedinger-1.0 ) |
| 41 |
sdl? ( >=media-libs/libsdl-1.2.8 |
| 42 |
sdl-image? ( media-libs/sdl-image ) ) |
| 43 |
shout? ( media-libs/libshout ) |
| 44 |
- skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 45 |
+ skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 46 |
speex? ( media-libs/speex ) |
| 47 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
| 48 |
svga? ( media-libs/svgalib ) |
| 49 |
@@ -162,7 +162,7 @@ |
| 50 |
|
| 51 |
S="${WORKDIR}/${MY_P}" |
| 52 |
|
| 53 |
-# Dispalys a warning if the first use flag is set but not the second |
| 54 |
+# Displays a warning if the first use flag is set but the second is not |
| 55 |
vlc_use_needs() { |
| 56 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
| 57 |
} |
| 58 |
@@ -194,8 +194,8 @@ |
| 59 |
vlc_use_needs fontconfig truetype |
| 60 |
vlc_use_needs libv4l2 v4l2 |
| 61 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
| 62 |
- if ( use qt4 || use skins ) ; then |
| 63 |
- QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup |
| 64 |
+ if use qt4 || use skins ; then |
| 65 |
+ qt4_pkg_setup |
| 66 |
else |
| 67 |
ewarn "You have disabled the qt4 useflag, ${PN} will not have any" |
| 68 |
ewarn "graphical interface. Maybe that is not what you want..." |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.2 media-video/vlc/vlc-0.9.9.ebuild |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild?rev=1.2&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild?rev=1.2&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild?r1=1.1&r2=1.2 |
| 77 |
|
| 78 |
Index: vlc-0.9.9.ebuild |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild,v |
| 81 |
retrieving revision 1.1 |
| 82 |
retrieving revision 1.2 |
| 83 |
diff -u -r1.1 -r1.2 |
| 84 |
--- vlc-0.9.9.ebuild 4 Apr 2009 13:35:08 -0000 1.1 |
| 85 |
+++ vlc-0.9.9.ebuild 8 Apr 2009 07:54:24 -0000 1.2 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
# Copyright 1999-2009 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild,v 1.1 2009/04/04 13:35:08 aballier Exp $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.9.ebuild,v 1.2 2009/04/08 07:54:24 aballier Exp $ |
| 91 |
|
| 92 |
EAPI="1" |
| 93 |
|
| 94 |
@@ -115,14 +115,14 @@ |
| 95 |
pda? ( x11-libs/gtk+:2 ) |
| 96 |
png? ( media-libs/libpng ) |
| 97 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) |
| 98 |
- qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 99 |
+ qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 100 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 101 |
samba? ( net-fs/samba ) |
| 102 |
schroedinger? ( >=media-libs/schroedinger-1.0 ) |
| 103 |
sdl? ( >=media-libs/libsdl-1.2.8 |
| 104 |
sdl-image? ( media-libs/sdl-image ) ) |
| 105 |
shout? ( media-libs/libshout ) |
| 106 |
- skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 107 |
+ skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 108 |
speex? ( media-libs/speex ) |
| 109 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
| 110 |
svga? ( media-libs/svgalib ) |
| 111 |
@@ -162,7 +162,7 @@ |
| 112 |
|
| 113 |
S="${WORKDIR}/${MY_P}" |
| 114 |
|
| 115 |
-# Dispalys a warning if the first use flag is set but not the second |
| 116 |
+# Displays a warning if the first use flag is set but the second is not |
| 117 |
vlc_use_needs() { |
| 118 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
| 119 |
} |
| 120 |
@@ -194,8 +194,8 @@ |
| 121 |
vlc_use_needs fontconfig truetype |
| 122 |
vlc_use_needs libv4l2 v4l2 |
| 123 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
| 124 |
- if ( use qt4 || use skins ) ; then |
| 125 |
- QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup |
| 126 |
+ if use qt4 || use skins ; then |
| 127 |
+ qt4_pkg_setup |
| 128 |
else |
| 129 |
ewarn "You have disabled the qt4 useflag, ${PN} will not have any" |
| 130 |
ewarn "graphical interface. Maybe that is not what you want..." |
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.431 media-video/vlc/ChangeLog |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.431&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?rev=1.431&content-type=text/plain |
| 138 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/ChangeLog?r1=1.430&r2=1.431 |
| 139 |
|
| 140 |
Index: ChangeLog |
| 141 |
=================================================================== |
| 142 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 143 |
retrieving revision 1.430 |
| 144 |
retrieving revision 1.431 |
| 145 |
diff -u -r1.430 -r1.431 |
| 146 |
--- ChangeLog 4 Apr 2009 13:37:05 -0000 1.430 |
| 147 |
+++ ChangeLog 8 Apr 2009 07:54:24 -0000 1.431 |
| 148 |
@@ -1,6 +1,11 @@ |
| 149 |
# ChangeLog for media-video/vlc |
| 150 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 151 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.430 2009/04/04 13:37:05 aballier Exp $ |
| 152 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.431 2009/04/08 07:54:24 aballier Exp $ |
| 153 |
+ |
| 154 |
+ 08 Apr 2009; Alexis Ballier <aballier@g.o> vlc-0.9.9.ebuild, |
| 155 |
+ vlc-0.9.9999.ebuild, vlc-1.0.0_pre1.ebuild, vlc-9999.ebuild: |
| 156 |
+ Allow only qt >=4.4 and simplify qt deps; by Davide Pesavento |
| 157 |
+ <davidepesa@×××××.com>, bug #264974 |
| 158 |
|
| 159 |
04 Apr 2009; Alexis Ballier <aballier@g.o> -vlc-0.9.9_rc2.ebuild: |
| 160 |
remove rc |
| 161 |
|
| 162 |
|
| 163 |
|
| 164 |
1.5 media-video/vlc/vlc-9999.ebuild |
| 165 |
|
| 166 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.5&view=markup |
| 167 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.5&content-type=text/plain |
| 168 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.4&r2=1.5 |
| 169 |
|
| 170 |
Index: vlc-9999.ebuild |
| 171 |
=================================================================== |
| 172 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v |
| 173 |
retrieving revision 1.4 |
| 174 |
retrieving revision 1.5 |
| 175 |
diff -u -r1.4 -r1.5 |
| 176 |
--- vlc-9999.ebuild 17 Mar 2009 07:57:14 -0000 1.4 |
| 177 |
+++ vlc-9999.ebuild 8 Apr 2009 07:54:24 -0000 1.5 |
| 178 |
@@ -1,6 +1,6 @@ |
| 179 |
# Copyright 1999-2009 Gentoo Foundation |
| 180 |
# Distributed under the terms of the GNU General Public License v2 |
| 181 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.4 2009/03/17 07:57:14 aballier Exp $ |
| 182 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.5 2009/04/08 07:54:24 aballier Exp $ |
| 183 |
|
| 184 |
EAPI="1" |
| 185 |
|
| 186 |
@@ -114,14 +114,14 @@ |
| 187 |
pda? ( x11-libs/gtk+:2 ) |
| 188 |
png? ( media-libs/libpng ) |
| 189 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) |
| 190 |
- qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 191 |
+ qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 192 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 193 |
samba? ( net-fs/samba ) |
| 194 |
schroedinger? ( >=media-libs/schroedinger-1.0 ) |
| 195 |
sdl? ( >=media-libs/libsdl-1.2.8 |
| 196 |
sdl-image? ( media-libs/sdl-image ) ) |
| 197 |
shout? ( media-libs/libshout ) |
| 198 |
- skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 199 |
+ skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 200 |
speex? ( media-libs/speex ) |
| 201 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
| 202 |
svga? ( media-libs/svgalib ) |
| 203 |
@@ -163,7 +163,7 @@ |
| 204 |
|
| 205 |
S="${WORKDIR}/${MY_P}" |
| 206 |
|
| 207 |
-# Dispalys a warning if the first use flag is set but not the second |
| 208 |
+# Displays a warning if the first use flag is set but the second is not |
| 209 |
vlc_use_needs() { |
| 210 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
| 211 |
} |
| 212 |
@@ -195,8 +195,8 @@ |
| 213 |
vlc_use_needs fontconfig truetype |
| 214 |
vlc_use_needs libv4l2 v4l2 |
| 215 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
| 216 |
- if ( use qt4 || use skins ) ; then |
| 217 |
- QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup |
| 218 |
+ if use qt4 || use skins ; then |
| 219 |
+ qt4_pkg_setup |
| 220 |
else |
| 221 |
ewarn "You have disabled the qt4 useflag, ${PN} will not have any" |
| 222 |
ewarn "graphical interface. Maybe that is not what you want..." |
| 223 |
|
| 224 |
|
| 225 |
|
| 226 |
1.3 media-video/vlc/vlc-1.0.0_pre1.ebuild |
| 227 |
|
| 228 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild?rev=1.3&view=markup |
| 229 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild?rev=1.3&content-type=text/plain |
| 230 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild?r1=1.2&r2=1.3 |
| 231 |
|
| 232 |
Index: vlc-1.0.0_pre1.ebuild |
| 233 |
=================================================================== |
| 234 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild,v |
| 235 |
retrieving revision 1.2 |
| 236 |
retrieving revision 1.3 |
| 237 |
diff -u -r1.2 -r1.3 |
| 238 |
--- vlc-1.0.0_pre1.ebuild 29 Mar 2009 15:39:32 -0000 1.2 |
| 239 |
+++ vlc-1.0.0_pre1.ebuild 8 Apr 2009 07:54:24 -0000 1.3 |
| 240 |
@@ -1,6 +1,6 @@ |
| 241 |
# Copyright 1999-2009 Gentoo Foundation |
| 242 |
# Distributed under the terms of the GNU General Public License v2 |
| 243 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild,v 1.2 2009/03/29 15:39:32 solar Exp $ |
| 244 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0_pre1.ebuild,v 1.3 2009/04/08 07:54:24 aballier Exp $ |
| 245 |
|
| 246 |
EAPI="1" |
| 247 |
|
| 248 |
@@ -114,14 +114,14 @@ |
| 249 |
pda? ( x11-libs/gtk+:2 ) |
| 250 |
png? ( media-libs/libpng ) |
| 251 |
pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) |
| 252 |
- qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 253 |
+ qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 254 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 255 |
samba? ( net-fs/samba ) |
| 256 |
schroedinger? ( >=media-libs/schroedinger-1.0 ) |
| 257 |
sdl? ( >=media-libs/libsdl-1.2.8 |
| 258 |
sdl-image? ( media-libs/sdl-image ) ) |
| 259 |
shout? ( media-libs/libshout ) |
| 260 |
- skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) |
| 261 |
+ skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |
| 262 |
speex? ( media-libs/speex ) |
| 263 |
svg? ( >=gnome-base/librsvg-2.9.0 ) |
| 264 |
svga? ( media-libs/svgalib ) |
| 265 |
@@ -163,7 +163,7 @@ |
| 266 |
|
| 267 |
S="${WORKDIR}/${MY_P}" |
| 268 |
|
| 269 |
-# Dispalys a warning if the first use flag is set but not the second |
| 270 |
+# Displays a warning if the first use flag is set but the second is not |
| 271 |
vlc_use_needs() { |
| 272 |
use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled." |
| 273 |
} |
| 274 |
@@ -195,8 +195,8 @@ |
| 275 |
vlc_use_needs fontconfig truetype |
| 276 |
vlc_use_needs libv4l2 v4l2 |
| 277 |
use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled." |
| 278 |
- if ( use qt4 || use skins ) ; then |
| 279 |
- QT4_BUILT_WITH_USE_CHECK="png" qt4_pkg_setup |
| 280 |
+ if use qt4 || use skins ; then |
| 281 |
+ qt4_pkg_setup |
| 282 |
else |
| 283 |
ewarn "You have disabled the qt4 useflag, ${PN} will not have any" |
| 284 |
ewarn "graphical interface. Maybe that is not what you want..." |
Archives