1 |
commit: 06c6632e2ba8e916de679489250cae590541527c |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 27 15:57:50 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 27 15:57:50 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=06c6632e |
7 |
|
8 |
[app-cdr/k3b] Migrate to new-style ffmpeg/libav USE flags. |
9 |
|
10 |
Package-Manager: portage-2.2.18 |
11 |
|
12 |
app-cdr/k3b/k3b-5.9999.ebuild | 7 +++++-- |
13 |
app-cdr/k3b/k3b-9999.ebuild | 7 +++++-- |
14 |
2 files changed, 10 insertions(+), 4 deletions(-) |
15 |
|
16 |
diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild |
17 |
index 8e6423a..a0ac01c 100644 |
18 |
--- a/app-cdr/k3b/k3b-5.9999.ebuild |
19 |
+++ b/app-cdr/k3b/k3b-5.9999.ebuild |
20 |
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.k3b.org/" |
21 |
LICENSE="GPL-2 FDL-1.2" |
22 |
SLOT="5" |
23 |
KEYWORDS="" |
24 |
-IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
25 |
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" |
26 |
|
27 |
DEPEND=" |
28 |
$(add_frameworks_dep karchive) |
29 |
@@ -51,7 +51,10 @@ DEPEND=" |
30 |
dev-qt/qtwidgets:5 |
31 |
media-libs/libsamplerate |
32 |
dvd? ( media-libs/libdvdread ) |
33 |
- ffmpeg? ( virtual/ffmpeg ) |
34 |
+ ffmpeg? ( |
35 |
+ libav? ( media-video/libav:= ) |
36 |
+ !libav? ( media-video/ffmpeg:0= ) |
37 |
+ ) |
38 |
flac? ( >=media-libs/flac-1.2[cxx] ) |
39 |
mp3? ( media-sound/lame ) |
40 |
mad? ( media-libs/libmad ) |
41 |
|
42 |
diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild |
43 |
index dacbb69..b2cd543 100644 |
44 |
--- a/app-cdr/k3b/k3b-9999.ebuild |
45 |
+++ b/app-cdr/k3b/k3b-9999.ebuild |
46 |
@@ -29,13 +29,16 @@ HOMEPAGE="http://www.k3b.org/" |
47 |
LICENSE="GPL-2 FDL-1.2" |
48 |
KEYWORDS="" |
49 |
SLOT="4" |
50 |
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" |
51 |
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" |
52 |
|
53 |
DEPEND=" |
54 |
$(add_kdebase_dep libkcddb) |
55 |
media-libs/libsamplerate |
56 |
dvd? ( media-libs/libdvdread ) |
57 |
- ffmpeg? ( virtual/ffmpeg ) |
58 |
+ ffmpeg? ( |
59 |
+ libav? ( media-video/libav:= ) |
60 |
+ !libav? ( media-video/ffmpeg:0= ) |
61 |
+ ) |
62 |
flac? ( >=media-libs/flac-1.2[cxx] ) |
63 |
mp3? ( media-sound/lame ) |
64 |
mad? ( media-libs/libmad ) |