synced media-video/ffmpeg with portage tree

3 files changed, 3 insertions, 25 deletions

diff --git a/metadata/cache/media-video/ffmpeg-0.4.9_p20090201-r1 b/metadata/cache/media-video/ffmpeg-0.4.9_p20090201-r1
deleted file mode 100644
index e138ee223..000000000
--- a/metadata/cache/media-video/ffmpeg-0.4.9_p20090201-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-vhook? ( >=media-libs/imlib2-1.4.0[lib32?] >=media-libs/freetype-2[lib32?] ) sdl? ( >=media-libs/libsdl-1.2.10[lib32?] ) alsa? ( media-libs/alsa-lib[lib32?] ) encode? ( aac? ( media-libs/faac[lib32?] ) mp3? ( media-sound/lame[lib32?] ) vorbis? ( media-libs/libvorbis[lib32?] media-libs/libogg[lib32?] ) theora? ( media-libs/libtheora[lib32?] media-libs/libogg[lib32?] ) x264? ( >=media-libs/x264-0.0.20081006[lib32?] ) xvid? ( >=media-libs/xvid-1.1.0[lib32?] ) ) aac? ( >=media-libs/faad2-2.6.1[lib32?] ) zlib? ( sys-libs/zlib[lib32?] ) ieee1394? ( media-libs/libdc1394[lib32?] sys-libs/libraw1394[lib32?] ) dirac? ( media-video/dirac[lib32?] ) gsm? ( >=media-sound/gsm-1.0.12-r1[lib32?] ) schroedinger? ( media-libs/schroedinger[lib32?] ) speex? ( >=media-libs/speex-1.2_beta3[lib32?] ) X? ( x11-libs/libX11[lib32?] x11-libs/libXext[lib32?] ) amr? ( media-libs/amrnb[lib32?] media-libs/amrwb[lib32?] ) >=sys-devel/make-3.81 mmx? ( dev-lang/yasm ) doc? ( app-text/texi2html ) test? ( net-misc/wget ) v4l? ( sys-kernel/linux-headers ) v4l2? ( sys-kernel/linux-headers ) sys-apps/abi-wrapper
-vhook? ( >=media-libs/imlib2-1.4.0[lib32?] >=media-libs/freetype-2[lib32?] ) sdl? ( >=media-libs/libsdl-1.2.10[lib32?] ) alsa? ( media-libs/alsa-lib[lib32?] ) encode? ( aac? ( media-libs/faac[lib32?] ) mp3? ( media-sound/lame[lib32?] ) vorbis? ( media-libs/libvorbis[lib32?] media-libs/libogg[lib32?] ) theora? ( media-libs/libtheora[lib32?] media-libs/libogg[lib32?] ) x264? ( >=media-libs/x264-0.0.20081006[lib32?] ) xvid? ( >=media-libs/xvid-1.1.0[lib32?] ) ) aac? ( >=media-libs/faad2-2.6.1[lib32?] ) zlib? ( sys-libs/zlib[lib32?] ) ieee1394? ( media-libs/libdc1394[lib32?] sys-libs/libraw1394[lib32?] ) dirac? ( media-video/dirac[lib32?] ) gsm? ( >=media-sound/gsm-1.0.12-r1[lib32?] ) schroedinger? ( media-libs/schroedinger[lib32?] ) speex? ( >=media-libs/speex-1.2_beta3[lib32?] ) X? ( x11-libs/libX11[lib32?] x11-libs/libXext[lib32?] ) amr? ( media-libs/amrnb[lib32?] media-libs/amrwb[lib32?] ) sys-apps/abi-wrapper
-0
-mirror://gentoo/ffmpeg-0.4.9-p20090201.tar.bz2
-
-http://ffmpeg.org/
-GPL-2
-Complete solution to record, convert and stream audio and video. Includes libavcodec. svn revision 16916
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-base eutils flag-o-matic multilib multilib-native portability toolchain-funcs
-+3dnow aac alsa altivec amr custom-cflags debug dirac doc ieee1394 +encode gsm ipv6 +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist v4l v4l2 speex +ssse3 vhook lib32
-
-
-
-1
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-video/ffmpeg-0.5-r1 b/metadata/cache/media-video/ffmpeg-0.5-r1
index 5169c6b21..6097046dd 100644
--- a/metadata/cache/media-video/ffmpeg-0.5-r1
+++ b/metadata/cache/media-video/ffmpeg-0.5-r1
@@ -6,7 +6,7 @@ http://ffmpeg.org/releases/ffmpeg-0.5.tar.bz2
 http://ffmpeg.org/
 GPL-2
 Complete solution to record, convert and stream audio and video. Includes libavcodec.
-alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
 base eutils flag-o-matic multilib multilib-native portability toolchain-funcs
 +3dnow +3dnowext alsa altivec amr custom-cflags debug dirac doc ieee1394 +encode faac faad gsm ipv6 +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist v4l v4l2 speex +ssse3 vhook jpeg2k lib32
 
diff --git a/metadata/cache/media-video/ffmpeg-9999-r1 b/metadata/cache/media-video/ffmpeg-9999-r1
index f1fd58a75..669ae59d9 100644
--- a/metadata/cache/media-video/ffmpeg-9999-r1
+++ b/metadata/cache/media-video/ffmpeg-9999-r1
@@ -4,11 +4,11 @@ sdl? ( >=media-libs/libsdl-1.2.10[lib32?] ) alsa? ( media-libs/alsa-lib[lib32?]
 
 
 http://ffmpeg.org/
-GPL-2
+GPL-3
 Complete solution to record, convert and stream audio and video. Includes libavcodec. live svn
 
 base eutils flag-o-matic multilib multilib-native portability subversion toolchain-funcs
-+3dnow +3dnowext alsa altivec amr cpudetection custom-cflags debug dirac doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 oss schroedinger +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k lib32
++3dnow +3dnowext alsa altivec amr cpudetection custom-cflags debug dirac doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2 speex +ssse3 jpeg2k lib32