Block <media-video/ffmpeg-1.2.1, which Handbrake 0.9.9 does not build against, due to a dependency version change in =virtual/ffmpeg-9. Reported by Heiss, fixes bug #475262.

(Portage version: 2.1.12.10/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 14 insertions, 8 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 9afeefd698e0..a296f24fd6c6 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.7 2013/05/23 17:57:14 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.8 2013/06/29 20:35:06 tomwij Exp $
+
+  29 Jun 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild,
+  handbrake-0.9.9_pre5441-r1.ebuild, handbrake-9999.ebuild:
+  Block <media-video/ffmpeg-1.2.1, which Handbrake 0.9.9 does not build against,
+  due to a dependency version change in =virtual/ffmpeg-9. Reported by Heiss,
+  fixes bug #475262.
 
   23 May 2013; Tom Wijsman <TomWij@gentoo.org> handbrake-0.9.9.ebuild,
   handbrake-9999.ebuild:
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild
index e2e03f0939ee..13bb6ce2197a 100644
--- a/media-video/handbrake/handbrake-0.9.9.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9.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/handbrake/handbrake-0.9.9.ebuild,v 1.2 2013/05/23 17:57:14 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.3 2013/06/29 20:35:06 tomwij Exp $
 
 EAPI="5"
 
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264
 	media-sound/lame
-	ffmpeg? ( =virtual/ffmpeg-9 )
+	ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
diff --git a/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild b/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
index 29759cfc6ffc..7c4d3b1e4fb8 100644
--- a/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9_pre5441-r1.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/handbrake/handbrake-0.9.9_pre5441-r1.ebuild,v 1.2 2013/05/16 05:52:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild,v 1.3 2013/06/29 20:35:06 tomwij Exp $
 
 EAPI="5"
 
@@ -42,8 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264
 	media-sound/lame
-	ffmpeg? ( =virtual/ffmpeg-9 )
-	sys-libs/glibc:2.2
+	ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -66,6 +65,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	dev-lang/yasm
+	dev-util/intltool
 	sys-devel/automake"
 
 pkg_setup() {
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 89ff40b7136f..5146525506c4 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-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/handbrake/handbrake-9999.ebuild,v 1.6 2013/05/23 17:57:14 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.7 2013/06/29 20:35:06 tomwij Exp $
 
 EAPI="5"
 
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264
 	media-sound/lame
-	ffmpeg? ( =virtual/ffmpeg-9 )
+	ffmpeg? ( =virtual/ffmpeg-9 !<media-video/ffmpeg-1.2.1 )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0