rename opencore-amr useflag to amr, we should get rid of the old non free one

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6f3fd47701ed9ad25a37572ce809b271a8a435ae..63ba1c5f0c90a905a103258b3281c61a412657c6 100644 (file)
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.346 2010/04/12 09:42:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.347 2010/04/23 12:49:27 aballier Exp $
+
+  23 Apr 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+  rename opencore-amr useflag to amr, we should get rid of the old non free
+  one
 
 *ffmpeg-0.5_p22846 (12 Apr 2010)
 

diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index f25e37cfb8b71b5a7f9856406a3dd7c2ba123dde..73504fa9bbbcaffd8bb7891ac6705d7d6d8cb0de 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.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/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.31 2010/03/13 14:33:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.32 2010/04/23 12:49:27 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -27,7 +27,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
          doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
-         theora threads x264 xvid network zlib sdl X mp3 opencore-amr
+         theora threads x264 xvid network zlib sdl X mp3 amr
          oss pic schroedinger +hardcoded-tables bindist v4l v4l2
          speex +ssse3 jpeg2k vdpau"
 
@@ -53,7 +53,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
        dirac? ( media-video/dirac )
        gsm? ( >=media-sound/gsm-1.0.12-r1 )
        jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
-       opencore-amr? ( media-libs/opencore-amr )
+       amr? ( media-libs/opencore-amr )
        schroedinger? ( media-libs/schroedinger )
        speex? ( >=media-libs/speex-1.2_beta3 )
        jack? ( media-sound/jack-audio-connection-kit )
@@ -129,7 +129,7 @@ src_configure() {
        use threads && myconf="${myconf} --enable-pthreads"
 
        # Decoders
-       use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb
+       use amr && myconf="${myconf} --enable-libopencore-amrwb
                --enable-libopencore-amrnb"
        for i in gsm faad dirac schroedinger speex; do
                use $i && myconf="${myconf} --enable-lib$i"