[gentoo-commits] proj/kde:master commit in: kde-plasma/kfilemetadata/

[Michael Palimaka]

commit:     d1e2595c62aaef1fa499dbfd147d1e7eb4c80777
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  9 19:33:51 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 19:33:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d1e2595c

[kde-plasma/kfilemetadata] Support new style ffmpeg/libav USE flags.

Package-Manager: portage-2.2.18

 kde-plasma/kfilemetadata/kfilemetadata-5.3.49.9999.ebuild | 7 +++++--
 kde-plasma/kfilemetadata/kfilemetadata-5.6.95.ebuild      | 7 +++++--
 kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild        | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-5.3.49.9999.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-5.3.49.9999.ebuild
index cee1749..c1decc7 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-5.3.49.9999.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-5.3.49.9999.ebuild
@@ -15,7 +15,7 @@ fi
 
 DESCRIPTION="Library for extracting file metadata"
 KEYWORDS=""
-IUSE="epub exif ffmpeg pdf taglib"
+IUSE="epub exif ffmpeg libav pdf taglib"
 
 # TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not 
integrated upstream
 DEPEND="
@@ -24,7 +24,10 @@ DEPEND="
        dev-qt/qtxml:5
        epub? ( app-text/ebook-tools )
        exif? ( media-gfx/exiv2:= )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:= )
+               !libav? ( media-video/ffmpeg:= )
+       )
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-5.6.95.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-5.6.95.ebuild
index 5a17557..2826de5 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-5.6.95.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-5.6.95.ebuild
@@ -15,7 +15,7 @@ fi
 
 DESCRIPTION="Library for extracting file metadata"
 KEYWORDS=" ~amd64"
-IUSE="epub exif ffmpeg pdf taglib"
+IUSE="epub exif ffmpeg libav pdf taglib"
 
 # TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not 
integrated upstream
 DEPEND="
@@ -24,7 +24,10 @@ DEPEND="
        dev-qt/qtxml:5
        epub? ( app-text/ebook-tools )
        exif? ( media-gfx/exiv2:= )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:= )
+               !libav? ( media-video/ffmpeg:= )
+       )
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild 
b/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
index cee1749..c1decc7 100644
--- a/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-plasma/kfilemetadata/kfilemetadata-9999.ebuild
@@ -15,7 +15,7 @@ fi
 
 DESCRIPTION="Library for extracting file metadata"
 KEYWORDS=""
-IUSE="epub exif ffmpeg pdf taglib"
+IUSE="epub exif ffmpeg libav pdf taglib"
 
 # TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not 
integrated upstream
 DEPEND="
@@ -24,7 +24,10 @@ DEPEND="
        dev-qt/qtxml:5
        epub? ( app-text/ebook-tools )
        exif? ( media-gfx/exiv2:= )
-       ffmpeg? ( virtual/ffmpeg )
+       ffmpeg? (
+               libav? ( media-video/libav:= )
+               !libav? ( media-video/ffmpeg:= )
+       )
        pdf? ( app-text/poppler[qt5] )
        taglib? ( media-libs/taglib )
 "