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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     33bb33d2f761223028b13ece0b04ca57a1dd5836
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 10:21:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 10:21:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=33bb33d2

kde-frameworks/kfilemetadata: Add USE=office, fix poppler build switch

Upstream commits
e56e22b5525dfc93366d1f2853553410375fec45
599e9b6489fe1caa095871f0f322881bbf53f6cf

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild | 7 ++++---
 kde-frameworks/kfilemetadata/metadata.xml              | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
index aa00c44b3e..d383cc4f1e 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
@@ -7,10 +7,9 @@ inherit eutils kde5
 
 DESCRIPTION="Library for extracting file metadata"
 KEYWORDS=""
-IUSE="epub exif ffmpeg libav pdf taglib"
+IUSE="epub exif ffmpeg libav office pdf taglib"
 
 RDEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep ki18n)
 	$(add_qt_dep qtxml)
 	epub? ( app-text/ebook-tools )
@@ -19,6 +18,7 @@ RDEPEND="
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:0= )
 	)
+	office? ( $(add_frameworks_dep karchive) )
 	pdf? ( app-text/poppler[qt5] )
 	taglib? ( media-libs/taglib )
 "
@@ -31,7 +31,8 @@ src_configure() {
 		$(cmake-utils_use_find_package epub EPub)
 		$(cmake-utils_use_find_package exif Exiv2)
 		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package pdf PopplerQt5)
+		$(cmake-utils_use_find_package office KF5Archive)
+		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package taglib Taglib)
 	)
 

diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml
index be261df8b6..c3a96764b1 100644
--- a/kde-frameworks/kfilemetadata/metadata.xml
+++ b/kde-frameworks/kfilemetadata/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="epub">Adds support for reading EPUB ebook metadata</flag>
+		<flag name="epub">Enable support for reading EPUB ebook metadata</flag>
+		<flag name="office">Enable support for reading ODF and OOXML metadata</flag>
 	</use>
 </pkgmetadata>