Allow using older libav as well, for postproc.

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

6 files changed, 18 insertions, 10 deletions

diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog
index fcf4adae15cd..9c4d2e0ca66d 100644
--- a/media-video/ffmpeg2theora/ChangeLog
+++ b/media-video/ffmpeg2theora/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg2theora
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.54 2012/05/22 16:35:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.55 2012/05/22 16:44:53 flameeyes Exp $
+
+  22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  ffmpeg2theora-0.28-r1.ebuild, ffmpeg2theora-0.28.ebuild:
+  Allow using older libav as well, for postproc.
 
   22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   ffmpeg2theora-0.28-r1.ebuild, ffmpeg2theora-0.28.ebuild:
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild
index 1b654ef88ead..a318bbe14bdf 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-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-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.6 2012/05/22 16:35:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.7 2012/05/22 16:44:53 flameeyes Exp $
 
 EAPI=4
 inherit eutils scons-utils
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug kate"
 
-RDEPEND="|| ( media-libs/libpostproc media-video/ffmpeg )
+RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
 	>=virtual/ffmpeg-0.6.90
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild
index eb620dfaaa03..4229106b1259 100644
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild
+++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28.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-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.5 2012/05/22 16:35:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28.ebuild,v 1.6 2012/05/22 16:44:53 flameeyes Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug kate"
 
-RDEPEND="|| ( media-libs/libpostproc media-video/ffmpeg )
+RDEPEND="|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
 	virtual/ffmpeg
 	>=media-libs/libvorbis-1.1
 	>=media-libs/libogg-1.1
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 22e3decf430a..408bf8c63ebb 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.53 2012/05/22 16:31:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.54 2012/05/22 16:44:06 flameeyes Exp $
+
+  22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  mplayer2-2.0_p20120309.ebuild, mplayer2-9999.ebuild:
+  Allow using older libav as well, for postproc.
 
   22 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   mplayer2-2.0_p20120309.ebuild:
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
index 2c9cb12b06ac..3731861628e3 100644
--- a/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0_p20120309.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-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.8 2012/05/22 16:31:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120309.ebuild,v 1.9 2012/05/22 16:44:06 flameeyes Exp $
 
 EAPI=4
 
@@ -140,7 +140,7 @@ RDEPEND+="
 	vorbis? ( media-libs/libvorbis )
 	xanim? ( media-video/xanim )
 	xvid? ( media-libs/xvid )
-	|| ( media-libs/libpostproc media-video/ffmpeg )
+	|| ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg )
 	>=virtual/ffmpeg-0.10.2
 	symlink? ( !media-video/mplayer )
 "
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 640f7b5eaf0b..0859a29bb909 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-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-video/mplayer2/mplayer2-9999.ebuild,v 1.35 2012/05/19 18:27:33 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.36 2012/05/22 16:44:06 flameeyes Exp $
 
 EAPI=4
 
@@ -124,7 +124,7 @@ RDEPEND+="
 	png? ( media-libs/libpng )
 	pnm? ( media-libs/netpbm )
 	portaudio? ( >=media-libs/portaudio-19_pre20111121 )
-	postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) )
+	postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
 	pulseaudio? ( media-sound/pulseaudio )
 	rar? (
 		|| (