summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2010-06-25 11:30:50 +0000
committerAlexis Ballier <aballier@gentoo.org>2010-06-25 11:30:50 +0000
commit64b66ae9a561119fb9341c23115ab79d30b455dd (patch)
tree99a4eca355af79b371bb51ca601d4675cbca12ea /media-video
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-64b66ae9a561119fb9341c23115ab79d30b455dd.tar.gz
gentoo-2-64b66ae9a561119fb9341c23115ab79d30b455dd.tar.bz2
gentoo-2-64b66ae9a561119fb9341c23115ab79d30b455dd.zip
cosmetics
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/vlc-1.1.0.ebuild18
-rw-r--r--media-video/vlc/vlc-1.1.9999.ebuild18
-rw-r--r--media-video/vlc/vlc-9999.ebuild18
3 files changed, 18 insertions, 36 deletions
diff --git a/media-video/vlc/vlc-1.1.0.ebuild b/media-video/vlc/vlc-1.1.0.ebuild
index 3eeb5264ed8f..4f4a265a9d21 100644
--- a/media-video/vlc/vlc-1.1.0.ebuild
+++ b/media-video/vlc/vlc-1.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.5 2010/06/25 09:18:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.0.ebuild,v 1.6 2010/06/25 11:30:50 aballier Exp $
EAPI="2"
@@ -67,16 +67,14 @@ RDEPEND="
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1
- >=media-libs/libdc1394-2.0.2 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
dirac? ( >=media-video/dirac-0.10.0 )
directfb? ( dev-libs/DirectFB sys-libs/zlib )
dts? ( media-libs/libdca )
dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
elibc_glibc? ( >=sys-libs/glibc-2.8 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
- flac? ( media-libs/libogg
- >=media-libs/flac-1.1.2 )
+ flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
fluidsynth? ( media-sound/fluidsynth )
fontconfig? ( media-libs/fontconfig )
gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
@@ -95,9 +93,7 @@ RDEPEND="
lirc? ( app-misc/lirc )
live? ( >=media-plugins/live-2008.07.06 )
lua? ( >=dev-lang/lua-5.1 )
- matroska? (
- >=dev-libs/libebml-0.7.6
- >=media-libs/libmatroska-0.8.0 )
+ matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
modplug? ( >=media-libs/libmodplug-0.8 )
mp3? ( media-libs/libmad )
mpeg? ( >=media-libs/libmpeg2-0.3.2 )
@@ -113,8 +109,7 @@ RDEPEND="
!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <net-fs/samba-3.4 ) )
+ samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
schroedinger? ( >=media-libs/schroedinger-1.0.6 )
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
@@ -130,8 +125,7 @@ RDEPEND="
svga? ( media-libs/svgalib )
taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
theora? ( >=media-libs/libtheora-1.0_beta3 )
- truetype? ( media-libs/freetype
- media-fonts/dejavu )
+ truetype? ( media-libs/freetype media-fonts/dejavu )
twolame? ( media-sound/twolame )
udev? ( >=sys-fs/udev-142 )
upnp? ( net-libs/libupnp )
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 4d742dc17a29..b2c01115b3a4 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.11 2010/06/25 09:18:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.12 2010/06/25 11:30:50 aballier Exp $
EAPI="2"
@@ -67,16 +67,14 @@ RDEPEND="
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1
- >=media-libs/libdc1394-2.0.2 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
dirac? ( >=media-video/dirac-0.10.0 )
directfb? ( dev-libs/DirectFB sys-libs/zlib )
dts? ( media-libs/libdca )
dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
elibc_glibc? ( >=sys-libs/glibc-2.8 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
- flac? ( media-libs/libogg
- >=media-libs/flac-1.1.2 )
+ flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
fluidsynth? ( media-sound/fluidsynth )
fontconfig? ( media-libs/fontconfig )
gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
@@ -95,9 +93,7 @@ RDEPEND="
lirc? ( app-misc/lirc )
live? ( >=media-plugins/live-2008.07.06 )
lua? ( >=dev-lang/lua-5.1 )
- matroska? (
- >=dev-libs/libebml-0.7.6
- >=media-libs/libmatroska-0.8.0 )
+ matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
modplug? ( >=media-libs/libmodplug-0.8 )
mp3? ( media-libs/libmad )
mpeg? ( >=media-libs/libmpeg2-0.3.2 )
@@ -113,8 +109,7 @@ RDEPEND="
!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <net-fs/samba-3.4 ) )
+ samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
schroedinger? ( >=media-libs/schroedinger-1.0.6 )
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
@@ -130,8 +125,7 @@ RDEPEND="
svga? ( media-libs/svgalib )
taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
theora? ( >=media-libs/libtheora-1.0_beta3 )
- truetype? ( media-libs/freetype
- media-fonts/dejavu )
+ truetype? ( media-libs/freetype media-fonts/dejavu )
twolame? ( media-sound/twolame )
udev? ( >=sys-fs/udev-142 )
upnp? ( net-libs/libupnp )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 21438b63867d..e60349f4097d 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.78 2010/06/25 09:18:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.79 2010/06/25 11:30:50 aballier Exp $
EAPI="2"
@@ -67,16 +67,14 @@ RDEPEND="
bidi? ( >=dev-libs/fribidi-0.10.4 )
cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
dbus? ( >=sys-apps/dbus-1.0.2 )
- dc1394? ( >=sys-libs/libraw1394-2.0.1
- >=media-libs/libdc1394-2.0.2 )
+ dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
dirac? ( >=media-video/dirac-0.10.0 )
directfb? ( dev-libs/DirectFB sys-libs/zlib )
dts? ( media-libs/libdca )
dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
elibc_glibc? ( >=sys-libs/glibc-2.8 )
ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
- flac? ( media-libs/libogg
- >=media-libs/flac-1.1.2 )
+ flac? ( media-libs/libogg >=media-libs/flac-1.1.2 )
fluidsynth? ( media-sound/fluidsynth )
fontconfig? ( media-libs/fontconfig )
gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
@@ -95,9 +93,7 @@ RDEPEND="
lirc? ( app-misc/lirc )
live? ( >=media-plugins/live-2008.07.06 )
lua? ( >=dev-lang/lua-5.1 )
- matroska? (
- >=dev-libs/libebml-0.7.6
- >=media-libs/libmatroska-0.8.0 )
+ matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 )
modplug? ( >=media-libs/libmodplug-0.8 )
mp3? ( media-libs/libmad )
mpeg? ( >=media-libs/libmpeg2-0.3.2 )
@@ -113,8 +109,7 @@ RDEPEND="
!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <net-fs/samba-3.4 ) )
+ samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
schroedinger? ( >=media-libs/schroedinger-1.0.6 )
sdl? ( >=media-libs/libsdl-1.2.8
sdl-image? ( media-libs/sdl-image sys-libs/zlib ) )
@@ -130,8 +125,7 @@ RDEPEND="
svga? ( media-libs/svgalib )
taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
theora? ( >=media-libs/libtheora-1.0_beta3 )
- truetype? ( media-libs/freetype
- media-fonts/dejavu )
+ truetype? ( media-libs/freetype media-fonts/dejavu )
twolame? ( media-sound/twolame )
udev? ( >=sys-fs/udev-142 )
upnp? ( net-libs/libupnp )