summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Whyman <thev00d00@gentoo.org>2015-05-15 16:58:16 +0000
committerIan Whyman <thev00d00@gentoo.org>2015-05-15 16:58:16 +0000
commit2dbc58b55d67adc3596c900153c3e1ca8af75c5f (patch)
tree876bccbf96d5813e30a4aa2f20736704cade8b56 /media-video/handbrake
parentRemove old. (diff)
downloadgentoo-2-2dbc58b55d67adc3596c900153c3e1ca8af75c5f.tar.gz
gentoo-2-2dbc58b55d67adc3596c900153c3e1ca8af75c5f.tar.bz2
gentoo-2-2dbc58b55d67adc3596c900153c3e1ca8af75c5f.zip
Version bump #547598
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-video/handbrake')
-rw-r--r--media-video/handbrake/ChangeLog8
-rw-r--r--media-video/handbrake/handbrake-0.10.1.ebuild (renamed from media-video/handbrake/handbrake-0.10.0.ebuild)7
2 files changed, 11 insertions, 4 deletions
diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 3d895e7c23db..558ada17f2ec 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/handbrake
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.29 2015/04/08 18:16:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.30 2015/05/15 16:58:16 thev00d00 Exp $
+
+*handbrake-0.10.1 (15 May 2015)
+
+ 15 May 2015; Ian Whyman <thev00d00@gentoo.org> +handbrake-0.10.1.ebuild,
+ -handbrake-0.10.0.ebuild:
+ Version bump #547598
08 Apr 2015; Michał Górny <mgorny@gentoo.org> handbrake-0.10.0-r1.ebuild,
handbrake-0.10.0.ebuild, handbrake-0.9.9-r1.ebuild, handbrake-9999.ebuild:
diff --git a/media-video/handbrake/handbrake-0.10.0.ebuild b/media-video/handbrake/handbrake-0.10.1.ebuild
index 45359d30a2ba..5cd692b4df46 100644
--- a/media-video/handbrake/handbrake-0.10.0.ebuild
+++ b/media-video/handbrake/handbrake-0.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.10.0.ebuild,v 1.4 2015/04/08 18:16:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.10.1.ebuild,v 1.1 2015/05/15 16:58:16 thev00d00 Exp $
EAPI="5"
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+fdk gstreamer gtk libav-aac"
+IUSE="+fdk gstreamer gtk libav libav-aac"
REQUIRED_USE="^^ ( fdk libav-aac )"
@@ -40,8 +40,9 @@ RDEPEND="
media-libs/libvpx
media-libs/x264:=
media-sound/lame
- || ( >=media-video/libav-10.1 >=media-video/ffmpeg-2.3:0 )
sys-libs/zlib
+ libav? ( >=media-video/libav-10.1:0= )
+ !libav? ( >=media-video/ffmpeg-2.3:0= )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0