Update the live ebuild

(Portage version: 2.2.12/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 9 insertions, 16 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 3eb972d6b850..212b9a466528 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.23 2014/09/01 16:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.24 2014/09/17 00:29:29 lu_zero Exp $
+
+  17 Sep 2014; Luca Barbato <lu_zero@gentoo.org> handbrake-9999.ebuild:
+  Update the live ebuild, it requires at least Libav11, x265 direct support
+  disabled for now.
 
   01 Sep 2014; Michał Górny <mgorny@gentoo.org> handbrake-0.9.9-r1.ebuild,
   handbrake-0.9.9.ebuild, handbrake-9999.ebuild:
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index f350995bb2f6..1959d15be995 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.20 2014/09/01 16:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.21 2014/09/17 00:29:29 lu_zero Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
+	ffmpeg? ( || ( >=media-video/libav-11 >=media-video/ffmpeg-2.3:0 ) )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -63,7 +63,7 @@ RDEPEND="
 		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
 	)
 	gtk? (
-		x11-libs/gtk+:3
+		>=x11-libs/gtk+-3.10
 		dev-libs/dbus-glib
 		dev-libs/glib:2
 		x11-libs/cairo
@@ -94,12 +94,6 @@ src_prepare() {
 		"${S}"/make/include/main.defs \
 		|| die "Contrib removal failed."
 
-	# Instead of adding a #define to libmkv, we expand it in place. 
-	epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
-
-	# Fix compilation against the released 1.9.1 version of mp4v2.
-	epatch "${FILESDIR}"/${PN}-9999-fix-compilation-with-mp4v2-v1.9.1.patch
-
 	# Remove libdvdnav duplication and call it on the original instead.
 	# It may work this way; if not, we should try to mimic the duplication.
 	epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
@@ -107,9 +101,6 @@ src_prepare() {
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
 
-	# Make use of an older version of libmkv.
-	epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
-
 	# Fixup configure.ac with newer automake.
 	# TODO: Would like to see this shorten towards the future;
 	#       see which are still needed, put those in a patch instead of 6 lines here.
@@ -138,10 +129,8 @@ src_configure() {
 		--force \
 		--prefix="${EPREFIX}/usr" \
 		--disable-gtk-update-checks \
-		--enable-avformat \
 		--disable-libav-aac \
-		--enable-libmkv \
-		--enable-mp4v2 \
+		--disable-x265 \
 		$(use_enable fdk fdk-aac) \
 		$(use_enable gtk) \
 		$(usex !gstreamer --disable-gst) || die "Configure failed."