summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/k3b/ChangeLog5
-rw-r--r--app-cdr/k3b/k3b-2.0.3-r1.ebuild9
2 files changed, 10 insertions, 4 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 7acd1c1abfb3..676c04126b8f 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-cdr/k3b
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.289 2015/02/17 03:51:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.290 2015/04/28 13:51:23 kensington Exp $
+
+ 28 Apr 2015; Michael Palimaka <kensington@gentoo.org> k3b-2.0.3-r1.ebuild:
+ Migrate to new-style ffmpeg/libav USE flags.
17 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+files/k3b-2.0.3-libav-10.patch, k3b-2.0.3-r1.ebuild:
diff --git a/app-cdr/k3b/k3b-2.0.3-r1.ebuild b/app-cdr/k3b/k3b-2.0.3-r1.ebuild
index a2ba2e4743b3..03a00deadb64 100644
--- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild
+++ b/app-cdr/k3b/k3b-2.0.3-r1.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/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.4 2015/02/17 03:51:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.5 2015/04/28 13:51:23 kensington Exp $
EAPI=5
@@ -26,13 +26,16 @@ HOMEPAGE="http://www.k3b.org/"
LICENSE="GPL-2 FDL-1.2"
SLOT="4"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
CDEPEND="
|| ( kde-apps/libkcddb:4 $(add_kdebase_dep libkcddb) )
media-libs/libsamplerate
dvd? ( media-libs/libdvdread )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )