Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kfilemetadata/
Date: Sun, 16 Apr 2017 10:23:16
Message-Id: 1492338083.33bb33d2f761223028b13ece0b04ca57a1dd5836.asturm@gentoo
1 commit: 33bb33d2f761223028b13ece0b04ca57a1dd5836
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 16 10:21:23 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 16 10:21:23 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=33bb33d2
7
8 kde-frameworks/kfilemetadata: Add USE=office, fix poppler build switch
9
10 Upstream commits
11 e56e22b5525dfc93366d1f2853553410375fec45
12 599e9b6489fe1caa095871f0f322881bbf53f6cf
13
14 Package-Manager: Portage-2.3.3, Repoman-2.3.1
15
16 kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild | 7 ++++---
17 kde-frameworks/kfilemetadata/metadata.xml | 3 ++-
18 2 files changed, 6 insertions(+), 4 deletions(-)
19
20 diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
21 index aa00c44b3e..d383cc4f1e 100644
22 --- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
23 +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild
24 @@ -7,10 +7,9 @@ inherit eutils kde5
25
26 DESCRIPTION="Library for extracting file metadata"
27 KEYWORDS=""
28 -IUSE="epub exif ffmpeg libav pdf taglib"
29 +IUSE="epub exif ffmpeg libav office pdf taglib"
30
31 RDEPEND="
32 - $(add_frameworks_dep karchive)
33 $(add_frameworks_dep ki18n)
34 $(add_qt_dep qtxml)
35 epub? ( app-text/ebook-tools )
36 @@ -19,6 +18,7 @@ RDEPEND="
37 libav? ( media-video/libav:= )
38 !libav? ( media-video/ffmpeg:0= )
39 )
40 + office? ( $(add_frameworks_dep karchive) )
41 pdf? ( app-text/poppler[qt5] )
42 taglib? ( media-libs/taglib )
43 "
44 @@ -31,7 +31,8 @@ src_configure() {
45 $(cmake-utils_use_find_package epub EPub)
46 $(cmake-utils_use_find_package exif Exiv2)
47 $(cmake-utils_use_find_package ffmpeg FFmpeg)
48 - $(cmake-utils_use_find_package pdf PopplerQt5)
49 + $(cmake-utils_use_find_package office KF5Archive)
50 + $(cmake-utils_use_find_package pdf Poppler)
51 $(cmake-utils_use_find_package taglib Taglib)
52 )
53
54
55 diff --git a/kde-frameworks/kfilemetadata/metadata.xml b/kde-frameworks/kfilemetadata/metadata.xml
56 index be261df8b6..c3a96764b1 100644
57 --- a/kde-frameworks/kfilemetadata/metadata.xml
58 +++ b/kde-frameworks/kfilemetadata/metadata.xml
59 @@ -6,6 +6,7 @@
60 <name>Gentoo KDE Project</name>
61 </maintainer>
62 <use>
63 - <flag name="epub">Adds support for reading EPUB ebook metadata</flag>
64 + <flag name="epub">Enable support for reading EPUB ebook metadata</flag>
65 + <flag name="office">Enable support for reading ODF and OOXML metadata</flag>
66 </use>
67 </pkgmetadata>