[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     dbf1dc49c4cb29246bcb6e97cd62f2a4a29f8ff4
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 24 23:13:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:35:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbf1dc49

kde-apps/okular: Add USE=speech, fix DEPENDs, improve DESCRIPTION

Delete obsolete comments, qimageblitz function was re-implemented.
Simplify autotests commenting.

Package-Manager: portage-2.2.28

 kde-apps/okular/metadata.xml         |  9 +++++----
 kde-apps/okular/okular-5.9999.ebuild | 25 +++++++------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 33cf4df..49b367d 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
 		<flag name="ebook">Add E-Book support</flag>
 		<flag name="kde">Enable kactivities support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
+		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index f36fd65..ff291a9 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -9,16 +9,12 @@ KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 inherit kde5
 
-DESCRIPTION="Universal document viewer based on KPDF"
+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 +pdf +postscript +tiff"
-# TODO:
-# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
-# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
-# * Not packaged: Qt5TextToSpeech
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
 
-COMMON_DEPEND="
+DEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -27,7 +23,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjs)
@@ -53,21 +48,14 @@ COMMON_DEPEND="
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
+	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	kde5_src_prepare
-
-	if ! use test ; then
-		sed -i \
-			-e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
-			CMakeLists.txt || die
-	fi
+	use test || cmake_comment_add_subdirectory conf/autotests
 }
 
 src_configure() {
@@ -80,6 +68,7 @@ src_configure() {
 		$(cmake-utils_use_find_package mobi QMobipocket)
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
 		$(cmake-utils_use_find_package tiff TIFF)
 	)
 

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Sam James]

commit:     92e03ecc71fd490b98a1ada1f2eb99c5ba0f2648
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 00:18:32 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 00:18:32 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=92e03ecc

kde-apps/okular: add kwindowsystem dep

Meant to add this earlier.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild       | 1 +
 kde-apps/okular/okular-24.02.49.9999.ebuild | 1 +
 kde-apps/okular/okular-9999.ebuild          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild b/kde-apps/okular/okular-24.02.0.ebuild
index 9318b4496a..479cb58acf 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-24.02.49.9999.ebuild b/kde-apps/okular/okular-24.02.49.9999.ebuild
index ecc8a7289d..20b883d920 100644
--- a/kde-apps/okular/okular-24.02.49.9999.ebuild
+++ b/kde-apps/okular/okular-24.02.49.9999.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 6db3b9dacd..bb7a9a6ae9 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Sam James]

commit:     e8811d9abade5742f6ff3e633569146b61b491e8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 23:22:00 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 23:22:00 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8811d9a

kde-apps/okular: refresh deps

See upstream MR https://invent.kde.org/graphics/okular/-/merge_requests/933.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild       | 3 +++
 kde-apps/okular/okular-24.02.49.9999.ebuild | 3 +++
 kde-apps/okular/okular-9999.ebuild          | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild b/kde-apps/okular/okular-24.02.0.ebuild
index 043f345e4b..9318b4496a 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-apps/libkexiv2-${PVCUT}:6
 	>=kde-frameworks/karchive-${KFMIN}:6
 	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-24.02.49.9999.ebuild b/kde-apps/okular/okular-24.02.49.9999.ebuild
index da5d94e2cd..ecc8a7289d 100644
--- a/kde-apps/okular/okular-24.02.49.9999.ebuild
+++ b/kde-apps/okular/okular-24.02.49.9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-apps/libkexiv2-${PVCUT}:6
 	>=kde-frameworks/karchive-${KFMIN}:6
 	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index e0a06383a6..6db3b9dacd 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -26,6 +26,7 @@ DEPEND="
 	>=kde-apps/libkexiv2-${PVCUT}:6
 	>=kde-frameworks/karchive-${KFMIN}:6
 	>=kde-frameworks/kbookmarks-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
@@ -33,9 +34,11 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
 	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
 	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Sam James]

commit:     eb40628ed4ffb8653a8ee416fd02741daf43ba78
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 19:06:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 19:09:51 2024 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb40628e

kde-apps/okular: refresh deps

* Needs qtxml (upstream commit c3ee60e0a182ec5431ddd0bf6361f951843be16e)
* Needs kxmlgui (upstream commit 050fa3bd096ef3e3c3d934266c7d47cf4c28d5df)
* Drop jpeg (upstream commit b38040cd74c931bda63fa162c6e2d75707392036, 9999 only)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 kde-apps/okular/okular-24.02.0.ebuild       | 3 ++-
 kde-apps/okular/okular-24.02.49.9999.ebuild | 3 ++-
 kde-apps/okular/okular-9999.ebuild          | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-24.02.0.ebuild b/kde-apps/okular/okular-24.02.0.ebuild
index b0068f6d00..043f345e4b 100644
--- a/kde-apps/okular/okular-24.02.0.ebuild
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,6 +36,7 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6
 	media-libs/freetype

diff --git a/kde-apps/okular/okular-24.02.49.9999.ebuild b/kde-apps/okular/okular-24.02.49.9999.ebuild
index 50065082ef..da5d94e2cd 100644
--- a/kde-apps/okular/okular-24.02.49.9999.ebuild
+++ b/kde-apps/okular/okular-24.02.49.9999.ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,6 +36,7 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6
 	media-libs/freetype

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 50065082ef..e0a06383a6 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -20,7 +20,7 @@ IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +ti
 
 # slot op: Uses Qt6::CorePrivate
 DEPEND="
-	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
 	>=kde-apps/libkexiv2-${PVCUT}:6
@@ -36,10 +36,10 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:6
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
 	kde-plasma/plasma-activities:6
 	media-libs/freetype
-	media-libs/libjpeg-turbo:=
 	sys-libs/zlib
 	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 	djvu? ( app-text/djvu )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     c0ac9ef00f7db3237beb928632cb818c8a349469
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 11:46:06 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 11:46:06 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0ac9ef0

kde-apps/okular: Clear kde-plasma/plasma-activities min version

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index e853d28303..dabdf7eb9a 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	>=kde-frameworks/kpty-${KFMIN}:6
 	>=kde-frameworks/ktextwidgets-${KFMIN}:6
 	>=kde-frameworks/threadweaver-${KFMIN}:6
-	>=kde-plasma/plasma-activities-${KFMIN}:6
+	kde-plasma/plasma-activities:6
 	media-libs/freetype
 	media-libs/libjpeg-turbo:=
 	sys-libs/zlib

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     eb04ec986b19d9f363691197fb93cdcf2224f0f2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  6 09:52:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug  6 09:54:21 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb04ec98

kde-apps/okular: Update dependencies, add IUSE=phonon

Upstream commits:
7235cd2b9d4fadc7dc212b6c807a0598662ee41d
03368e06f4217459c1823c1da7a74217f744e0b4
617ba7dd0394642c448cfe6436d0a031a2789303
44e758955ca3f0a1a64c675cf3bb7cad421a4f4c

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/metadata.xml       | 1 +
 kde-apps/okular/okular-9999.ebuild | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index c1de2f50d8..afc63e47dc 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="image-backend">Enable image viewing support</flag>
 		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 		<flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag>
+		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
 		<flag name="qml">Install Okular Qml components</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index a3c57fddce..67219c84f7 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -16,12 +16,13 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff"
 
 # slot op: Uses Qt5::CorePrivate
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5=
 	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
@@ -37,13 +38,11 @@ DEPEND="
 	>=kde-frameworks/kcrash-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kpty-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
 	media-libs/freetype
-	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
 	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
@@ -55,6 +54,7 @@ DEPEND="
 	markdown? ( >=app-text/discount-2.2.7-r1:= )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
+	phonon? ( >=media-libs/phonon-4.11.0 )
 	plucker? ( media-libs/libjpeg-turbo:= )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
@@ -88,6 +88,7 @@ src_configure() {
 		$(cmake_use_find_package markdown Discount)
 		$(cmake_use_find_package mobi QMobipocket)
 		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package phonon Phonon4Qt5)
 		$(cmake_use_find_package plucker JPEG)
 		$(cmake_use_find_package postscript LibSpectre)
 		$(cmake_use_find_package share KF5Purpose)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     491b1def5e2cf17bdcf19d64f2cb8376822297b3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 21:47:48 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 21:47:48 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=491b1def

kde-apps/okular: Add new dependency

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index cddc8fc1cb..973f472f6f 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -27,6 +27,7 @@ DEPEND="
 	>=dev-qt/qtprintsupport-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     1c8428d22d4758b67aee5bebd6b6421e6947c216
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 14:44:09 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 10:26:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c8428d2

kde-apps/okular: slot operator dep on app-text/discount

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-22.12.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-22.12.49.9999.ebuild b/kde-apps/okular/okular-22.12.49.9999.ebuild
index af4ae6734d..b6cf9d81ad 100644
--- a/kde-apps/okular/okular-22.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-22.12.49.9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	markdown? ( >=app-text/discount-2.2.7-r1 )
+	markdown? ( >=app-text/discount-2.2.7-r1:= )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( media-libs/libjpeg-turbo:= )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index af4ae6734d..b6cf9d81ad 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	markdown? ( >=app-text/discount-2.2.7-r1 )
+	markdown? ( >=app-text/discount-2.2.7-r1:= )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( media-libs/libjpeg-turbo:= )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     ec3e954affc0904a9913f5d08142bb5035eec84c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 16 01:24:19 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 16 19:30:25 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec3e954a

kde-apps/okular: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-22.12.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-22.12.49.9999.ebuild b/kde-apps/okular/okular-22.12.49.9999.ebuild
index 496a5d7f03..83935d7a74 100644
--- a/kde-apps/okular/okular-22.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-22.12.49.9999.ebuild
@@ -59,7 +59,7 @@ DEPEND="
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 "
 RDEPEND="${DEPEND}
 	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 496a5d7f03..83935d7a74 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -59,7 +59,7 @@ DEPEND="
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
+	tiff? ( media-libs/tiff:= )
 "
 RDEPEND="${DEPEND}
 	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     18f2c8c12ce28c250da370fa3c6b7be2422353ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 21:47:36 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 21:47:36 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=18f2c8c1

kde-apps/okular: Add slot op on dev-qt/qtcore

Upstream commit 80afe26873d5355537d90a144bec23e03fa78fe8

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index f6da383dce..de14f56f83 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -19,7 +19,9 @@ SLOT="5"
 KEYWORDS=""
 IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
+# slot op: Uses Qt5::CorePrivate
 DEPEND="
+	>=dev-qt/qtcore-${QTMIN}:5=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtprintsupport-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     092d55b8c6fd727e89412d84529b36d751421014
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 08:16:37 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 09:01:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=092d55b8

kde-apps/okular: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index e4668c73af..c1de2f50d8 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="cpe">cpe:/a:kde:okular</remote-id>
 	</upstream>
 	<use>
 		<flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag>

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     296e69080e1d25b871106708766eab2e02c998c8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 14:15:37 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 14:21:57 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=296e6908

kde-apps/okular: Prepare for dev-qt/qtgui losing IUSE gif

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-22.08.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-22.08.49.9999.ebuild b/kde-apps/okular/okular-22.08.49.9999.ebuild
index b9bbfec37d..1dee915dd8 100644
--- a/kde-apps/okular/okular-22.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-22.08.49.9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
 	markdown? ( >=app-text/discount-2.2.7-r1 )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index b9bbfec37d..1dee915dd8 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
 	markdown? ( >=app-text/discount-2.2.7-r1 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     cca599478faa2d87b10e37a1526e8d5c1de3e362
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 09:10:03 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 11:53:49 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cca59947

kde-apps/okular: Disable failing signunsignedfieldtest

Bug: https://bugs.gentoo.org/852749
Package-Manager: Portage-3.0.32, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-22.07.80.ebuild      | 3 ++-
 kde-apps/okular/okular-22.08.49.9999.ebuild | 3 ++-
 kde-apps/okular/okular-9999.ebuild          | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-22.07.80.ebuild b/kde-apps/okular/okular-22.07.80.ebuild
index beaace656a..ac81f56b0b 100644
--- a/kde-apps/okular/okular-22.07.80.ebuild
+++ b/kde-apps/okular/okular-22.07.80.ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
 	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+	# signunsignedfieldtest fails, whatever. bug #852749
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
 	)
 
 	ecm_src_test

diff --git a/kde-apps/okular/okular-22.08.49.9999.ebuild b/kde-apps/okular/okular-22.08.49.9999.ebuild
index 9a848ce6cf..b9bbfec37d 100644
--- a/kde-apps/okular/okular-22.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-22.08.49.9999.ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
 	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+	# signunsignedfieldtest fails, whatever. bug #852749
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
 	)
 
 	ecm_src_test

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 9a848ce6cf..b9bbfec37d 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -98,8 +98,9 @@ src_configure() {
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
 	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
+	# signunsignedfieldtest fails, whatever. bug #852749
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
 	)
 
 	ecm_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     5ae8e84212b45052fdd9113379c50994657839ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 05:33:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May  9 05:38:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=5ae8e842

kde-apps/okular: Drop obsolete patch

Upstream commit 913d437822f23730d10bf97c3ed9201f936a33a2

Closes: https://bugs.gentoo.org/829509
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 222d0bef65..8a47d39f2d 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.92.0
@@ -70,7 +70,6 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-	"${FILESDIR}/${PN}-22.04.0-optional-options.patch" # bug 810958
 )
 
 src_configure() {
@@ -78,8 +77,9 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
+		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
 		-DOKULAR_UI=$(usex qml "both" "desktop")
-		-DWITH_KWALLET=$(usex crypt)
+		$(cmake_use_find_package crypt KF5Wallet)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     bdc17e906259fabfae9db56b765ee8e49e14eb73
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 13:10:46 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  8 13:10:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bdc17e90

kde-apps/okular: Switch to media-libs/libjpeg-turbo:=

Away from deprecated virtual/jpeg.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-22.04.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-22.04.49.9999.ebuild b/kde-apps/okular/okular-22.04.49.9999.ebuild
index 0952515f4d..222d0bef65 100644
--- a/kde-apps/okular/okular-22.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-22.04.49.9999.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	markdown? ( >=app-text/discount-2.2.7-r1 )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-	plucker? ( virtual/jpeg:0 )
+	plucker? ( media-libs/libjpeg-turbo:= )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 0952515f4d..222d0bef65 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	markdown? ( >=app-text/discount-2.2.7-r1 )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-	plucker? ( virtual/jpeg:0 )
+	plucker? ( media-libs/libjpeg-turbo:= )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     79d1222b7ae749cc0073d8548803992441d956c6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 12:37:56 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 12:37:56 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=79d1222b

kde-apps/okular: DEPEND on >=app-text/discount-2.2.7-r1

Closes: https://bugs.gentoo.org/832689
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-21.12.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-21.12.49.9999.ebuild b/kde-apps/okular/okular-21.12.49.9999.ebuild
index df10904e74..578b7409a2 100644
--- a/kde-apps/okular/okular-21.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-21.12.49.9999.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	markdown? ( app-text/discount )
+	markdown? ( >=app-text/discount-2.2.7-r1 )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index f8780303ce..f0bd8be92a 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -50,7 +50,7 @@ DEPEND="
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	markdown? ( app-text/discount )
+	markdown? ( >=app-text/discount-2.2.7-r1 )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     7ffe879af1206d5e6c908622b71b6116f8ee01d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 18:41:47 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 19:40:11 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ffe879a

kde-apps/okular: Rename IUSE kwallet -> crypt and fix description

- kwallet was enabled by plasma profile
- crypt is enabled by linux profile, so much wider coverage by default

Closes: https://bugs.gentoo.org/816093
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/metadata.xml                | 2 +-
 kde-apps/okular/okular-21.11.80.ebuild      | 6 +++---
 kde-apps/okular/okular-21.12.49.9999.ebuild | 6 +++---
 kde-apps/okular/okular-9999.ebuild          | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 268f35796c..b894d40b68 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,9 +9,9 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
+		<flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
 		<flag name="image-backend">Enable image viewing support</flag>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
 		<flag name="mobi">Enable mobipocket support</flag>
 		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>

diff --git a/kde-apps/okular/okular-21.11.80.ebuild b/kde-apps/okular/okular-21.11.80.ebuild
index 3646c87679..f09e589468 100644
--- a/kde-apps/okular/okular-21.11.80.ebuild
+++ b/kde-apps/okular/okular-21.11.80.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -43,13 +43,13 @@ DEPEND="
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
@@ -79,10 +79,10 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
 		-DOKULAR_UI=$(usex qml "both" "desktop")
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
-		-DWITH_KWALLET=$(usex kwallet)
 		$(cmake_use_find_package markdown Discount)
 		$(cmake_use_find_package mobi QMobipocket)
 		$(cmake_use_find_package pdf Poppler)

diff --git a/kde-apps/okular/okular-21.12.49.9999.ebuild b/kde-apps/okular/okular-21.12.49.9999.ebuild
index 11e7653d7e..3d1fd5166c 100644
--- a/kde-apps/okular/okular-21.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-21.12.49.9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -43,13 +43,13 @@ DEPEND="
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
@@ -79,10 +79,10 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
 		-DOKULAR_UI=$(usex qml "both" "desktop")
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
-		-DWITH_KWALLET=$(usex kwallet)
 		$(cmake_use_find_package markdown Discount)
 		$(cmake_use_find_package mobi QMobipocket)
 		$(cmake_use_find_package pdf Poppler)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 11e7653d7e..3d1fd5166c 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -43,13 +43,13 @@ DEPEND="
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
-	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
@@ -79,10 +79,10 @@ src_configure() {
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
 		-DOKULAR_UI=$(usex qml "both" "desktop")
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
-		-DWITH_KWALLET=$(usex kwallet)
 		$(cmake_use_find_package markdown Discount)
 		$(cmake_use_find_package mobi QMobipocket)
 		$(cmake_use_find_package pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     3f9362355aa1ea5df3b9cfff39fd3806c4eb0441
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 11 20:31:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 11 20:31:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f936235

kde-apps/okular: Raise minimum app-text/poppler version

Make sure okular is built with the new feature enabled.

Upstream commit 8b3dfcb3f4ea97512b5940be69bfad9cc7fe6ac5

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 3edb207dc3..908143e1e6 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -52,7 +52,7 @@ DEPEND="
 	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[nss,qt5] )
+	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     0fae95db0cb8ca6045da7d0b8516ebd256cbe5c2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 13:22:22 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 13:22:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fae95db

kde-apps/okular: Drop unused local IUSE chm description

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 79a14c030c..268f35796c 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,7 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
 		<flag name="image-backend">Enable image viewing support</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     028d514c48acb7f98af6daa44a4fcd93062e4925
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 14:59:53 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 14:59:53 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=028d514c

kde-apps/okular: Drop IUSE=chm from live

Now that we have app-text/kchmviewer back in Gentoo ebuild repo,
drop it here and direct users to the separate package where the okular
code originally came from anyway.

Bug: https://bugs.gentoo.org/806296
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 8cf916b602..387e337470 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -44,11 +44,6 @@ DEPEND="
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
 	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		dev-libs/libzip:=
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
@@ -79,10 +74,10 @@ PATCHES=(
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
 		-DOKULAR_UI=$(usex qml "both" "desktop")
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package chm KF5KHtml)
-		$(cmake_use_find_package chm LibZip)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     ee407e145f4a302d83950d813c3da8a5b6acbce8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 17:40:09 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 17:40:09 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee407e14

kde-apps/okular: DEPEND on app-text/poppler[nss]

Upstream commit f7d6045b9274737fb4f1e87be165f4fc5a4e908d

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4c1971f848..baae1a4857 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -55,7 +55,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[qt5] )
+	pdf? ( app-text/poppler[nss,qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     231bcb57a7460cb6e707e175441b060512467479
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 12:55:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:23:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=231bcb57

kde-apps/okular: Disable failing annotationtoolbartest

Reported-by: Frank Krömmelbein <kroemmelbein <AT> gmx.de>
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-20.12.49.9999.ebuild | 4 ++--
 kde-apps/okular/okular-9999.ebuild          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-20.12.49.9999.ebuild b/kde-apps/okular/okular-20.12.49.9999.ebuild
index 24a575bc8c..5e00176a80 100644
--- a/kde-apps/okular/okular-20.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.12.49.9999.ebuild
@@ -98,9 +98,9 @@ src_configure() {
 
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
+	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
 	)
 
 	ecm_src_test

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 24a575bc8c..5e00176a80 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -98,9 +98,9 @@ src_configure() {
 
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
+	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
+		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
 	)
 
 	ecm_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     4a446dabd938b39c014ce68aa02fdc508f6c934e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 14:57:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 14:57:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a446dab

kde-apps/okular: Set IUSE="+plucker" default

Dependency wise no sense in having it off by default.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-20.08.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index 89e2bee3c4..f5f693e7dc 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 7384692c14..24a575bc8c 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm djvu epub +image-backend markdown mobi +pdf plucker +postscript qml share speech +tiff"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     dfc36a12c97b9ba3b2be0e9f8358e10d6c6bf002
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 19:29:39 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 19:29:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dfc36a12

kde-apps/okular: Add missing DEPEND for IUSE="chm"

Bug: https://bugs.gentoo.org/750941
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-20.08.49.9999.ebuild | 4 +++-
 kde-apps/okular/okular-9999.ebuild          | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index 813a62c06f..781454848b 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	sys-libs/zlib
 	chm? (
 		dev-libs/chmlib
+		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
 	djvu? ( app-text/djvu )
@@ -83,6 +84,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DOKULAR_UI=$(usex qml "both" "desktop")
 		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package chm KF5KHtml)
+		$(cmake_use_find_package chm LibZip)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)
@@ -95,7 +98,6 @@ src_configure() {
 		$(cmake_use_find_package speech Qt5TextToSpeech)
 		$(cmake_use_find_package tiff TIFF)
 	)
-
 	ecm_src_configure
 }
 

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 23579f5d89..5cd236d78a 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 	sys-libs/zlib
 	chm? (
 		dev-libs/chmlib
+		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
 	djvu? ( app-text/djvu )
@@ -78,6 +79,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DOKULAR_UI=$(usex qml "both" "desktop")
 		$(cmake_use_find_package chm CHM)
+		$(cmake_use_find_package chm KF5KHtml)
+		$(cmake_use_find_package chm LibZip)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     59304a3ee7c3a6fd2758865e40de2e8e1b505627
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 19:51:57 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 19:51:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=59304a3e

kde-apps/okular: Sort DEPENDs

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-9999.ebuild | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 101fb3c1aa..9f3257f04f 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -20,6 +20,11 @@ KEYWORDS=""
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -34,24 +39,19 @@ DEPEND="
 	>=kde-frameworks/kpty-${KFMIN}:5
 	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
 	sys-libs/zlib
 	chm? (
-		>=kde-frameworks/khtml-${KFMIN}:5
 		dev-libs/chmlib
+		>=kde-frameworks/khtml-${KFMIN}:5
 	)
 	crypt? ( app-crypt/qca:2[qt5(+)] )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
-		>=kde-apps/libkexiv2-${PVCUT}:5
 		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
 	markdown? ( app-text/discount )
 	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
@@ -65,8 +65,8 @@ DEPEND="
 RDEPEND="${DEPEND}
 	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
 	mobile? (
-		>=kde-frameworks/kirigami-${KFMIN}:5
 		>=dev-qt/qtquickcontrols-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
 	)
 "
 

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     8e0d8afdad0b1e3438b8ce8e3cf15595881ff7be
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 08:50:27 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 08:50:27 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e0d8afd

kde-apps/okular: Fix CMake option

Closes: https://bugs.gentoo.org/675562
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/okular-18.12.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-18.12.49.9999.ebuild b/kde-apps/okular/okular-18.12.49.9999.ebuild
index 43704a40a1..851e31b0a3 100644
--- a/kde-apps/okular/okular-18.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.12.49.9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib:=
+	sys-libs/zlib
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 43704a40a1..4974965c1b 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib:=
+	sys-libs/zlib
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib
@@ -87,7 +87,7 @@ src_configure() {
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package plucker JPEG)
 		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
+		$(cmake-utils_use_find_package share KF5Purpose)
 		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
 		$(cmake-utils_use_find_package tiff TIFF)
 	)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     499b1dc94777aedc3d704820858ef8751f017145
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 16 20:19:54 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 16 20:19:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=499b1dc9

kde-apps/okular: Add zlib slot op

Package-Manager: Portage-2.3.46, Repoman-2.3.10

 kde-apps/okular/okular-18.08.0.ebuild       | 2 +-
 kde-apps/okular/okular-18.08.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-18.08.0.ebuild b/kde-apps/okular/okular-18.08.0.ebuild
index 94de9fbb35..3b0a59ddda 100644
--- a/kde-apps/okular/okular-18.08.0.ebuild
+++ b/kde-apps/okular/okular-18.08.0.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
+	sys-libs/zlib:=
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib

diff --git a/kde-apps/okular/okular-18.08.49.9999.ebuild b/kde-apps/okular/okular-18.08.49.9999.ebuild
index 0596092ab1..eca8cfddbc 100644
--- a/kde-apps/okular/okular-18.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.08.49.9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
+	sys-libs/zlib:=
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 0596092ab1..eca8cfddbc 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
+	sys-libs/zlib:=
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     f55027382e90496757b90f896c295e7ce6f63ebf
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 13 20:38:31 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 20:38:31 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f5502738

kde-apps/okular: Drop patch, picked for 18.04 branch upstream

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-apps/okular/okular-18.04.0.ebuild       | 5 +----
 kde-apps/okular/okular-18.04.49.9999.ebuild | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/kde-apps/okular/okular-18.04.0.ebuild b/kde-apps/okular/okular-18.04.0.ebuild
index 31372c0243..94de9fbb35 100644
--- a/kde-apps/okular/okular-18.04.0.ebuild
+++ b/kde-apps/okular/okular-18.04.0.ebuild
@@ -64,10 +64,7 @@ RDEPEND="${DEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-tests.patch"
-	"${FILESDIR}/${PN}-18.03.90-kcrash.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
 
 src_prepare() {
 	kde5_src_prepare

diff --git a/kde-apps/okular/okular-18.04.49.9999.ebuild b/kde-apps/okular/okular-18.04.49.9999.ebuild
index 80d688c222..0596092ab1 100644
--- a/kde-apps/okular/okular-18.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.04.49.9999.ebuild
@@ -64,10 +64,7 @@ RDEPEND="${DEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-tests.patch"
-	"${FILESDIR}/${PN}-18.03.90-kcrash.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
 
 src_prepare() {
 	kde5_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     8c26b0f9d5c4ce9a3a077baa8457c020f381f2c5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 17:08:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 17:08:59 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c26b0f9

kde-apps/okular: Revert bogus poppler-qt5-relaxation

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/okular/okular-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4674c4ec89..1eba56641a 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -48,7 +48,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5(+)] )
+	pdf? ( app-text/poppler[qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( $(add_frameworks_dep purpose) )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     bb5fb9f17d02789c920d3bb8d45949facf47483d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 13:01:12 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 13:01:12 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb5fb9f1

kde-apps/okular: Relax poppler/qca qt5-usedeps

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 kde-apps/okular/okular-17.12.49.9999.ebuild | 4 ++--
 kde-apps/okular/okular-9999.ebuild          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-17.12.49.9999.ebuild b/kde-apps/okular/okular-17.12.49.9999.ebuild
index 9f9adeb460..4674c4ec89 100644
--- a/kde-apps/okular/okular-17.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.12.49.9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib
 	)
-	crypt? ( app-crypt/qca:2[qt5] )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
@@ -48,7 +48,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	pdf? ( app-text/poppler[qt5(+)] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( $(add_frameworks_dep purpose) )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 9f9adeb460..4674c4ec89 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib
 	)
-	crypt? ( app-crypt/qca:2[qt5] )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
@@ -48,7 +48,7 @@ DEPEND="
 	)
 	markdown? ( app-text/discount )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	pdf? ( app-text/poppler[qt5(+)] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
 	share? ( $(add_frameworks_dep purpose) )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     94a9fe22f07af8e6bf1f7241932df8236cff404a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 23:15:12 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 00:08:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=94a9fe22

kde-apps/okular: Disable hanging test

Reported-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
Bug: https://bugs.gentoo.org/641728
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 kde-apps/okular/okular-17.12.49.9999.ebuild | 3 ++-
 kde-apps/okular/okular-9999.ebuild          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-17.12.49.9999.ebuild b/kde-apps/okular/okular-17.12.49.9999.ebuild
index 1a0378b407..cfc05336d8 100644
--- a/kde-apps/okular/okular-17.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.12.49.9999.ebuild
@@ -93,8 +93,9 @@ src_configure() {
 
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest)"
+		-E "(mainshelltest|chmgeneratortest|parttest)"
 	)
 
 	kde5_src_test

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 1a0378b407..cfc05336d8 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -93,8 +93,9 @@ src_configure() {
 
 src_test() {
 	# mainshelltest hangs, chmgeneratortest fails, bug #603116
+	# parttest hangs, bug #641728
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest)"
+		-E "(mainshelltest|chmgeneratortest|parttest)"
 	)
 
 	kde5_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     9b7d6c635cf20958529017c70f6541ee921ad5a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 13:25:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 13:25:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b7d6c63

kde-apps/okular: Add USE=share

Upstream commit a5da013a4da20f9230775fdf52275c5136e4f172

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 kde-apps/okular/metadata.xml       | 1 +
 kde-apps/okular/okular-9999.ebuild | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index cec42c6949..21ae2823da 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="mobi">Enable 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="share">Enable support for a share menu using <pkg>dev-libs/purpose</pkg></flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 2cf2d02017..5e830356be 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 epub +image-backend markdown mobi mobile +pdf plucker +postscript speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -51,6 +51,7 @@ DEPEND="
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
+	share? ( dev-libs/purpose:5 )
 	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
@@ -82,6 +83,7 @@ src_configure() {
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package plucker JPEG)
 		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
 		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
 		$(cmake-utils_use_find_package tiff TIFF)
 	)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     48a4c7248cac73b07a67a4c969d7921be463725c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 18:33:39 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 18:33:39 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=48a4c724

kde-apps/okular: Add USE=markdown

Upstream commit 4931385777ce9fa55c8b52f5009603b2b6d58d7f

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/metadata.xml       | 5 +++--
 kde-apps/okular/okular-9999.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 386d732f69..cec42c6949 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,9 +7,10 @@
 	</maintainer>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
-		<flag name="epub">Add E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
+		<flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag>
 		<flag name="image-backend">Enable image viewing support</flag>
-		<flag name="mobi">Add mobipocket support</flag>
+		<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
+		<flag name="mobi">Enable 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>

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index b2e9978343..2d1ba1ef3c 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 epub +image-backend mobi mobile +pdf plucker +postscript speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -46,6 +46,7 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		$(add_qt_dep qtgui 'gif,jpeg,png')
 	)
+	markdown? ( app-text/discount )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	plucker? ( virtual/jpeg:0 )
@@ -77,6 +78,7 @@ src_configure() {
 		$(cmake-utils_use_find_package djvu DjVuLibre)
 		$(cmake-utils_use_find_package epub EPub)
 		$(cmake-utils_use_find_package image-backend KF5KExiv2)
+		$(cmake-utils_use_find_package markdown Discount)
 		$(cmake-utils_use_find_package mobi QMobipocket)
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package plucker JPEG)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     882ffcdbfde67dcf5bf01335a910c1af8649b80b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 17:47:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 17:47:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=882ffcdb

kde-apps/okular: Fix RDEPENDs

Upstream commit caf8820cf773316ce41d9a8c1f7357b3ffc3ef86

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/okular-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index d17193bc39..4cb6dbb5f4 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? ( dev-libs/kirigami:1 )
+	mobile? (
+		$(add_qt_dep qtquickcontrols)
+		dev-libs/kirigami:2
+	)
 "
 
 # bug 603116

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     8e8cbe390626d85ce6f4b47683138983b7f5f26b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 17:48:18 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 17:48:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8e8cbe39

kde-apps/okular: Add missing RDEPEND

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/okular-17.04.3.ebuild       | 5 ++++-
 kde-apps/okular/okular-17.04.49.9999.ebuild | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-17.04.3.ebuild b/kde-apps/okular/okular-17.04.3.ebuild
index c9f7f35e22..5dad52c5ae 100644
--- a/kde-apps/okular/okular-17.04.3.ebuild
+++ b/kde-apps/okular/okular-17.04.3.ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? ( dev-libs/kirigami:1 )
+	mobile? (
+		$(add_qt_dep qtquickcontrols)
+		dev-libs/kirigami:1
+	)
 "
 
 # bug 603116

diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild b/kde-apps/okular/okular-17.04.49.9999.ebuild
index d17193bc39..a77e9201b3 100644
--- a/kde-apps/okular/okular-17.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.04.49.9999.ebuild
@@ -55,7 +55,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? ( dev-libs/kirigami:1 )
+	mobile? (
+		$(add_qt_dep qtquickcontrols)
+		dev-libs/kirigami:1
+	)
 "
 
 # bug 603116

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     4b8ed2bbe3d30adcda189116a937c0c6bf8b0578
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 14:39:23 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 14:39:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4b8ed2bb

kde-apps/okular: USE=ebook -> epub

Gentoo-bug: 600162

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/okular/metadata.xml                | 2 +-
 kde-apps/okular/okular-17.04.49.9999.ebuild | 6 +++---
 kde-apps/okular/okular-9999.ebuild          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 0a06fc744c..386d732f69 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
-		<flag name="ebook">Add E-Book support</flag>
+		<flag name="epub">Add E-Book support via <pkg>app-text/ebook-tools</pkg></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>

diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild b/kde-apps/okular/okular-17.04.49.9999.ebuild
index 3b6ff6bc60..d17193bc39 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 +image-backend mobi mobile +pdf plucker +postscript speech +tiff"
+IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -41,7 +41,7 @@ DEPEND="
 	)
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
+	epub? ( app-text/ebook-tools )
 	image-backend? (
 		$(add_kdeapps_dep libkexiv2)
 		$(add_qt_dep qtgui 'gif,jpeg,png')
@@ -72,7 +72,7 @@ src_configure() {
 		$(cmake-utils_use_find_package chm CHM)
 		$(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 epub EPub)
 		$(cmake-utils_use_find_package image-backend KF5KExiv2)
 		$(cmake-utils_use_find_package mobi QMobipocket)
 		$(cmake-utils_use_find_package pdf Poppler)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 3b6ff6bc60..d17193bc39 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 +image-backend mobi mobile +pdf plucker +postscript speech +tiff"
+IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -41,7 +41,7 @@ DEPEND="
 	)
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
+	epub? ( app-text/ebook-tools )
 	image-backend? (
 		$(add_kdeapps_dep libkexiv2)
 		$(add_qt_dep qtgui 'gif,jpeg,png')
@@ -72,7 +72,7 @@ src_configure() {
 		$(cmake-utils_use_find_package chm CHM)
 		$(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 epub EPub)
 		$(cmake-utils_use_find_package image-backend KF5KExiv2)
 		$(cmake-utils_use_find_package mobi QMobipocket)
 		$(cmake-utils_use_find_package pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

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)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     348a9547be3c56b183ca515417e5fc3cbfaa3f27
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 12:27:49 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 12:27:49 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=348a9547

kde-apps/okular: Sort DEPENDs

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-17.04.49.9999.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild b/kde-apps/okular/okular-17.04.49.9999.ebuild
index a99e614c07..670f65e0a5 100644
--- a/kde-apps/okular/okular-17.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-17.04.49.9999.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjs)
 	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index a99e614c07..670f65e0a5 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -24,8 +24,8 @@ DEPEND="
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjs)
 	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

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)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Andreas Sturmlechner]

commit:     67b7990689204d9039eb13044b341855a427b22c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 11:13:01 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 11:13:01 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=67b79906

kde-apps/okular: Move kde-frameworks/khtml dep behind USE=chm

Upstream commit 7a013e3869367fdc2dd4e5b452ed2d6e9b037a9e

Package-Manager: portage-2.3.3

 kde-apps/okular/okular-9999.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 75719f0669..48c3fb79a9 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -23,7 +23,6 @@ DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjs)
 	$(add_frameworks_dep kparts)
@@ -38,7 +37,10 @@ DEPEND="
 	media-libs/freetype
 	media-libs/phonon[qt5]
 	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
+	chm? (
+		$(add_frameworks_dep khtml)
+		dev-libs/chmlib
+	)
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
 	ebook? ( app-text/ebook-tools )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     0292226f20b01ff738a9ce86bfdce6ee892fa02c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 08:32:48 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:32:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0292226f

kde-apps/okular: Restore KEYWORDS

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-16.12.1.ebuild b/kde-apps/okular/okular-16.12.1.ebuild
index 75719f0..59bc85b 100644
--- a/kde-apps/okular/okular-16.12.1.ebuild
+++ b/kde-apps/okular/okular-16.12.1.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=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     98ab6fd99e4a9d53dc8eccad3f8cb4083484f0af
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 08:16:37 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 08:16:37 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=98ab6fd9

kde-apps/okular: Backport changes after merge

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.1.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-16.12.1.ebuild b/kde-apps/okular/okular-16.12.1.ebuild
index 83f289c..75719f0 100644
--- a/kde-apps/okular/okular-16.12.1.ebuild
+++ b/kde-apps/okular/okular-16.12.1.ebuild
@@ -11,8 +11,8 @@ inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
+KEYWORDS=""
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
 	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
 	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
 	use test || cmake_comment_add_subdirectory conf/autotests
 }
 

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     003eb0efb09382dea6fb46b0733a8bb2077972b5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 00:58:09 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 10:09:36 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=003eb0ef

kde-apps/okular: Add USE=mobile

Gentoo-bug: 604782

Package-Manager: portage-2.3.0

 kde-apps/okular/metadata.xml                | 1 +
 kde-apps/okular/okular-16.12.49.9999.ebuild | 7 +++++--
 kde-apps/okular/okular-9999.ebuild          | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index f94e8fb..0d0cb08 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<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="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-apps/okular/okular-16.12.49.9999.ebuild b/kde-apps/okular/okular-16.12.49.9999.ebuild
index 6917a35..75719f0 100644
--- a/kde-apps/okular/okular-16.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.12.49.9999.ebuild
@@ -12,7 +12,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 +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
 	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
 	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
 	use test || cmake_comment_add_subdirectory conf/autotests
 }
 

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 6917a35..75719f0 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -12,7 +12,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 +pdf +postscript speech +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi mobile +pdf +postscript speech +tiff"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -52,13 +52,16 @@ DEPEND="
 	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	mobile? ( dev-libs/kirigami:1 )
+"
 
 # bug 603116
 RESTRICT+=" test"
 
 src_prepare() {
 	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
 	use test || cmake_comment_add_subdirectory conf/autotests
 }
 

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     bdf42741330210d240d5fc22ec692a50445c6480
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:26:53 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:26:53 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bdf42741

kde-apps/okular: Sync with tree

Gentoo-bug: 603084

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.49.9999.ebuild | 1 +
 kde-apps/okular/okular-9999.ebuild          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/okular/okular-16.12.49.9999.ebuild b/kde-apps/okular/okular-16.12.49.9999.ebuild
index 63aa9f6..b7ec098 100644
--- a/kde-apps/okular/okular-16.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.12.49.9999.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kjs)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kpty)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 63aa9f6..b7ec098 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kjs)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kpty)
 	$(add_frameworks_dep threadweaver)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     7a292b37f1e8c982d6585d69ee0c84d0e1af85e9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 20:16:33 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 20:16:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a292b37

kde-apps/okular: Restrict tests

Gentoo-bug: 603116
Reported-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/okular-16.12.49.9999.ebuild | 4 ++++
 kde-apps/okular/okular-9999.ebuild          | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/kde-apps/okular/okular-16.12.49.9999.ebuild b/kde-apps/okular/okular-16.12.49.9999.ebuild
index 324abb4..63aa9f6 100644
--- a/kde-apps/okular/okular-16.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.12.49.9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
@@ -52,6 +53,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# bug 603116
+RESTRICT+=" test"
+
 src_prepare() {
 	kde5_src_prepare
 	use test || cmake_comment_add_subdirectory conf/autotests

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 324abb4..63aa9f6 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KDE Frameworks"
@@ -52,6 +53,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# bug 603116
+RESTRICT+=" test"
+
 src_prepare() {
 	kde5_src_prepare
 	use test || cmake_comment_add_subdirectory conf/autotests

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     2f1db326148771567e84363222f18b72370febf7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 12:26:30 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 12:26:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f1db326

kde-apps/okular: Update dependency

Package-Manager: portage-2.3.2

 kde-apps/okular/metadata.xml                | 2 +-
 kde-apps/okular/okular-16.08.49.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 7ea11e7..0a6890e 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
-		<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
+		<flag name="dpi">DPI detection support for PDF rendering via <pkg>kde-plasma/libkscreen</pkg></flag>
 		<flag name="ebook">Add E-Book support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 		<flag name="speech">Enable text-to-speech support</flag>

diff --git a/kde-apps/okular/okular-16.08.49.9999.ebuild b/kde-apps/okular/okular-16.08.49.9999.ebuild
index 4962501..f1dc5a3 100644
--- a/kde-apps/okular/okular-16.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.08.49.9999.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt4] )
 	djvu? ( app-text/djvu )
-	dpi? ( x11-libs/libkscreen:4 )
+	dpi? ( kde-plasma/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
 		$(add_kdeapps_dep libkexiv2)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     f14944854e99909634f8ae7bb8c02d7f00e70fe6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 21:52:56 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 22:07:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1494485

kde-apps/okular: Frameworks merged to master

Package-Manager: portage-2.3.0

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 kde-apps/okular/okular-5.9999.ebuild | 76 ------------------------------------
 kde-apps/okular/okular-9999.ebuild   | 71 ++++++++++++++++++++-------------
 2 files changed, 44 insertions(+), 103 deletions(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
deleted file mode 100644
index ff291a9..0000000
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-EGIT_BRANCH="frameworks"
-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 +pdf +postscript speech +tiff"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/freetype
-	media-libs/phonon[qt5]
-	sys-libs/zlib
-	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2[qt5] )
-	djvu? ( app-text/djvu )
-	ebook? ( app-text/ebook-tools )
-	jpeg? (
-		$(add_kdeapps_dep libkexiv2)
-		virtual/jpeg:0
-	)
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
-	postscript? ( app-text/libspectre )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(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 mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4962501..324abb4 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -4,55 +4,72 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 2: parttest hangs
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
 
-inherit kde4-base
-
-DESCRIPTION="Universal document viewer based on KPDF"
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
 
 DEPEND="
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep threadweaver)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
 	media-libs/freetype
-	media-libs/phonon[qt4]
-	media-libs/qimageblitz
+	media-libs/phonon[qt5]
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2[qt4] )
+	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	dpi? ( x11-libs/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
+	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
+	speech? ( $(add_qt_dep qtspeech) )
 	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	kde5_src_prepare
+	use test || cmake_comment_add_subdirectory conf/autotests
+}
+
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_KActivities=OFF
-		-DWITH_CHM=$(usex chm)
-		-DWITH_QCA2=$(usex crypt)
-		-DWITH_DjVuLibre=$(usex djvu)
-		-DWITH_LibKScreen=$(usex dpi)
-		-DWITH_EPub=$(usex ebook)
-		-DWITH_JPEG=$(usex jpeg)
-		-DWITH_Kexiv2=$(usex jpeg)
-		-DWITH_QMobipocket=$(usex mobi)
-		-DWITH_LibSpectre=$(usex postscript)
-		-DWITH_PopplerQt4=$(usex pdf)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_TIFF=$(usex tiff)
+		$(cmake-utils_use_find_package chm CHM)
+		$(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 mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     6fc1e45e2f91b7fccca186ead55220c98e0370e2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 19:00:51 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 19:01:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fc1e45e

kde-apps/okular: Drop deprecated Plasma 4 support

Package-Manager: portage-2.3.2

 kde-apps/okular/metadata.xml                | 1 -
 kde-apps/okular/okular-16.08.49.9999.ebuild | 5 ++---
 kde-apps/okular/okular-9999.ebuild          | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 49b367d..7ea11e7 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
 		<flag name="ebook">Add E-Book support</flag>
-		<flag name="kde">Enable kactivities support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>

diff --git a/kde-apps/okular/okular-16.08.49.9999.ebuild b/kde-apps/okular/okular-16.08.49.9999.ebuild
index ebb2860..4962501 100644
--- a/kde-apps/okular/okular-16.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.08.49.9999.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -30,7 +30,6 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
-	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -40,6 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_KActivities=OFF
 		-DWITH_CHM=$(usex chm)
 		-DWITH_QCA2=$(usex crypt)
 		-DWITH_DjVuLibre=$(usex djvu)
@@ -47,7 +47,6 @@ src_configure() {
 		-DWITH_EPub=$(usex ebook)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_Kexiv2=$(usex jpeg)
-		-DWITH_KActivities=$(usex kde)
 		-DWITH_QMobipocket=$(usex mobi)
 		-DWITH_LibSpectre=$(usex postscript)
 		-DWITH_PopplerQt4=$(usex pdf)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index ebb2860..4962501 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -30,7 +30,6 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
-	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -40,6 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DWITH_KActivities=OFF
 		-DWITH_CHM=$(usex chm)
 		-DWITH_QCA2=$(usex crypt)
 		-DWITH_DjVuLibre=$(usex djvu)
@@ -47,7 +47,6 @@ src_configure() {
 		-DWITH_EPub=$(usex ebook)
 		-DWITH_JPEG=$(usex jpeg)
 		-DWITH_Kexiv2=$(usex jpeg)
-		-DWITH_KActivities=$(usex kde)
 		-DWITH_QMobipocket=$(usex mobi)
 		-DWITH_LibSpectre=$(usex postscript)
 		-DWITH_PopplerQt4=$(usex pdf)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     ab2dcbe096fea49f2f61b96e7e34d8ed50e9d692
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jun 19 13:17:40 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 13:29:02 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab2dcbe0

kde-apps/okular: Add back USE=mobi

Package-Manager: portage-2.2.28

 kde-apps/okular/okular-5.9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index ef0f70e..f36fd65 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript +tiff"
 # TODO:
 # * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
 # * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
@@ -50,6 +50,7 @@ COMMON_DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff:0 )
@@ -76,6 +77,7 @@ src_configure() {
 		$(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 mobi QMobipocket)
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package postscript LibSpectre)
 		$(cmake-utils_use_find_package tiff TIFF)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     90c7d0c3339a5549dfb9b845e94fc534446efa35
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 19:21:57 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:23:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=90c7d0c3

kde-apps/okular: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/okular/okular-16.03.90.ebuild      | 31 ++++++++++++++---------------
 kde-apps/okular/okular-16.04.49.9999.ebuild | 31 ++++++++++++++---------------
 kde-apps/okular/okular-9999.ebuild          | 31 ++++++++++++++---------------
 3 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/kde-apps/okular/okular-16.03.90.ebuild b/kde-apps/okular/okular-16.03.90.ebuild
index e498013..2503d18 100644
--- a/kde-apps/okular/okular-16.03.90.ebuild
+++ b/kde-apps/okular/okular-16.03.90.ebuild
@@ -2,17 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
-
 #VIRTUALX_REQUIRED=test
 RESTRICT=test
 # test 2: parttest hangs
 
 inherit kde4-base
 
-DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=" ~amd64 ~x86"
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
@@ -40,19 +39,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with dpi LibKScreen)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with kde KActivities)
-		$(cmake-utils_use_with mobi QMobipocket)
-		$(cmake-utils_use_with postscript LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
+		-DWITH_CHM=$(usex chm)
+		-DWITH_QCA2=$(usex crypt)
+		-DWITH_DjVuLibre=$(usex djvu)
+		-DWITH_LibKScreen=$(usex dpi)
+		-DWITH_EPub=$(usex ebook)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Kexiv2=$(usex jpeg)
+		-DWITH_KActivities=$(usex kde)
+		-DWITH_QMobipocket=$(usex mobi)
+		-DWITH_LibSpectre=$(usex postscript)
+		-DWITH_PopplerQt4=$(usex pdf)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_TIFF=$(usex tiff)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-apps/okular/okular-16.04.49.9999.ebuild b/kde-apps/okular/okular-16.04.49.9999.ebuild
index 953a1b9..c9d9c67 100644
--- a/kde-apps/okular/okular-16.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-16.04.49.9999.ebuild
@@ -2,17 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
-
 #VIRTUALX_REQUIRED=test
 RESTRICT=test
 # test 2: parttest hangs
 
 inherit kde4-base
 
-DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
@@ -40,19 +39,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with dpi LibKScreen)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with kde KActivities)
-		$(cmake-utils_use_with mobi QMobipocket)
-		$(cmake-utils_use_with postscript LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
+		-DWITH_CHM=$(usex chm)
+		-DWITH_QCA2=$(usex crypt)
+		-DWITH_DjVuLibre=$(usex djvu)
+		-DWITH_LibKScreen=$(usex dpi)
+		-DWITH_EPub=$(usex ebook)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Kexiv2=$(usex jpeg)
+		-DWITH_KActivities=$(usex kde)
+		-DWITH_QMobipocket=$(usex mobi)
+		-DWITH_LibSpectre=$(usex postscript)
+		-DWITH_PopplerQt4=$(usex pdf)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_TIFF=$(usex tiff)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 953a1b9..c9d9c67 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -2,17 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
-
 #VIRTUALX_REQUIRED=test
 RESTRICT=test
 # test 2: parttest hangs
 
 inherit kde4-base
 
-DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
@@ -40,19 +39,19 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
-		$(cmake-utils_use_with dpi LibKScreen)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with kde KActivities)
-		$(cmake-utils_use_with mobi QMobipocket)
-		$(cmake-utils_use_with postscript LibSpectre)
-		$(cmake-utils_use_with pdf PopplerQt4)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
+		-DWITH_CHM=$(usex chm)
+		-DWITH_QCA2=$(usex crypt)
+		-DWITH_DjVuLibre=$(usex djvu)
+		-DWITH_LibKScreen=$(usex dpi)
+		-DWITH_EPub=$(usex ebook)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_Kexiv2=$(usex jpeg)
+		-DWITH_KActivities=$(usex kde)
+		-DWITH_QMobipocket=$(usex mobi)
+		-DWITH_LibSpectre=$(usex postscript)
+		-DWITH_PopplerQt4=$(usex pdf)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_TIFF=$(usex tiff)
 	)
 
 	kde4-base_src_configure

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     174fdea6477bbd4173ca6357c864363206734239
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Feb 11 21:32:58 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 05:01:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=174fdea6

kde-apps/okular: Bump KF5 min version, EAPI=6

Package-Manager: portage-2.2.27

 kde-apps/okular/okular-5.9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index b22f607..4518dc2 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
-FRAMEWORKS_MINIMAL="5.18.0"
+FRAMEWORKS_MINIMAL="5.19.0"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KPDF"
@@ -79,7 +79,7 @@ src_configure() {
 		$(cmake-utils_use_find_package jpeg KF5KExiv2)
 		$(cmake-utils_use_find_package pdf Poppler)
 		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package tiff)
+		$(cmake-utils_use_find_package tiff TIFF)
 	)
 
 	kde5_src_configure

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     9b27ab2d916d89a9476f9faf8fa1f2112bf991be
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 31 01:31:54 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 15:52:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b27ab2d

kde-apps/okular: Fix DEPENDs, tests succeed

Package-Manager: portage-2.2.27

 kde-apps/okular/okular-5.9999.ebuild | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index ad53d64..e08e661 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 FRAMEWORKS_MINIMAL="5.18.0"
 inherit kde5
@@ -12,15 +13,17 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff"
+IUSE="chm crypt djvu ebook +jpeg +pdf +postscript +tiff"
 # TODO:
-# * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
-#   yet
+# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
+# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
+# * Not packaged: Qt5TextToSpeech
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kactivities)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -39,12 +42,10 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/freetype
 	media-libs/phonon[qt5]
-	sys-devel/gettext
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	dpi? ( $(add_plasma_dep libkscreen) )
 	ebook? ( app-text/ebook-tools )
 	jpeg? (
 		$(add_kdeapps_dep libkexiv2)
@@ -54,18 +55,26 @@ DEPEND="
 	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff:0 )
 "
-RDEPEND="${DEPEND}
-	!kde-base/okular:4
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
 "
-RESTRICT=test
-# test 2: parttest hangs
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	kde5_src_prepare
+
+	if ! use test ; then
+		sed -i \
+			-e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
+			CMakeLists.txt || die
+	fi
+}
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package chm CHM)
 		$(cmake-utils_use_find_package crypt Qca-qt5)
 		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package dpi KF5Screen)
 		$(cmake-utils_use_find_package ebook EPub)
 		$(cmake-utils_use_find_package jpeg KF5KExiv2)
 		$(cmake-utils_use_find_package pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     74a7974d7a8653f5e471cbb537b7312614df6540
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 10 15:11:27 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 15:11:27 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=74a7974d

kde-apps/okular: Depend on >=KF-5.18

Package-Manager: portage-2.2.26

 kde-apps/okular/okular-5.9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index bad8f93..ad53d64 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK="forceoptional"
 EGIT_BRANCH="frameworks"
+FRAMEWORKS_MINIMAL="5.18.0"
 inherit kde5
 
 DESCRIPTION="Universal document viewer based on KPDF"

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     b4ab4d43cdb6e64c9ee8bc9ecdb06540c5a18a49
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Dec  9 23:17:24 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 06:41:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4ab4d43

kde-apps/okular: Add USE=kde, fix CamelCase switch

Package-Manager: portage-2.2.24

 kde-apps/okular/metadata.xml                | 1 +
 kde-apps/okular/okular-15.11.90.ebuild      | 6 ++++--
 kde-apps/okular/okular-15.12.49.9999.ebuild | 6 ++++--
 kde-apps/okular/okular-9999.ebuild          | 6 ++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index d12e0cd..11fa99e 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -5,6 +5,7 @@
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<flag name="dpi">DPI detection support for PDF rendering via <pkg>x11-libs/libkscreen</pkg></flag>
 		<flag name="ebook">Add E-Book support</flag>
+		<flag name="kde">Enable kactivities support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 	</use>
 	<herd>kde</herd>

diff --git a/kde-apps/okular/okular-15.11.90.ebuild b/kde-apps/okular/okular-15.11.90.ebuild
index df20169..6486c13 100644
--- a/kde-apps/okular/okular-15.11.90.ebuild
+++ b/kde-apps/okular/okular-15.11.90.ebuild
@@ -15,7 +15,7 @@ inherit kde4-base
 DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS="~amd64 ~x86"
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
+	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -46,7 +47,8 @@ src_configure() {
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with mobi QMobiPocket)
+		$(cmake-utils_use_with kde KActivities)
+		$(cmake-utils_use_with mobi QMobipocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
 		$(cmake-utils_use_with pdf Poppler)

diff --git a/kde-apps/okular/okular-15.12.49.9999.ebuild b/kde-apps/okular/okular-15.12.49.9999.ebuild
index 6950150..e800fd5 100644
--- a/kde-apps/okular/okular-15.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-15.12.49.9999.ebuild
@@ -15,7 +15,7 @@ inherit kde4-base
 DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
+	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -46,7 +47,8 @@ src_configure() {
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with mobi QMobiPocket)
+		$(cmake-utils_use_with kde KActivities)
+		$(cmake-utils_use_with mobi QMobipocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
 		$(cmake-utils_use_with pdf Poppler)

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 6950150..e800fd5 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -15,7 +15,7 @@ inherit kde4-base
 DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
+IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -30,6 +30,7 @@ DEPEND="
 		$(add_kdeapps_dep libkexiv2)
 		virtual/jpeg:0
 	)
+	kde? ( $(add_kdebase_dep kactivities '' 4.13.3) )
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
@@ -46,7 +47,8 @@ src_configure() {
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with mobi QMobiPocket)
+		$(cmake-utils_use_with kde KActivities)
+		$(cmake-utils_use_with mobi QMobipocket)
 		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
 		$(cmake-utils_use_with pdf Poppler)

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     7aaa3efe0d462a87ccc38ee9fd6bc7da333651e3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 13:48:18 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 13:48:18 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7aaa3efe

[kde-apps/okular] Add missing dependency SLOT.

Package-Manager: portage-2.2.14

---
 kde-apps/okular/okular-14.12.1.ebuild | 2 +-
 kde-apps/okular/okular-14.12.2.ebuild | 2 +-
 kde-apps/okular/okular-5.9999.ebuild  | 2 +-
 kde-apps/okular/okular-9999.ebuild    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/okular/okular-14.12.1.ebuild b/kde-apps/okular/okular-14.12.1.ebuild
index a368b72..4c8544a 100644
--- a/kde-apps/okular/okular-14.12.1.ebuild
+++ b/kde-apps/okular/okular-14.12.1.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/okular/okular-14.12.2.ebuild b/kde-apps/okular/okular-14.12.2.ebuild
index a368b72..4c8544a 100644
--- a/kde-apps/okular/okular-14.12.2.ebuild
+++ b/kde-apps/okular/okular-14.12.2.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index c1e7170..e898d1c 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -51,7 +51,7 @@ DEPEND="
 	)
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}
 	!kde-base/okular:4

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 41d0f11..e5f73a0 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
 	pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
 	postscript? ( app-text/libspectre )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}"
 

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Johannes Huber]

commit:     a44d7663a553acf21e18cea3c2c6387e86d1ffe7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 28 23:51:41 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 23:51:41 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a44d7663

[kde-apps/okular] Adjust use dependencies to handle >=app-crypt/qca-2.1

Package-Manager: portage-2.2.15

---
 kde-apps/okular/okular-14.12.1.ebuild | 2 +-
 kde-apps/okular/okular-9999.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/okular/okular-14.12.1.ebuild b/kde-apps/okular/okular-14.12.1.ebuild
index 8902df4..a368b72 100644
--- a/kde-apps/okular/okular-14.12.1.ebuild
+++ b/kde-apps/okular/okular-14.12.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/qimageblitz
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4] )
 	djvu? ( app-text/djvu )
 	dpi? ( x11-libs/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )

diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 048efaf..41d0f11 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="
 	media-libs/qimageblitz
 	sys-libs/zlib
 	chm? ( dev-libs/chmlib )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4] )
 	djvu? ( app-text/djvu )
 	dpi? ( x11-libs/libkscreen:4 )
 	ebook? ( app-text/ebook-tools )

[gentoo-commits] proj/kde:master commit in: kde-apps/okular/

[Michael Palimaka]

commit:     13fd83c572ae6c5453e137fbdb445ea8b6b9de65
Author:     Eugene Shalygin <eugene.shalygin <AT> gmail <DOT> com>
AuthorDate: Wed Jan 28 14:08:14 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 28 14:10:47 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=13fd83c5

[kde-apps/okular] Upstream has switched to find_package wrt bug #536858.

Upstream commit: 93918b1ec8f585dd135db1449e1b22b878f82fbc

Package-Manager: portage-2.2.14

---
 kde-apps/okular/okular-5.9999.ebuild | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index 54e3c2e..12f2da3 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -11,11 +11,8 @@ inherit kde5
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="http://okular.kde.org http://www.kde.org/applications/graphics/okular"
 KEYWORDS=""
-IUSE="chm crypt dpi djvu ebook +jpeg +pdf +tiff"
+IUSE="chm crypt dpi djvu ebook +jpeg +pdf +postscript +tiff"
 # TODO:
-# * Temporarily deactivated +postscript USE as upstream has it deactivated.
-#   postscript? ( app-text/libspectre )
-# 	$(cmake-utils_use_with postscript LibSpectre)
 # * Deactivated dependency media-libs/qimageblitz as there is no Qt5 version
 #   yet
 
@@ -48,8 +45,12 @@ DEPEND="
 	djvu? ( app-text/djvu )
 	dpi? ( $(add_kdeplasma_dep libkscreen) )
 	ebook? ( app-text/ebook-tools )
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? (
+		$(add_kdeapps_dep libkexiv2)
+		virtual/jpeg:0
+	)
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff )
 "
 RDEPEND="${DEPEND}
@@ -67,15 +68,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with chm)
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with djvu DjVuLibre)
+		$(cmake-utils_use_find_package chm CHM)
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		$(cmake-utils_use_find_package djvu DjVuLibre)
 		$(cmake-utils_use_find_package dpi KF5Screen)
-		$(cmake-utils_use_with ebook EPub)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with jpeg Kexiv2)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with tiff)
+		$(cmake-utils_use_find_package ebook EPub)
+		$(cmake-utils_use_find_package jpeg KF5KExiv2)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package tiff)
 	)
 
 	kde5_src_configure