dep/rdep fix, see bug 134555

Package-Manager: portage-2.1.2_pre2-r1

4 files changed, 30 insertions, 22 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/Manifest b/media-video/ffmpeg/Manifest
index a1f1270f9c91..df7b29685adf 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -66,18 +66,18 @@ EBUILD ffmpeg-0.4.9_p20060517.ebuild 7718 RMD160 94f1ed3aaa88d7595b36c1265862bb5
 MD5 587e561ad1ae6e62cc1453690819d25c ffmpeg-0.4.9_p20060517.ebuild 7718
 RMD160 94f1ed3aaa88d7595b36c1265862bb5cb469f166 ffmpeg-0.4.9_p20060517.ebuild 7718
 SHA256 c6b9c00d45c4c630e7ad9c9f909ca29afe2065b382b43a5c580111d24fa97dab ffmpeg-0.4.9_p20060517.ebuild 7718
-EBUILD ffmpeg-0.4.9_p20060530.ebuild 7523 RMD160 524b0d99e24a74ebe3ebe6503aaa6ae81e6775d4 SHA1 8babe5a46be0ae89edced95f859f7a6714b95b6d SHA256 4497767eea0736623e5040b9ae65769fa624ee6f2e9f2724980c021c1ef84809
-MD5 ecf285409f1add761b407914a4173946 ffmpeg-0.4.9_p20060530.ebuild 7523
-RMD160 524b0d99e24a74ebe3ebe6503aaa6ae81e6775d4 ffmpeg-0.4.9_p20060530.ebuild 7523
-SHA256 4497767eea0736623e5040b9ae65769fa624ee6f2e9f2724980c021c1ef84809 ffmpeg-0.4.9_p20060530.ebuild 7523
-EBUILD ffmpeg-0.4.9_p20060816.ebuild 5509 RMD160 95e11f0fae38ae25a75b7ae953915b31241a8424 SHA1 efc264afa7e9cc6b303f6c777f69aeb53d75692e SHA256 12fc50b281a429efdf333cb800f15a134bf494edd86985f04a4ee5ae711a1af9
-MD5 ae89d85add502c22477016cbb3f83167 ffmpeg-0.4.9_p20060816.ebuild 5509
-RMD160 95e11f0fae38ae25a75b7ae953915b31241a8424 ffmpeg-0.4.9_p20060816.ebuild 5509
-SHA256 12fc50b281a429efdf333cb800f15a134bf494edd86985f04a4ee5ae711a1af9 ffmpeg-0.4.9_p20060816.ebuild 5509
-MISC ChangeLog 24551 RMD160 34204793206a34bff9200c2c462a8402bbadf569 SHA1 4884506489a653f56332ed1822b1687bb02ffb2b SHA256 bc96b8071fd6cc1d61ed8d7d7c464907b611afca94b4133b2ddf1a26f97c36fd
-MD5 a29d5007aa3c29d1ae66d69faf3a8377 ChangeLog 24551
-RMD160 34204793206a34bff9200c2c462a8402bbadf569 ChangeLog 24551
-SHA256 bc96b8071fd6cc1d61ed8d7d7c464907b611afca94b4133b2ddf1a26f97c36fd ChangeLog 24551
+EBUILD ffmpeg-0.4.9_p20060530.ebuild 7543 RMD160 7744899449aeed8545b81fdefcc9b913e179fda3 SHA1 e3e3bb4fc625f1a1c320d77060e26dccde8261ff SHA256 0ff68342e641d345202812d0594a13684d5b93ff7568a8b8300ff1e1311b12a3
+MD5 55eaff18aa5568f4956d3ad6b9e33548 ffmpeg-0.4.9_p20060530.ebuild 7543
+RMD160 7744899449aeed8545b81fdefcc9b913e179fda3 ffmpeg-0.4.9_p20060530.ebuild 7543
+SHA256 0ff68342e641d345202812d0594a13684d5b93ff7568a8b8300ff1e1311b12a3 ffmpeg-0.4.9_p20060530.ebuild 7543
+EBUILD ffmpeg-0.4.9_p20060816.ebuild 5535 RMD160 53617589539a993da866f151c2d46fd7c35df62e SHA1 f93725a8e40ab0204ad33dab0b7ce3312ebd71f4 SHA256 35e9f61ee732c6cc6a5c62b2e0b2df37f4d22e3b24527e0f1d4f5167604c21d4
+MD5 3a46efe772823ca62a14382e52512a1c ffmpeg-0.4.9_p20060816.ebuild 5535
+RMD160 53617589539a993da866f151c2d46fd7c35df62e ffmpeg-0.4.9_p20060816.ebuild 5535
+SHA256 35e9f61ee732c6cc6a5c62b2e0b2df37f4d22e3b24527e0f1d4f5167604c21d4 ffmpeg-0.4.9_p20060816.ebuild 5535
+MISC ChangeLog 24693 RMD160 6b2c60f2e12747f574a1b8fcf2e68cab3a2a08c8 SHA1 3e34202f841103ebf296e516f4a5fe04c9573190 SHA256 60f7d141da6dce11ee77e958b45fc74fdee64f244b1e859a1d5759126d25cd95
+MD5 44e64d4d5008d89d5963395b8734d7e1 ChangeLog 24693
+RMD160 6b2c60f2e12747f574a1b8fcf2e68cab3a2a08c8 ChangeLog 24693
+SHA256 60f7d141da6dce11ee77e958b45fc74fdee64f244b1e859a1d5759126d25cd95 ChangeLog 24693
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
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"
 }