disable tests and let faac and voaacenc built together

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 17 insertions, 11 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index b3a9eb5a0b3a..a19464e376a9 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.25 2011/08/18 08:50:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.26 2011/08/18 09:40:05 lu_zero Exp $
+
+  18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild,
+  libav-9999.ebuild:
+  disable tests and let faac and voaacenc built together
 
   18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild:
   Switch to local permanent url
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 11682bad724e..a6a24ffb3142 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -11,7 +11,7 @@ EBUILD libav-0.7.1.ebuild 7873 RMD160 98a03f45525fe50862ba4943761b3e4c5b7a744e S
 EBUILD libav-0.7.9999.ebuild 7877 RMD160 709893a83b97100e838189bc02ea2da2126a0902 SHA1 e4636b730d92f9b4e0f60147ee6affb8c41c087d SHA256 2c3fa367dca324e2607aa9201bdf084c1e394564ee7c0e26031a88ded9c1d501
 EBUILD libav-0.7.ebuild 7872 RMD160 ec8b8142e994b6e32a69fcb7dee967bd54f6fa3e SHA1 369a3626a64a0b6867a2521aa34424124d6ad58b SHA256 4b88265a90f40a9eef8bb803710822c53d39a254184bf5c344763c4181a00fa9
 EBUILD libav-0.7_pre20110327.ebuild 7599 RMD160 9a944d8b477ca204c6273c415e0e05d664cb3347 SHA1 7efdc9795b64432c98036856ce0b50c37ba25115 SHA256 142caaad04431a584457b425d232dadecc79e358900e7ca03518c99101c75d67
-EBUILD libav-0.8_pre20110818.ebuild 8295 RMD160 bd1653f9e21a7f59e2d8d8c70e8e54ec54e28dec SHA1 ec8ba4f8a9175bd1d0d9578b525b5bcc5ed5b59e SHA256 ee54c9386383c6a8cb27c29b1a069e7b0954b7a40532f0b19840bfe2e6c4ba73
-EBUILD libav-9999.ebuild 8264 RMD160 90682d52805a3cae54115c7df6dd7bbc7bb87867 SHA1 e9080a481f251b09c3158bd70d8c9b13f8e05272 SHA256 4f081d0226dc8c5b267a4339f885ed9b7042a6f08f036c6a511f8316b827e5ad
-MISC ChangeLog 4276 RMD160 df68d581a2015c526c8cb4622d207c87cc80cd94 SHA1 3ab6e9a500aaa3947af765f0800346428d560513 SHA256 4d6a222105d9388c7bb9ca092561da4ec33e51066497ca1435ce84910acafe01
+EBUILD libav-0.8_pre20110818.ebuild 8292 RMD160 5b9396cc254b3eaa00c61b35962411b7c2449651 SHA1 8e176495c1edb42d5d703c95bc356ecb2c552e26 SHA256 638de98830ee7e6a3a86049013d30bff97f731a6ac749e3d1db66f6a25d7645d
+EBUILD libav-9999.ebuild 8282 RMD160 410360e2eb76ce853540517079b71d31ee0d280d SHA1 156cc24ae3bfad7d425f619afaafdf853907b1ae SHA256 06881e880c0a3d3e6673a35d51a7630070f282188480c7116763fbd84f4ecf9e
+MISC ChangeLog 4434 RMD160 d93e958fde3b8ce24fb308fa255df571b43a1300 SHA1 1b69070f4786534a8b1b714d05f1d9cea852f843 SHA256 06e576c346cc0fa336a5b79dce93e6494d415982daaf807d772bdf8b3d7ad9ef
 MISC metadata.xml 2343 RMD160 beadccfc0b455869a2810504ee185f622de04961 SHA1 421b87ca6c05fbde61a429dee1c90dcb88e7751a SHA256 daf4da36c94dbd7dd4e44dc643dda9420bafcec1824014ecdcb5c9067d5096b7
diff --git a/media-video/libav/libav-0.8_pre20110818.ebuild b/media-video/libav/libav-0.8_pre20110818.ebuild
index 88435de2d58c..ad4d0bedbc89 100644
--- a/media-video/libav/libav-0.8_pre20110818.ebuild
+++ b/media-video/libav/libav-0.8_pre20110818.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/libav/libav-0.8_pre20110818.ebuild,v 1.2 2011/08/18 08:50:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.3 2011/08/18 09:40:05 lu_zero Exp $
 
 EAPI=4
 
@@ -80,11 +80,12 @@ DEPEND="${RDEPEND}
 
 # faac can't be binary distributed
 # faac and aac are concurent implementations
-# amr and aac require gpl
+# amr and aac require at least lgpl3
 REQUIRED_USE="bindist? ( !faac )
-	faac? ( !aac ) aac? ( !faac )
 	amr? ( gpl ) aac? ( gpl )"
 
+RESTRICT="test"
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 8cd7dd4ceaa3..9ae3fe9f6529 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-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/libav/libav-9999.ebuild,v 1.15 2011/08/18 08:21:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.16 2011/08/18 09:40:05 lu_zero Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
 else # Official release
 	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
 fi
@@ -80,11 +80,12 @@ DEPEND="${RDEPEND}
 
 # faac can't be binary distributed
 # faac and aac are concurent implementations
-# amr and aac require gpl
+# amr and aac require at least lgpl3
 REQUIRED_USE="bindist? ( !faac )
-	faac? ( !aac ) aac? ( !faac )
 	amr? ( gpl ) aac? ( gpl )"
 
+RESTRICT="test"
+
 src_prepare() {
 	# if we have snapshot then we need to hardcode the version
 	if [[ ${PV%_p*} != ${PV} ]]; then