disable tests without USE=encode, they fail if it is not enabled

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

4 files changed, 29 insertions, 17 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 1c8c7c10c3c6..4cac4191e5b3 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.309 2009/09/07 08:11:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.310 2009/09/07 08:52:08 aballier Exp $
+
+  07 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  ffmpeg-0.5_p19787.ebuild, ffmpeg-9999-r1.ebuild:
+  disable tests without USE=encode, they fail if it is not enabled
 
   07 Sep 2009; Alexis Ballier <aballier@gentoo.org>
   ffmpeg-0.5_p19787.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 0fccb6b1d20e..02e78356dcf9 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
 DIST ffmpeg-0.5_p19787.tar.bz2 3058617 RMD160 521fbaeb8cf332fb255688b106ab6e3a030f19c3 SHA1 2117cd07423dc54eca15bc54b31fa67d6c926ea6 SHA256 7610ee7a13586ce087a2fa2c8f7345914f5bed7aec4ad213ca004f45791a66d2
 EBUILD ffmpeg-0.5-r1.ebuild 6549 RMD160 7d3dc6f710b1944022c6a607737ea8be4e0b7385 SHA1 23b88211d4e61f9b49c7b8a3a1f85ed1616cf1b8 SHA256 83d0453256174cd98f8d7fbc0c8fca48f1b0ddd681e5345a796af1c0350668d9
-EBUILD ffmpeg-0.5_p19787.ebuild 7501 RMD160 302dbcca808cb1ae5f34c0e0c9da27afb1e74300 SHA1 30df6ff3bae2ab9f147268cc20209e7c6c7a0662 SHA256 dfc7f779073d5f0dd57d80bdb4fe3cdfd95b59327265ede25220621d7dfbcbb4
-EBUILD ffmpeg-9999-r1.ebuild 7458 RMD160 d48c5d5f4af5e8aaac42e84d5f384005e05030ca SHA1 9af3ba5b92e77e5d4d02689198ba4e7ac9103f74 SHA256 31bb4259ab87afc69dc20f04e737b2e6f916cda1bfd8e0dc909af49edc494661
-MISC ChangeLog 47101 RMD160 73374bdb6d6a272424438ead70a7eca1043bc673 SHA1 af5b33cae6e167826356f1223e289d77614cedc4 SHA256 1c459cda9e3d3b68f70caf7b4d27fea6b4d283dcf2168d12472ab6dec6080c24
+EBUILD ffmpeg-0.5_p19787.ebuild 7587 RMD160 54d32e2b9ecc78992674240aae4e54dc32efa72d SHA1 e1086c9987661e27f534cb7f10be0e8e1e0cf83d SHA256 0a02d131afd89beec529638a39564f7048f160712ea639e8a91a5ecdb051e836
+EBUILD ffmpeg-9999-r1.ebuild 7544 RMD160 2e271d4e4370cae71f0e5311a7e7db0993dfd848 SHA1 86433b0951c95ce1346500c141b74ecdb6f25eae SHA256 12cf64b360ee9cbae0ed68cb673f119dc6ca808f2bdb3950aca2891d352fb314
+MISC ChangeLog 47272 RMD160 d83b7dbbd46d2bddd9f7236d824ace723045d3a0 SHA1 a5f98733f5a74bbcd95c187abe0023eb70b1364e SHA256 5b7306b37ea956822dbed715f7eb05be9ca6605e792f024e5d69f97989e4e37c
 MISC metadata.xml 1789 RMD160 84a7ab72fdc26957a4040bf7d6b1f7a823b38e17 SHA1 8c8db893db07715bec78bd1b36c385c85b4fe3a0 SHA256 f250a28df71c2fb2b067cd6b274c4f36d4df33fee77ebb2a35d1e57fcf38a1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqkwEwACgkQvFcC4BYPU0qokgCgs+fmLH+2Br1UbqlK7Q86cdX3
-ihcAn1RQkEpiyXZT4WZVoOyvt5tSmZ6u
-=GYLr
+iEYEARECAAYFAkqkyb4ACgkQvFcC4BYPU0ojGACfbozO+S2ZU/L7Z92RkCrDvT7U
+QxYAni4jk+chD5RlFILD5CNd5/uTdWer
+=+HED
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.5_p19787.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p19787.ebuild
index ce0e08bd9265..e89a9295a80b 100644
--- a/media-video/ffmpeg/ffmpeg-0.5_p19787.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.5_p19787.ebuild
@@ -1,6 +1,6 @@
 # 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_p19787.ebuild,v 1.2 2009/09/07 08:11:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p19787.ebuild,v 1.3 2009/09/07 08:52:08 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -239,8 +239,12 @@ src_install() {
 }
 
 src_test() {
-	for t in codectest lavftest seektest ; do
-		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-			emake ${t} || die "Some tests in ${t} failed"
-	done
+	if use encode ; then
+		for t in codectest lavftest seektest ; do
+			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+				emake ${t} || die "Some tests in ${t} failed"
+		done
+	else
+		ewarn "Tests fail without USE=encode, skipping"
+	fi
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 2ce5b9d84f36..7444124cb11d 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.18 2009/09/06 10:10:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.19 2009/09/07 08:52:08 aballier Exp $
 
 EAPI=2
 SCM=""
@@ -239,8 +239,12 @@ src_install() {
 }
 
 src_test() {
-	for t in codectest lavftest seektest ; do
-		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-			emake ${t} || die "Some tests in ${t} failed"
-	done
+	if use encode ; then
+		for t in codectest lavftest seektest ; do
+			LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+				emake ${t} || die "Some tests in ${t} failed"
+		done
+	else
+		ewarn "Tests fail without USE=encode, skipping"
+	fi
 }