Depend on SLOT=0 of media-libs/openjpeg (bug 440086)

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 16 insertions, 11 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index fe85b05bf935..7e9546c47ac8 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.652 2013/05/24 14:25:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.653 2013/06/13 12:35:58 xmw Exp $
+
+  13 Jun 2013; Michael Weber <xmw@gentoo.org> ffmpeg-0.10.7.ebuild,
+  ffmpeg-1.0.6.ebuild, ffmpeg-1.0.7.ebuild, ffmpeg-1.2.1.ebuild,
+  ffmpeg-9999.ebuild:
+  Depend on SLOT=0 of media-libs/openjpeg (bug 440086)
 
   24 May 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   add ffhash tool
diff --git a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild b/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
index 11422d7ce2a3..d1c73c43609f 100644
--- a/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.10.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.7.ebuild,v 1.10 2013/04/13 07:42:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.7.ebuild,v 1.11 2013/06/13 12:35:58 xmw Exp $
 
 EAPI="4"
 
@@ -73,7 +73,7 @@ RDEPEND="
 	gsm? ( >=media-sound/gsm-1.0.12-r1 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
 	libass? ( media-libs/libass )
 	libv4l? ( media-libs/libv4l )
 	modplug? ( media-libs/libmodplug )
diff --git a/media-video/ffmpeg/ffmpeg-1.0.6.ebuild b/media-video/ffmpeg/ffmpeg-1.0.6.ebuild
index 80169c0b12ed..f11051f5f0f4 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.6.ebuild,v 1.4 2013/04/21 10:23:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.6.ebuild,v 1.5 2013/06/13 12:35:58 xmw Exp $
 
 EAPI="4"
 
@@ -78,7 +78,7 @@ RDEPEND="
 	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
 	libass? ( media-libs/libass )
 	libcaca? ( media-libs/libcaca )
 	libv4l? ( media-libs/libv4l )
diff --git a/media-video/ffmpeg/ffmpeg-1.0.7.ebuild b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
index cd572fab99bc..a24d8535d441 100644
--- a/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.7.ebuild,v 1.2 2013/05/16 16:42:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.7.ebuild,v 1.3 2013/06/13 12:35:58 xmw Exp $
 
 EAPI="4"
 
@@ -78,7 +78,7 @@ RDEPEND="
 	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
 	libass? ( media-libs/libass )
 	libcaca? ( media-libs/libcaca )
 	libv4l? ( media-libs/libv4l )
diff --git a/media-video/ffmpeg/ffmpeg-1.2.1.ebuild b/media-video/ffmpeg/ffmpeg-1.2.1.ebuild
index 30f9f6fe5786..2ad735264eed 100644
--- a/media-video/ffmpeg/ffmpeg-1.2.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.1.ebuild,v 1.1 2013/05/10 09:50:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.1.ebuild,v 1.2 2013/06/13 12:35:58 xmw Exp $
 
 EAPI="4"
 
@@ -79,7 +79,7 @@ RDEPEND="
 	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
 	libass? ( media-libs/libass )
 	libcaca? ( media-libs/libcaca )
 	libsoxr? ( media-libs/soxr )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ea8a01711412..7fb62d740545 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.129 2013/05/24 14:25:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.130 2013/06/13 12:35:58 xmw Exp $
 
 EAPI="4"
 
@@ -79,7 +79,7 @@ RDEPEND="
 	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
 	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
 	libass? ( media-libs/libass )
 	libcaca? ( media-libs/libcaca )
 	libsoxr? ( media-libs/soxr )