commit: e164b679524099ffc915af8c48ebb162c5af5df0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 08:08:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 08:31:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e164b679
kde-apps/okular: USE=jpeg->exif, add USE=plucker
Reported-by: Ostashevskyi Viktor <ostash <AT> ostash.kiev.ua>
Gentoo-bug: 616266
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 | 13 ++++++++-----
kde-apps/okular/okular-9999.ebuild | 13 ++++++++-----
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 0d0cb081aa..e29d704c14 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -10,6 +10,7 @@
<flag name="ebook">Add E-Book 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>
<flag name="speech">Enable text-to-speech support</flag>
</use>
</pkgmetadata>
diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild
b/kde-apps/okular/okular-17.04.49.9999.ebuild
index adc3e749a6..a99e614c07 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 +jpeg mobi mobile +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech
+tiff"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -35,7 +34,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
- sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -43,12 +41,16 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
- jpeg? (
+ exif? (
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+ plucker? (
+ sys-libs/zlib
+ virtual/jpeg:0
+ )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
@@ -72,9 +74,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 jpeg KF5KExiv2)
+ $(cmake-utils_use_find_package exif 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 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 adc3e749a6..a99e614c07 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 +jpeg mobi mobile +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech
+tiff"
DEPEND="
$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -35,7 +34,6 @@ DEPEND="
$(add_qt_dep qtwidgets)
media-libs/freetype
media-libs/phonon[qt5]
- sys-libs/zlib
chm? (
$(add_frameworks_dep khtml)
dev-libs/chmlib
@@ -43,12 +41,16 @@ DEPEND="
crypt? ( app-crypt/qca:2[qt5] )
djvu? ( app-text/djvu )
ebook? ( app-text/ebook-tools )
- jpeg? (
+ exif? (
$(add_kdeapps_dep libkexiv2)
virtual/jpeg:0
)
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+ plucker? (
+ sys-libs/zlib
+ virtual/jpeg:0
+ )
postscript? ( app-text/libspectre )
speech? ( $(add_qt_dep qtspeech) )
tiff? ( media-libs/tiff:0 )
@@ -72,9 +74,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 jpeg KF5KExiv2)
+ $(cmake-utils_use_find_package exif 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 postscript LibSpectre)
$(cmake-utils_use_find_package speech Qt5TextToSpeech)
$(cmake-utils_use_find_package tiff TIFF)
