gentoo resync : 25.08.2020

5 files changed, 66 insertions, 65 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index b34169447626..c0933e949348 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,9 +1,8 @@
-AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
-AUX okular-19.12.3-CVE-2020-9359.patch 902 BLAKE2B 644004775b9a66637ed75697524c6f0b2a8077fae7cfcf36a063b46e2f921946c285319740e6debef25b2ea93c18ad5dc8c9b739b8950af305416416517849b5 SHA512 2d8870f1aa63defcf2ecfd42c0dfb0d474af6885c2448566704795d7caa2e9c20e5ede284db58139ea5736d5d0074d23c023a89f359d09fd6051d1f03f561903
 AUX okular-20.03.70-tests.patch 6613 BLAKE2B 46bbb80b1b97bc92ed0c17ae352a977710d7234eb85c647356d9593a138f6c872960511c7f8d8eb24e060b2ffecb0cc5b1bf79ed198ba10e43fb341c1cdc6e5a SHA512 c1a283888b612950eda1080d941f157651b8e52c4032b5fc46786ab45045c5e8d272769516a90cf652a384519b2fe046ec951dc45c4edfb5258c50112b8d2ed2
-DIST okular-19.12.3.tar.xz 7208888 BLAKE2B c98e6708d5784ce2dc976de0b205681cc34c0a6b5684e408267da05ba335fa4e9c064eec393dc080dd97f06f38ef665aba9354787d2e42d13312b4820836f168 SHA512 ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d
-DIST okular-20.04.2.tar.xz 7237876 BLAKE2B 8b8570257d8b9548666a877b21589e9e899e2b1e99197f1dbecc53c7f3e5187331463e4c80e167a0be2f33a4b43ca241c81b1ebdfe8826a0d281a151e92ba155 SHA512 1f6f22a221701d25a0e0eef094cb60b8b66722ac158c0ac499010448504b507c72fedd33814b3920ba3ab5eb53a2c8b09505b7a7697bde589d89407e0cdbf961
-EBUILD okular-19.12.3-r1.ebuild 3205 BLAKE2B c000e95e21e6637b94a9afab498a98b27b6e9ca25f53b2e59a6d1fb5763dbd29ea3beeb1daf6d1991bb6ac15b49af7fca1c0535847795d8503c00636315d682c SHA512 90eecfadef6170fe4d0ef1a9ea4c86cf43de8d693cf48568ee7ac5b60d05f4402bbf61b48d497d167a3beb3100214754149d1ebf571ce8d33b983c586149de3f
-EBUILD okular-20.04.2.ebuild 3213 BLAKE2B bd711148d95911c4994ecd169da06754954518ca2d615445f9162ecd59851993dc8b2d76c6a4b4fdb1c395713c75e5b46d95e923ef3e096b55c7383e9c2b9e1f SHA512 c00b351bcf339102c9425189aeed3105e49ca0f3f90865adeba62e70d818ab79d4cb21c4ddb5ed4ae025c0ae237f5fa16a6a577f837ce04688a1870e8ce9bf22
+AUX okular-20.07.90-tests.patch 6660 BLAKE2B 4adda1438641d31fee4c770bee0970b33b940c3a943f2c66d4c9af819e39f01515837d3496e2595737312de0f0e13ee00cdc0651c1b9d91a7f10bd907bf0a63b SHA512 898a552b401db6abd50cff591fbd3df6f533f70e4e99842570e5c847e55efbe29c464d640f598cb4fcbead445175ec96ffd70809088f58cef5fefb6877535f43
+DIST okular-20.04.3.tar.xz 7236056 BLAKE2B a387a997b1747c08a23d483bc9e72d960d1be877764dc602ed56f322dd80d13301c9fc7a21561b1f267ad197278f8e6510cdb890427fd420c2ae84eded39fbf9 SHA512 1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01
+DIST okular-20.08.0.tar.xz 7515468 BLAKE2B 337912f79e04b14114dc0f7dc61cc11ff17b560fcc4e523efd86f0f27029646bf2849ff093099fa669e9dc1e242133d71c7824ea8b132714a3dd7d799892e530 SHA512 d79af59d97317995d4a1426602ff35eb1450cf967817e57436f3f7545f23037364d59767620b068983a4dc6411be4f8adfe5d0cb177989dd027d594d22a8bb9e
+EBUILD okular-20.04.3.ebuild 3153 BLAKE2B 0ce38279b296effe97f899a8d6241b8d8690fe4e9631bffcea99f6e74bf4202d9891d6745915187bab04d00bc41aea1676f1f3b7856dfa624ccbe86d2a73ce3e SHA512 ee290026ef28395aa09e22f157f737ef006737d93316a503d5ac2a00791d32e9d6321584a9d158b4ff355fc7ceff3cc363351f8bd67e572cab518be5f9cf1644
+EBUILD okular-20.08.0.ebuild 3127 BLAKE2B 6d2a68b582c878bcf8714d9b01597a1bd4eadbf26903caa154244830c3d1e61421de8e1d4bb73d2de1c22e56ddcf6bcaf1626a6fe19b8b590307a9d259d7469d SHA512 22918f86c927c283f05fe07a368dc0eb7b9b1e6b8f4783665dc2dcaf4d0bf247a47fe9768f4abfdcc01d52e346f11fe043b141cc056c0e83843e1129c427c575
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch b/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch
deleted file mode 100644
index e7d72487621f..000000000000
--- a/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Tue, 10 Mar 2020 23:07:24 +0100
-Subject: [PATCH] Document::processAction: If the url points to a binary, don't
- run it
-
----
- core/document.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/core/document.cpp b/core/document.cpp
-index 3215a1abc..0aa5b6980 100644
---- a/core/document.cpp
-+++ b/core/document.cpp
-@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action )
-                 {
-                     const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url);
-                     // KRun autodeletes
--                    new KRun( realUrl, d->m_widget );
-+                    KRun *r = new KRun( realUrl, d->m_widget );
-+                    r->setRunExecutables(false);
-                 }
-             }
-             } break;
--- 
-2.24.1
-
diff --git a/kde-apps/okular/files/okular-18.08.0-tests.patch b/kde-apps/okular/files/okular-20.07.90-tests.patch
index 0e2cdaecd4af..6bd229fc3851 100644
--- a/kde-apps/okular/files/okular-18.08.0-tests.patch
+++ b/kde-apps/okular/files/okular-20.07.90-tests.patch
@@ -1,4 +1,4 @@
-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
+From c675ba8bed1e792f351fabf3ba040a86138f9f84 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
@@ -7,11 +7,14 @@ 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 ++++++
  generators/kimgio/CMakeLists.txt              |  6 +-----
  generators/kimgio/tests/CMakeLists.txt        |  5 +++++
  generators/kimgio/tests/kimgiotest.cpp        |  2 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
+ 8 files changed, 28 insertions(+), 23 deletions(-)
  create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
  create mode 100644 generators/kimgio/tests/CMakeLists.txt
 
 diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
@@ -52,18 +55,51 @@ index 000000000..59753ca45
 +
 +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 6b0b8efc7..25fd6631a 100644
+index 9245a736f..5a2c487b4 100644
 --- a/generators/chm/autotests/chmgeneratortest.cpp
 +++ b/generators/chm/autotests/chmgeneratortest.cpp
 @@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
  {
-     Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
-     m_document = new Okular::Document( 0 );
+     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 );
+     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 9a07c7183..316c93152 100644
+--- a/generators/comicbook/CMakeLists.txt
++++ b/generators/comicbook/CMakeLists.txt
+@@ -29,13 +29,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
++)
 diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
 index b8cac76df..49f893bc1 100644
 --- a/generators/kimgio/CMakeLists.txt
@@ -95,18 +131,18 @@ index 000000000..f31bf3fe8
 +ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
 +target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
 diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
-index b3039a6bb..78608df9d 100644
+index f2e50641d..a24f7af80 100644
 --- a/generators/kimgio/tests/kimgiotest.cpp
 +++ b/generators/kimgio/tests/kimgiotest.cpp
 @@ -9,7 +9,7 @@
+  ***************************************************************************/
  
  
- #include "../generator_kimgio.h"
 -#include "../../settings_core.h"
 +#include "../../../settings_core.h"
+ #include "../generator_kimgio.h"
  
  #include <core/observer.h>
- #include <core/page.h>
 -- 
-2.14.2
+2.25.1
 
diff --git a/kde-apps/okular/okular-20.04.2.ebuild b/kde-apps/okular/okular-20.04.3.ebuild
index da77b2e33e87..7e38e1125ebc 100644
--- a/kde-apps/okular/okular-20.04.2.ebuild
+++ b/kde-apps/okular/okular-20.04.3.ebuild
@@ -7,7 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.oku
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
@@ -70,9 +70,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# tests require existing installation
-RESTRICT+=" test"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-18.12.0-tests.patch"
 	"${FILESDIR}/${PN}-20.03.70-tests.patch"
diff --git a/kde-apps/okular/okular-19.12.3-r1.ebuild b/kde-apps/okular/okular-20.08.0.ebuild
index 2cb79f21ec1d..0912b01efb4f 100644
--- a/kde-apps/okular/okular-19.12.3-r1.ebuild
+++ b/kde-apps/okular/okular-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,10 +16,15 @@ HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.oku
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 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,16 +65,12 @@ 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
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${PN}-18.12.0-tests.patch"
-	"${FILESDIR}/${P}-CVE-2020-9359.patch" # bug 712490
-)
+PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
 
 src_prepare() {
 	ecm_src_prepare