gentoo resync : 03.09.2021

4 files changed, 119 insertions, 6 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index ff301c2d5bf4..1a2d5b98761c 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,8 +1,9 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-20.11.90-tests.patch 6748 BLAKE2B 309fb48b50fcd594e9827c4c9b1cbd86e3631fea791e55fbe2d3773b0c46730cd1ab1e9397197287872ad42ebe2f03eccef58cec8237f93c9da7df0c1f19364c SHA512 a0f41a9285f67a3b4878cfaa38e59074ab493e43d5ccb78d65dcb9dd94605b76c36f2345b32a66a5764e9ad564e41282a4470cfeda6af305721a198defab134e
 AUX okular-21.04.3-fix-fictionbook-support.patch 1074 BLAKE2B 16f98c1ba248ed2ba0b6829f09045dd8e3501483f3cd6f8a8911183c27da3fb5fb737838711093f85e1f7ef3d33e9a430ef600c9181a90e8526337f3d9294ce7 SHA512 e1f290553bba99773a39d52f7ed89c4193f40d9a674e78d4abd7ac29e8a8622e7ed1334aececcb1b426bf67c6b60c94405c75b6d0379eab2b97f6b2bd719641e
+AUX okular-21.08.1-optional-options.patch 3144 BLAKE2B 1770bba880ab336998c628887c52062e10a87d1b2ed5fcf08870c17837ec8c2c2c608952153fcf6459eb63fb1302e3cb2276be60fc0607f23886442a920defc9 SHA512 5b34ffa7b58e67ec34b95e50274a97b55eafc5a5b47e07efb43597d5314f785c8dbf34222de220511327b6f9f9d8a98288a50ef9fe4a42c9b3f899dc580b7587
 DIST okular-21.04.3.tar.xz 8052500 BLAKE2B d0bcd358f9da6c0a19c30d036e73736c06e67730d30be6fca64c33a188adbe8bc1f15efba2c62739e88fc3a4dfe4100a9c3588e077f689176f1a0a2ad2f6b59b SHA512 21f34dcef50d15a8816d3898a002133e068ba239d1730892e0d71e58e6196b493544792fa5c06de689fdf1fe7f853586578f3963a64e46a9797484f983814c22
-DIST okular-21.08.0.tar.xz 8083288 BLAKE2B 8eae57acf83632c10d202cbe9ff87815d4daabb80f18f09979fe1c19eaa48340c1f7f3c4d71acc81024ae2a3c567844371e3b95cd9fe9a40429dbaacbdf2db62 SHA512 49d0c9ffb3315fd0076f3999a1e066929608c330215eee8670631cca5cebc77ad2ecf9c6e64f7e4f82c29ae664fea32be0ded330e4233c379b165a7655ded984
+DIST okular-21.08.1.tar.xz 8087324 BLAKE2B f73539cde4781cffd986a42da7f4c79928882c2b1f67bf26b6e588ba050c208b732af8fe5646c58a8b8295e7c31a1e6361822347895c15a74faba8ca9939c10b SHA512 bce89cc7280137c2c995eb17ee3ab1d5e214068883971a8bae0bd7cc91e0f6286aaade401283046d0bc3eccb587daa59b7894fcc8b89ebaad94cbb11c8ce5088
 EBUILD okular-21.04.3-r2.ebuild 3301 BLAKE2B 5627fe73b7be3898b2d62214c929ba254865b88d73c8c7577a97638aadb9af5998486bbd5f3bd351f9f6895162840966c4b60f27f5d4867e521e782599cdd40a SHA512 af9f1c243a2a88b8fe3f5add30f1a1065c572a11d8958a74db9129aba3365e89b8744dc7512bd9694bf62829b6d0a11aae780f951dda923aaba60bfc8129c66e
-EBUILD okular-21.08.0.ebuild 3237 BLAKE2B 4a0fddf84e4f6a6166a85a6658e2e00c2526c4c1cddea143768d2b8c41d879bc2badd3ea5b07e68c87d1ce3127fd2f917126984aaabf424a9dfc72c2d7a927e4 SHA512 e75bba6a536888922ba92b82ca7bf091bd4880264647cc3a619d10ef3d21223af46e7fd26bf68d22243343cc122ae31b8f99b070d4bde819d1a2c2a7330c58c4
-MISC metadata.xml 998 BLAKE2B f1fdc9ef6524d373ae245bbe5756ee978931778e032390eb2d5cb95e916c955acc0811325ab54a7b04345de670363b9c5ef580fe03089ba63be1cab932081955 SHA512 897907246d20fa4434083ecc5af074473982e3f3645eeadcb4573933a3c628e140fa27294d833c5e1c9f7af84485652a93ee6ae96c6a27a9f3c0b5460cb993de
+EBUILD okular-21.08.1.ebuild 3347 BLAKE2B d004181d084a484cd2bf4edb8b14521e419065bf4910e216ed2385872ddd3d4a703022638ab46625a8d1ab99be4ed28bd0f26ebfab43e3fe4ba5c50007f91a77 SHA512 589473e6a5fce4d256e8881c91145ca73627c1cb029cb54302b4e0ef38eef3fd466ee2a706a3b1fcaca7b78ba135df1a329215bcd1200e057012a9b9f6133847
+MISC metadata.xml 1105 BLAKE2B 9a523f523c70b0b6896687f150dba4008244b640c5f0e9b90c09b6a742834aa23e1326d85ffec267718d48b9903a9ae40aff05cb675a15f1ad1a98673bb791bf SHA512 286a6fd644774172d7ed8d6dc9dfef9f65efb62b9fc4a3a3d5336e1427c52c869753a161875371ace4ef2717cf8363c780b244c4fc415b6c65c0f4e2de72f8cc
diff --git a/kde-apps/okular/files/okular-21.08.1-optional-options.patch b/kde-apps/okular/files/okular-21.08.1-optional-options.patch
new file mode 100644
index 000000000000..71d8df156e51
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.08.1-optional-options.patch
@@ -0,0 +1,109 @@
+From 54351076f87ce2a43a87427d9c3f3e00539b9fd5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Aug 2021 16:48:42 +0200
+Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
+
+Since I was asked to implement this, might as well make it real options,
+not just limited to ANDROID. Even though optional find_package() call is
+already being used for KF5Purpose as well.
+
+KF5DocTools is not made required more often than not.
+
+See also: https://invent.kde.org/graphics/okular/-/issues/61
+Downstream report: https://bugs.gentoo.org/810958
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt        | 21 ++++++++-------------
+ config-okular.h.cmake |  6 ++++++
+ core/generator.cpp    |  1 +
+ core/scripter.cpp     |  1 +
+ 4 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2506c3cfa..984f3695e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,12 +76,9 @@ ecm_setup_qtplugin_macro_names(
+         PACKAGE_SETUP_AUTOMOC_VARIABLES
+ )
+ 
+-set(optionalComponents)
+-if (ANDROID)
+-#   we want to make sure that generally all components are found
+-
+-    set(optionalComponents "OPTIONAL_COMPONENTS")
+-endif()
++# we want to make sure that generally all components are found
++option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
++option(WITH_KJS "Build with scripting support" ON)
+ 
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+     Archive
+@@ -98,17 +95,15 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+     TextWidgets
+     ThreadWeaver
+     WindowSystem
+-    ${optionalComponents}
++    OPTIONAL_COMPONENTS
+     DocTools
+-    JS
+-    Wallet
+ )
+ 
+-if(KF5Wallet_FOUND)
+-    add_definitions(-DWITH_KWALLET=1)
++if(WITH_KWALLET)
++    find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+-if(KF5JS_FOUND)
+-    add_definitions(-DWITH_KJS=1)
++if(WITH_KJS)
++    find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
+ endif()
+ 
+ if(NOT WIN32 AND NOT ANDROID)
+diff --git a/config-okular.h.cmake b/config-okular.h.cmake
+index 905aac9cb..00e45f77c 100644
+--- a/config-okular.h.cmake
++++ b/config-okular.h.cmake
+@@ -1,6 +1,12 @@
+ /* Defines if force the use DRM in okular */
+ #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
+ 
++/* Defines if the KJS framework is available */
++#cmakedefine WITH_KJS
++
++/* Defines if the kwallet framework is available */
++#cmakedefine WITH_KWALLET
++
+ /* Defines if the purpose framework is available */
+ #define PURPOSE_FOUND ${PURPOSE_FOUND}
+ 
+diff --git a/core/generator.cpp b/core/generator.cpp
+index 051c2c922..f675ebcb3 100644
+--- a/core/generator.cpp
++++ b/core/generator.cpp
+@@ -8,6 +8,7 @@
+     SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ 
++#include "config-okular.h"
+ #include "generator.h"
+ #include "generator_p.h"
+ #include "observer.h"
+diff --git a/core/scripter.cpp b/core/scripter.cpp
+index c60645895..d5b640dbb 100644
+--- a/core/scripter.cpp
++++ b/core/scripter.cpp
+@@ -4,6 +4,7 @@
+     SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ 
++#include "config-okular.h"
+ #include "scripter.h"
+ 
+ #include <QDebug>
+-- 
+2.33.0
+
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 530e48b08dd1..00b74ac444b0 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -12,6 +12,7 @@
 		<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>
 		<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.08.0.ebuild b/kde-apps/okular/okular-21.08.1.ebuild
index 76cb6eec54fa..ec6ce64b2497 100644
--- a/kde-apps/okular/okular-21.08.0.ebuild
+++ b/kde-apps/okular/okular-21.08.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
@@ -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 ~x86"
-IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+IUSE="chm djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -39,7 +39,6 @@ DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/kpty-${KFMIN}:5
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
 	media-libs/freetype
 	>=media-libs/phonon-4.11.0
@@ -55,6 +54,7 @@ DEPEND="
 		>=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[nss,qt5] )
@@ -75,6 +75,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
+	"${FILESDIR}/${P}-optional-options.patch" # bug 810958
 )
 
 src_configure() {
@@ -86,6 +87,7 @@ src_configure() {
 		$(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)