tests depend on encode and zlib, use eapi4 use constraints for this, fixes bug #356691

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 22 insertions, 23 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index f47da60dc46d..134f70d218e9 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.513 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.514 2011/12/17 13:42:47 aballier Exp $
+
+  17 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
+  ffmpeg-9999.ebuild:
+  tests depend on encode and zlib, use eapi4 use constraints for this, fixes
+  bug #356691
 
   15 Dec 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.9.ebuild,
   ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 204e9a244f13..97a958b8dc7e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,14 +9,14 @@ DIST ffmpeg-0.9.tar.bz2 4954965 RMD160 56e1e240363d4f1bc09390f5a3893a1b6b362908
 EBUILD ffmpeg-0.7.7.ebuild 8434 RMD160 64ae02f0921dcb59c8850d102fd36be8b83d3ea4 SHA1 a04df51a15709a9b669b8e1ff8e4e7582fce6949 SHA256 2530241330f21149e401ec15fc448acfcbcd5b16b728ae0624dba422b449947f
 EBUILD ffmpeg-0.7.8.ebuild 8436 RMD160 34282efc2ce033b2015a7916975a14eb493d52e5 SHA1 27a7721fb83ee62e7a0eb36bdbe773cf442c67f1 SHA256 3f34e02690bd4f56e4562d223226375ae19eabfa4ca52a29e2d43f828b972318
 EBUILD ffmpeg-0.8.7.ebuild 8020 RMD160 7d2e2c1cf5de1f0d7e6af73d4c631705a45c47fb SHA1 02f250e6951e918eb1089a29a65c5dfade548835 SHA256 156ac6a17e91c52d8df28a2a71c77b6ad518da9a727c3416bee1df35777963e4
-EBUILD ffmpeg-0.9.ebuild 8252 RMD160 5909408cf5ca2785a6e984f0596620ea9d005572 SHA1 f9a8cf7a03409f7af7c33aedef09e5830caf4a14 SHA256 04022de0c3c8f1c296a009783bf6fc789d74bab925a8d5285873507056772bef
-EBUILD ffmpeg-9999.ebuild 8353 RMD160 f7a5014e034d26c0d6bbcb9b407959f6d646c9b0 SHA1 bbb853cb33f2a65840f758f617f33bc753096522 SHA256 03b8b954d7094d41ba699202cff43ad2c956ca169f76a47a4fe6b69ac51eb34d
-MISC ChangeLog 73586 RMD160 b9cb3ac50ec06743479e824dc995601dde7487d3 SHA1 e02e69bc83715da2e4b739145d3dd26fe11ad1a1 SHA256 a8a2fe22be84da62f612b43daeba63cb4656a45ea8e2d6c77df2ddb26965269e
+EBUILD ffmpeg-0.9.ebuild 8191 RMD160 8004c7cbb9fcc53742eb3077178603c3e37e67ff SHA1 2d3f1879fd3f49dee947a8200751f8b273958720 SHA256 1a64a0653a74fda2533d361eece0e9531e752f7961c5b6fe21d902923f3ebe7a
+EBUILD ffmpeg-9999.ebuild 8292 RMD160 f5b1f87b3ae5fec708cc37dea778b28bd3b36872 SHA1 cb7116d596a1ed96a821b4d33590f170a41e2ed9 SHA256 63dc82c59d36849f074bb04b0a5ff3beb0c6d2745883a1709486f600106f72f5
+MISC ChangeLog 73771 RMD160 bdb4502790b311af39882c2ca3e92e29c274a4f0 SHA1 de97723a51923bfd65bebb51323341b637dc994f SHA256 6e93377cd1e1b0af244977671ac6c7fb8e4b8f0c9f2731ef78e43ddd4e51f4c5
 MISC metadata.xml 3263 RMD160 ed08dcb856aa893e6894af80e42a96c1d34c9480 SHA1 ac8765c4e770098d8b8fddcd1d5f5b16a780ed52 SHA256 d76cb7c21391eb41646c312c30a2ee34242ac6d00cb1d3656f2e44aa3f0f3013
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7p4u4ACgkQvFcC4BYPU0qBEwCfcaggR22b6/1d6Hki6ZbDV12d
-QG8An15+I9An9dZ5fc+VKbs6meRQ3zVS
-=QdhC
+iEYEARECAAYFAk7snF0ACgkQvFcC4BYPU0qh9ACgw+HNAeDQFhCpKSVeFAEr+s/Z
+UycAoIdvN6hvCbum8OWi8dTx54HirFmM
+=CkgS
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.9.ebuild b/media-video/ffmpeg/ffmpeg-0.9.ebuild
index a49236b6c47d..767f83b56cf3 100644
--- a/media-video/ffmpeg/ffmpeg-0.9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.2 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.9.ebuild,v 1.3 2011/12/17 13:42:47 aballier Exp $
 
 EAPI="4"
 
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND}
 "
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )"
+	libv4l? ( v4l )
+	test? ( encode zlib )"
 
 S=${WORKDIR}/${P/_/-}
 
@@ -264,10 +265,6 @@ src_install() {
 }
 
 src_test() {
-	if use encode ; then
-		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-			emake fate
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate
 }
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 39dae26a6184..503c6137652b 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.75 2011/12/15 12:07:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.76 2011/12/17 13:42:47 aballier Exp $
 
 EAPI="4"
 
@@ -102,7 +102,8 @@ DEPEND="${RDEPEND}
 "
 # faac is license-incompatible with ffmpeg
 REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
-	libv4l? ( v4l )"
+	libv4l? ( v4l )
+	test? ( encode zlib )"
 
 S=${WORKDIR}/${P/_/-}
 
@@ -266,10 +267,6 @@ src_install() {
 }
 
 src_test() {
-	if use encode ; then
-		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
-			emake fate
-	else
-		ewarn "Tests fail without USE=encode, skipping"
-	fi
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate
 }