eapi2ify and depend on libtheora[encode] when needed, reported by remi

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 17 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c0fab24ec415..9a3aa24038f1 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.290 2009/05/21 19:02:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.291 2009/06/10 08:51:35 aballier Exp $
+
+  10 Jun 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.5-r1.ebuild,
+  ffmpeg-9999-r1.ebuild:
+  eapi2ify and depend on libtheora[encode] when needed, reported by remi
 
   21 May 2009; Brent Baude <ranger@gentoo.org> ffmpeg-0.5-r1.ebuild:
   Marking ffmpeg-0.5-r1 ppc64 stable for bug 266986
diff --git a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
index 911832e79468..44a15c8d9d20 100644
--- a/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.10 2009/05/21 19:02:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5-r1.ebuild,v 1.11 2009/06/10 08:51:35 aballier Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ RDEPEND="vhook? ( >=media-libs/imlib2-1.4.0 >=media-libs/freetype-2 )
 			)
 		)
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		theora? ( media-libs/libtheora media-libs/libogg )
+		theora? ( media-libs/libtheora[encode] media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 	v4l2? ( sys-kernel/linux-headers )"
 
-src_compile() {
+src_configure() {
 	local myconf="${EXTRA_ECONF}"
 
 	# enabled by default
@@ -180,7 +180,9 @@ src_compile() {
 		--enable-static --enable-shared \
 		--cc="$(tc-getCC)" \
 		${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake version.h || die #252269
 	emake || die "make failed"
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 8c4f0ccf9cfd..14c23f5271b4 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 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.1 2009/05/02 01:29:15 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.2 2009/06/10 08:51:35 aballier Exp $
 
-EAPI=1
+EAPI=2
 
 ESVN_REPO_URI="svn://svn.mplayerhq.hu/ffmpeg/trunk"
 
@@ -26,7 +26,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 )
 		faac? ( media-libs/faac )
 		mp3? ( media-sound/lame )
 		vorbis? ( media-libs/libvorbis media-libs/libogg )
-		theora? ( media-libs/libtheora media-libs/libogg )
+		theora? ( media-libs/libtheora[encode] media-libs/libogg )
 		x264? ( >=media-libs/x264-0.0.20081006 )
 		xvid? ( >=media-libs/xvid-1.1.0 ) )
 	faad? ( >=media-libs/faad2-2.6.1 )
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	v4l? ( sys-kernel/linux-headers )
 	v4l2? ( sys-kernel/linux-headers )"
 
-src_compile() {
+src_configure() {
 	local myconf="${EXTRA_ECONF}"
 
 	# enabled by default
@@ -175,7 +175,9 @@ src_compile() {
 		--enable-static --enable-shared \
 		--cc="$(tc-getCC)" \
 		${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake version.h || die #252269
 	emake || die "make failed"
 }