gentoo resync : 05.12.2021

6 files changed, 123 insertions, 53 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 42eaf7cab0de..660f89554362 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,9 +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
+AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5
 DIST okular-21.08.3.tar.xz 8088712 BLAKE2B 50ded7dba63355a995db869d2b4f6eabd3aad905c1d17cd9b5e51cfd0d082ade838d641aee246c0aabf10d24c7c4704cdae03d2e9499452a1cb3c344b05997da SHA512 50f5e4718ae879932aad411dc6569905c541852f81ecf0e4c1896eb249039311c1360274d051ae3aba05e37dd2ec010844b56e277f52b1cc5326a86f8ecba85d
-EBUILD okular-21.04.3-r2.ebuild 3301 BLAKE2B 5627fe73b7be3898b2d62214c929ba254865b88d73c8c7577a97638aadb9af5998486bbd5f3bd351f9f6895162840966c4b60f27f5d4867e521e782599cdd40a SHA512 af9f1c243a2a88b8fe3f5add30f1a1065c572a11d8958a74db9129aba3365e89b8744dc7512bd9694bf62829b6d0a11aae780f951dda923aaba60bfc8129c66e
-EBUILD okular-21.08.3.ebuild 3363 BLAKE2B bfd6ce3a8b42f0290fcdade1c0425f1fd8ccd84883c0d148faf6bdfb8a7ec231b83043efd6667bac74bb019ed91d8ee2a685353bb35757a6bccbb7bfd7e758dc SHA512 77c4bfc15c729d7ccc8f19eed7ce3e976aec3a87e3a377f346bdd87aa0e816f35cf91ebd55d4de2eca42b6d57e11f2c1a62446b6dc35fdaa90294d8424b416fc
-MISC metadata.xml 1106 BLAKE2B 1310d9ce720f26ecaea0ea4d63e9bed06ea2dc4dcf646dbe9473edd21711943910952c7d82208e0fda699bfebf2c0d03ac47bcb4877bb05f4e1245373b1788a9 SHA512 f3a53b35998ef23cf6b9fa9ecfb57a1a39f31b8368552b796a8a368d2a5d76ab64700dd2a4fed229ec942d6614edeb7359627d96d9b0ebeebcc96679db7a9b32
+DIST okular-21.11.90.tar.xz 8125568 BLAKE2B fb0673fc13e05671849f63ae0fcaa735f9309af9856d2fc7f159eb0704c5b6cef4b320890345156bf7a9ea53b700847e9427ece4f2762ea7d727d640e0d12d9c SHA512 5e93173d5704b965695547288c8dd586e8d3a574efa7457775287a017e38011e8a8ade694e6edc981e9055445470d7c90262f144204364b517287216094771bd
+EBUILD okular-21.08.3.ebuild 3354 BLAKE2B 701eba0004bf50a7ff37e293e56da6649af390805c9d15b1a843b1fedef9d89759581285e7ed01451919bf68a2877cfc7643625ca7ad3d46078115290ef2ce18 SHA512 cc9a151f86ac089c558b6cbcb6a0f54ee998cd11f897f7590b5826b04ce1a667bed7e2f5f573c835218c82bbf13dfda9a6eff5821dc203c96af5c184a4f0b919
+EBUILD okular-21.11.90.ebuild 3284 BLAKE2B c451a34a1d8e14211d6698acdfc05d1da990d9ab788a0285a4f31358e7c0264d9ca41f1a8ea20c9c1b418786d75e6f7d7faec1579b308bf96d83c1fb4426513d SHA512 b4485ae10c92427bcdbed3dbbddc24cd358308428e2418759f71c5c731d1d380ef9f5c3e9cc2af814bfd66b7028db88d3571a347e6de05e14c6a72301178050d
+MISC metadata.xml 1113 BLAKE2B c13cccdc34297b23156dd5ef8f41c8515df5d2f2adf5aac584080aebf43556ab27f03716ed6f844617d5abf426f434febc69f99f0f2d8fac5f4dedd83c34b8ae SHA512 de94d9c06c35e64f67f191cb15a6347042bf57da991a182e1ce1ef576453b0f56fb39209829702f2d6a6297d53e0d1606d3dfdc82dd176bc65b6f1cb8b4710e5
diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
deleted file mode 100644
index 061db80d2bc5..000000000000
--- a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
-From: Yaroslav Sidlovsky <zawertun@gmail.com>
-Date: Mon, 12 Jul 2021 11:06:26 +0300
-Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
-
-BUG: 439807
-(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
----
- generators/fictionbook/libokularGenerator_fb.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/generators/fictionbook/libokularGenerator_fb.json b/generators/fictionbook/libokularGenerator_fb.json
-index 1ef01a2d5..3d499a50f 100644
---- a/generators/fictionbook/libokularGenerator_fb.json
-+++ b/generators/fictionbook/libokularGenerator_fb.json
-@@ -120,7 +120,7 @@
-         "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
-         "Description[zh_CN]": "FictionBook 电子书渲染器",
-         "Description[zh_TW]": "FictionBook 電子書成像器",
--        "Id": "okular_fax",
-+        "Id": "okular_fictionbook",
-         "License": "GPL",
-         "MimeTypes": [
-             "application/x-fictionbook+xml"
--- 
-GitLab
-
diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch
new file mode 100644
index 000000000000..a0babcad1c05
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch
@@ -0,0 +1,101 @@
+From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt                 | 12 +++---------
+ generators/chm/autotests/CMakeLists.txt       |  8 ++++++++
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt           | 10 +++-------
+ generators/comicbook/autotests/CMakeLists.txt |  6 ++++++
+ 8 files changed, 27 insertions(+), 18 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 0d7452cba..3adb3fd54 100644
+--- a/generators/chm/CMakeLists.txt
++++ b/generators/chm/CMakeLists.txt
+@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
+ 
+-########### autotests ###############
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-    TEST_NAME "chmgeneratortest"
+-    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 000000000..59753ca45
+--- /dev/null
++++ b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++    TEST_NAME "chmgeneratortest"
++    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
+index c428fa1b3..68f7a5821 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
++++ b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -30,7 +30,7 @@ void ChmGeneratorTest::initTestCase()
+ {
+     Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest"));
+     m_document = new Okular::Document(nullptr);
+-    const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
++    const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
+     QMimeDatabase db;
+     const QMimeType mime = db.mimeTypeForFile(testFile);
+     QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess);
+diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
+index a0e7569a2..91bcc6ec7 100644
+--- a/generators/comicbook/CMakeLists.txt
++++ b/generators/comicbook/CMakeLists.txt
+@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA)
+     target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1)
+ endif()
+ 
+-########### autotests ###############
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-    TEST_NAME "comicbooktest"
+-    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++    add_subdirectory(autotests)
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularComicbook.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt
+new file mode 100644
+index 000000000..aaacb341a
+--- /dev/null
++++ b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,6 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(comicbooktest.cpp
++    TEST_NAME "comicbooktest"
++    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
++)
+-- 
+2.33.0
+
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 79a14c030c28..5294ccba1b21 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -10,9 +10,9 @@
 	</upstream>
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
+		<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.08.3.ebuild b/kde-apps/okular/okular-21.08.3.ebuild
index 4e3e45b993dd..85d5e52e333a 100644
--- a/kde-apps/okular/okular-21.08.3.ebuild
+++ b/kde-apps/okular/okular-21.08.3.ebuild
@@ -16,8 +16,8 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="chm djvu epub +image-backend kwallet markdown mobi +pdf +plucker +postscript qml share speech +tiff"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -48,13 +48,13 @@ DEPEND="
 		dev-libs/libzip:=
 		>=kde-frameworks/khtml-${KFMIN}:5
 	)
+	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[nss,qt5] )
@@ -84,10 +84,10 @@ src_configure() {
 		$(cmake_use_find_package chm CHM)
 		$(cmake_use_find_package chm KF5KHtml)
 		$(cmake_use_find_package chm LibZip)
+		-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.04.3-r2.ebuild b/kde-apps/okular/okular-21.11.90.ebuild
index 8ef5c513334a..f09e5894687d 100644
--- a/kde-apps/okular/okular-21.04.3-r2.ebuild
+++ b/kde-apps/okular/okular-21.11.90.ebuild
@@ -1,12 +1,12 @@
 # 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"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,8 +16,8 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -39,16 +39,11 @@ 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
 	sys-libs/zlib
-	chm? (
-		dev-libs/chmlib
-		dev-libs/libzip:=
-		>=kde-frameworks/khtml-${KFMIN}:5
-	)
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
 	image-backend? (
@@ -57,7 +52,7 @@ DEPEND="
 	)
 	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 )
@@ -73,17 +68,18 @@ RDEPEND="${DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
 	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-	"${FILESDIR}/${P}-fix-fictionbook-support.patch" # KDE-bug 439807
+	"${FILESDIR}/${PN}-21.08.1-optional-options.patch" # bug 810958
 )
 
 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)
+		-DWITH_KWALLET=$(usex crypt)
 		$(cmake_use_find_package djvu DjVuLibre)
 		$(cmake_use_find_package epub EPub)
 		$(cmake_use_find_package image-backend KF5KExiv2)