dep/rdep fix, see bug 134555

(Portage version: 2.1.2_pre2-r1)

3 files changed, 18 insertions, 10 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 7a974b472e69..fbedc5fa721d 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.163 2006/09/11 17:55:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.164 2006/10/03 13:03:15 lu_zero Exp $
+
+  03 Oct 2006; Luca Barbato <lu_zero@gentoo.org>
+  ffmpeg-0.4.9_p20060530.ebuild, ffmpeg-0.4.9_p20060816.ebuild:
+  Fix deps, see bug #134555
 
   11 Sep 2006; Luca Barbato <lu_zero@gentoo.org>
   ffmpeg-0.4.9_p20060816.ebuild:
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
index 9d64a4cc9a6d..32d7680dc27c 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.20 2006/09/08 20:25:58 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060530.ebuild,v 1.21 2006/10/03 13:03:15 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -22,10 +22,9 @@ KEYWORDS="-* alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd" #~alpha ~arm ~hppa
 IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
 	test theora threads truetype v4l x264 xvid dts network zlib sdl"
 
-DEPEND="imlib? ( media-libs/imlib2 )
+RDEPEND="imlib? ( media-libs/imlib2 )
 	truetype? ( >=media-libs/freetype-2 )
 	sdl? ( >=media-libs/libsdl-1.2.1 )
-	doc? ( app-text/texi2html )
 	encode? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	vorbis? ( media-libs/libvorbis )
@@ -37,8 +36,11 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	dts? ( media-libs/libdts )
 	ieee1394? ( =media-libs/libdc1394-1*
 				sys-libs/libraw1394 )
+	x264? ( =media-libs/x264-svn-20060612 )"
+
+DEPEND="${RDEPEND}
 	test? ( net-misc/wget )
-	x264? ( =media-libs/x264-svn-20060612 )
+	doc? ( app-text/texi2html )
 	amr? ( app-arch/unzip )"
 
 src_unpack() {
diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
index bd94a13b38d1..999c19f2c6c8 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild,v 1.5 2006/09/11 17:55:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20060816.ebuild,v 1.6 2006/10/03 13:03:15 lu_zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -19,10 +19,9 @@ KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="aac altivec amr debug doc ieee1394 a52 encode imlib mmx ogg vorbis oss
 	test theora threads truetype v4l x264 xvid dts network zlib sdl"
 
-DEPEND="imlib? ( media-libs/imlib2 )
+RDEPEND="imlib? ( media-libs/imlib2 )
 	truetype? ( >=media-libs/freetype-2 )
 	sdl? ( >=media-libs/libsdl-1.2.10 )
-	doc? ( app-text/texi2html )
 	encode? ( media-sound/lame )
 	ogg? ( media-libs/libogg )
 	vorbis? ( media-libs/libvorbis )
@@ -33,8 +32,11 @@ DEPEND="imlib? ( media-libs/imlib2 )
 	dts? ( media-libs/libdts )
 	ieee1394? ( =media-libs/libdc1394-1*
 				sys-libs/libraw1394 )
+	x264? ( >=media-libs/x264-svn-20060810 )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/texi2html )
 	test? ( net-misc/wget )
-	x264? ( >=media-libs/x264-svn-20060810 )
 	amr? ( app-arch/unzip )"
 
 src_unpack() {
@@ -150,7 +152,7 @@ src_compile() {
 		"--cc=$(tc-getCC)" \
 		${myconf} || die "configure failed"
 
-	emake depend || die "depend failed"
+	emake -j1 depend || die "depend failed"
 	emake || die "make failed"
 }