Allow using older libav as well, for postproc.

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

4 files changed, 19 insertions, 15 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 5516d6b848e8..2f5469bfe5db 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.681 2012/05/22 16:36:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.682 2012/05/22 18:05:34 flameeyes Exp $
+
+  22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> xine-lib-1.2.1-r1.ebuild,
+  xine-lib-1.2.9999.ebuild:
+  Allow using older libav as well, for postproc.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.1-r1.ebuild,
   xine-lib-1.2.9999.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index d824a96bfabc..dde5be77effc 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,18 +5,18 @@ AUX xine-lib-1.2.1-ffmpeg-git.patch 2314 RMD160 28f004b6e231034b28eed95368668451
 AUX xine-lib-1.2.1-fix_dvb_crc_checking.patch 634 RMD160 d6a54d7db42b21a944968b03738b028179d38888 SHA1 2c788361b1ebf6e643313f1912e574847d719d05 SHA256 6c0695a9ac6fb5b7bfbe6940847ae96f8e9836c55a2a1409e20faba13b6ba465
 AUX xine-lib-1.2.1-freebsd.patch 727 RMD160 98b42d42d298b5376413455e7a81364aced09184 SHA1 70ce386503b9a873d94c4f79f3622a5444c1cc07 SHA256 fb354f40252f0931d022d38d1c391cb55a615f5007a63f55bade30b54fe0e44b
 DIST xine-lib-1.2.1.tar.xz 4843584 RMD160 3cc17c3194797395ea1d696fee1dfa2d8acf1ddf SHA1 ebb2648456504ff4ce08c34de258d3125832bb94 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e
-EBUILD xine-lib-1.2.1-r1.ebuild 5350 RMD160 f863432798278e99b81b8cc77e7d5b31bb5a44cd SHA1 e830c5c304f95c5ae50554a231184268778a5eeb SHA256 5678febee9a8a53018ba6aecf88c7885e296696fcbae685d54a8fcb552ac659f
-EBUILD xine-lib-1.2.9999.ebuild 5191 RMD160 84b45ad254804f164097259e553506082d8979c1 SHA1 cf258635603b15ad4fced9b0338196a49e3a147d SHA256 f3cd3e82a44349d82f9bd937f7e388a9e63db24c69dbf786cfb4fc04775acf77
-MISC ChangeLog 80151 RMD160 42c0e520d8a8c8b0da4e3632bea6425b6cd3244a SHA1 28bbf90b91c77cc158e281055cc1bbc121086bef SHA256 fdec4ccfac8d42093a5cdec71ae574dd0dce297cf32da76c6e05cdfdd9139d1d
+EBUILD xine-lib-1.2.1-r1.ebuild 5379 RMD160 dec4e72be7f443a5d11d50dc86a721510bb7d8ba SHA1 0111200c57833c24691b9563305fc34ace7b18c5 SHA256 2f2f2beb28df7b958dee6ca3f54110fa6b618fc8e80660f5604d1fb8b7dfb4d1
+EBUILD xine-lib-1.2.9999.ebuild 5219 RMD160 33c3167912289e1a2c8d800a1861689f408ba124 SHA1 a8f27e924324ec7cc0aa9d338efd373ed22b9a15 SHA256 532592f97decbb218892922c85862d8d7ad5dde4dda69a2adf682883d24792be
+MISC ChangeLog 80311 RMD160 26655a34f837c95a0c330ba5d1f795b9db0aba3d SHA1 86c18922f79732f0964c3d569923f533245be256 SHA256 637b8308d034b4eeb5b8cc1f10a5e9d59d913f07f7d50b969ba70429256003f6
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu7/IAAoJEEdUh39IaPFNaGQH/RcyW/Am7VwLgkvZbuNIxYfg
-Vc/mB9Lwa2HVG04eO2U1dDtePzAmxPRmKsByemY1Y3E9lcMObi6TMHtpPbXaKHJw
-Dj16u46JPx9EXkYK0g68sHB0zM3xY7MwwT5rBQqoVY2Zn0MGBJOAPiFze1LcHAW5
-qKOWdKyeD0yE+GgDTx1SVHVlzj+xWxtLmOtsXUGMmmaTJwNavfvXObID222FkVd5
-5c0MKYQz1g9DK5ILNNUq6QG9MpUOa4GLvW6UDrvstfDOGtxjVCi3vn9+x0DYJcqg
-RKSoTyhBb4hADOvHc/rwgzJIZUvibQtTveIkiRvnSMFvDhxKD8sxesxVgu39hmM=
-=2cgZ
+iQEcBAEBAgAGBQJPu9V3AAoJEBzRPIrUMBNCIlUH/j0ope/Geo55gD+drrgqaQKM
+xXHycmYaBDKxe8ptn4pTmVv5BCu401Dr9N3u8muCeStaQdTXmJTpBZVNUYqRTGY+
+DCg8tnyzkkYzpLRjb9+ZnASd8IZ++mV9iBgDOLn2mv34gG6fNf06MceWeqhAj9gF
+wzcWOlwVMNSPQbla/cBc5bdOMMRqUz7XGDbXFnpXJ3nICx5FocrRfyTQ6EmSteaR
+YBJoFRqqzfmURhs1fs/MMLnFW/viHtQn3gRarXofjDbHRhReIHmlYJvtLZ+X6Ruv
+CS2hIB4D0+tWKajqw/s8t8CcWjVgRBLJyO6jOgOyUOPtulM+AmEoHuKXDIgJVsE=
+=mEdp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
index e4e1512b602d..73c7c517a6f0 100644
--- a/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.9 2012/05/22 16:36:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild,v 1.10 2012/05/22 18:05:34 flameeyes Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac f
 RDEPEND="dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	sys-libs/zlib
-	|| ( media-video/ffmpeg media-libs/libpostproc )
+	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
 	virtual/ffmpeg
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 0cd58b32b351..4f2487ed55a0 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.14 2012/05/22 16:36:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.15 2012/05/22 18:05:34 flameeyes Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac f
 RDEPEND="dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	sys-libs/zlib
-	|| ( media-video/ffmpeg media-libs/libpostproc )
+	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
 	virtual/ffmpeg
 	virtual/libiconv
 	virtual/libintl