commit: f01f9bd74beb60314ae9e6872df0bd7aff634878
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 13:34:38 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 13:34:38 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f01f9bd7
kde-apps/okular: Add USE=image-backend, fix USE=plucker
Package-Manager: Portage-2.3.3, Repoman-2.3.1
kde-apps/okular/metadata.xml | 1 +
kde-apps/okular/okular-17.04.49.9999.ebuild | 17 ++++++++---------
kde-apps/okular/okular-9999.ebuild | 17 ++++++++---------
3 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index e29d704c14..0a06fc744c 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="chm">Enable support for Microsoft Compiled HTML
Help files</flag>
<flag name="ebook">Add E-Book support</flag>
+ <flag name="image-backend">Enable image viewing support</flag>
<flag name="mobi">Add mobipocket support</flag>
<flag name="mobile">Enable Plasma mobile support</flag>
<flag name="plucker">Enable Plucker E-Book for Palm OS devices
support</flag>
diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild
b/kde-apps/okular/okular-17.04.49.9999.ebuild
index 670f65e0a5..3b6ff6bc60 100644
--- a/kde-apps/okular/okular-17.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.04.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Universal document viewer based on KDE Frameworks"
HOMEPAGE="https://okular.kde.org
https://www.kde.org/applications/graphics/okular";
KEYWORDS=""
-IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech
+tiff"
+IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript
speech +tiff"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -34,6 +34,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
+ sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -41,21 +42,19 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
- exif? (
+ image-backend? (
$(add_kdeapps_dep libkexiv2)
- virtual/jpeg:0
+ $(add_qt_dep qtgui 'gif,jpeg,png')
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
- plucker? (
- sys-libs/zlib
- virtual/jpeg:0
- )
+ plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}
+ image-backend? ( $(add_frameworks_dep kimageformats) )
mobile? ( dev-libs/kirigami:1 )
"
@@ -74,10 +73,10 @@ src_configure() {
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package ebook EPub)
- $(cmake-utils_use_find_package exif KF5KExiv2)
+ $(cmake-utils_use_find_package image-backend KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package plucker ZLIB)
+ $(cmake-utils_use_find_package plucker JPEG)
$(cmake-utils_use_find_package postscript LibSpectre)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
diff --git a/kde-apps/okular/okular-9999.ebuild
b/kde-apps/okular/okular-9999.ebuild
index 670f65e0a5..3b6ff6bc60 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -11,7 +11,7 @@ inherit kde5
DESCRIPTION="Universal document viewer based on KDE Frameworks"
HOMEPAGE="https://okular.kde.org
https://www.kde.org/applications/graphics/okular";
KEYWORDS=""
-IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech
+tiff"
+IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +postscript
speech +tiff"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -34,6 +34,7 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
+ sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -41,21 +42,19 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
- exif? (
+ image-backend? (
$(add_kdeapps_dep libkexiv2)
- virtual/jpeg:0
+ $(add_qt_dep qtgui 'gif,jpeg,png')
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
- plucker? (
- sys-libs/zlib
- virtual/jpeg:0
- )
+ plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}
+ image-backend? ( $(add_frameworks_dep kimageformats) )
mobile? ( dev-libs/kirigami:1 )
"
@@ -74,10 +73,10 @@ src_configure() {
$(cmake-utils_use_find_package crypt Qca-qt5)
$(cmake-utils_use_find_package djvu DjVuLibre)
$(cmake-utils_use_find_package ebook EPub)
- $(cmake-utils_use_find_package exif KF5KExiv2)
+ $(cmake-utils_use_find_package image-backend KF5KExiv2)
$(cmake-utils_use_find_package mobi QMobipocket)
$(cmake-utils_use_find_package pdf Poppler)
- $(cmake-utils_use_find_package plucker ZLIB)
+ $(cmake-utils_use_find_package plucker JPEG)
$(cmake-utils_use_find_package postscript LibSpectre)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
