gentoo resync : 17.07.2021

4 files changed, 32 insertions, 110 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 761c67ff9317..fb9fbde90dee 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,9 +1,8 @@
 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
 DIST okular-20.12.3.tar.xz 7884780 BLAKE2B 8ff44f3f60ea6f9c8b0b2357727a56aae9cd77fd408c60cf8282b41f2e286420747c11bb669e3bf52192481ad56dc3ee9125ba2f777432b423b6217249d31c7f SHA512 f64eca81bdbd163b2780037026c330259d5dd7fed7a175b06601742bc6b98c25f26463d72764e5b77878b3c36df4f4657d4cd5349f389786a45df1a5fa9cda45
-DIST okular-21.04.2.tar.xz 8050596 BLAKE2B cd8c3c763d20900c17d9477873a78aa75a0c792318de2fdcc4387f7daf531177d63eb7a9639bf57a4a867d0da2268fab9303f43f41703bb75e1d5cbbcc432eb4 SHA512 fcee0e9711bfcbe83e71b3c50f705d6fa4f39d085b5902fc34551c4e76156a4c6585680792dca84580947a3430ce823f8e8b9c170f319c4f6f7a229040fcd1f2
 DIST okular-21.04.3.tar.xz 8052500 BLAKE2B d0bcd358f9da6c0a19c30d036e73736c06e67730d30be6fca64c33a188adbe8bc1f15efba2c62739e88fc3a4dfe4100a9c3588e077f689176f1a0a2ad2f6b59b SHA512 21f34dcef50d15a8816d3898a002133e068ba239d1730892e0d71e58e6196b493544792fa5c06de689fdf1fe7f853586578f3963a64e46a9797484f983814c22
 EBUILD okular-20.12.3.ebuild 3153 BLAKE2B fde78aeb5bd969230d787b6d325da910fe2b7c7ad403d8f084fae91674a7d0c2a4009ce4f6c56733828e8940c395fa9e0634d2f0a49bdb9974cf9eaaf0c40879 SHA512 79dd69de245670d9508a58b2ceab924b980d8218a592bdca8a7429bb557e3d4a6d01d286ec20e684f8751ceaab2c698f1d5f3273c7f81acfd5225bec921c2308
-EBUILD okular-21.04.2.ebuild 3160 BLAKE2B 3974521213d97b732b529d1b8cd944422995d6f29a18f78317b8a8070f8008a1a54cbdbbd9be1cfe5d04914e8c6aa136dbb2e63d1e580fc7223281acee714872 SHA512 5cd22c06a8c3117e6d13560573d6d1020aac2b60b9b10dbff86b71e10f97aad912bdb76432f16ffd2993633420b97ed27bdceae07fb5e8d1aaac19638ca36d27
-EBUILD okular-21.04.3.ebuild 3160 BLAKE2B 3974521213d97b732b529d1b8cd944422995d6f29a18f78317b8a8070f8008a1a54cbdbbd9be1cfe5d04914e8c6aa136dbb2e63d1e580fc7223281acee714872 SHA512 5cd22c06a8c3117e6d13560573d6d1020aac2b60b9b10dbff86b71e10f97aad912bdb76432f16ffd2993633420b97ed27bdceae07fb5e8d1aaac19638ca36d27
+EBUILD okular-21.04.3-r2.ebuild 3304 BLAKE2B 989d43c0c6be32a10237fa70e6e77424a37a82a43fd13d8a4c0ca0772a375a0d84c5985734f411dc7283cee2d3376400f3a31994c86d7d47d00a252ae9041343 SHA512 9a94017f08c5c3d4950327b3919446d0b3a93b8f234f7cf6db17361c03a0445ec2b670151a1dcbba1bd6e3ab8878555523fff8b7ba761469d8cf10985e6c42ee
 MISC metadata.xml 930 BLAKE2B db4164556c6c5f69c136f226dd436e813a8095196d468cbbbfd2052086c6d1d4b29a9908f85b49838ad44046a3446cb073a45887defdf2ff509b49c4688dac00 SHA512 570c388b5f08484354a15000a1f098ed327b5f5fb40d78801fa746d09fe28eb3b63bb3b735549ae6e6ef7abdcac94652946c45e9b26acd6bf9ebc4058d41759f
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
new file mode 100644
index 000000000000..061db80d2bc5
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
@@ -0,0 +1,27 @@
+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/okular-21.04.2.ebuild b/kde-apps/okular/okular-21.04.3-r2.ebuild
index 9c072d62591a..d0d9c84c3733 100644
--- a/kde-apps/okular/okular-21.04.2.ebuild
+++ b/kde-apps/okular/okular-21.04.3-r2.ebuild
@@ -33,10 +33,12 @@ DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=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/kwallet-${KFMIN}:5
 	>=kde-frameworks/threadweaver-${KFMIN}:5
 	media-libs/freetype
@@ -73,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}-fix-fictionbook-support.patch" # KDE-bug 439807
 )
 
 src_configure() {
diff --git a/kde-apps/okular/okular-21.04.3.ebuild b/kde-apps/okular/okular-21.04.3.ebuild
deleted file mode 100644
index 9c072d62591a..000000000000
--- a/kde-apps/okular/okular-21.04.3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-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"
-
-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
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${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
-	)
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-		>=kde-apps/libkexiv2-${PVCUT}:5
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[nss,qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	qml? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
-	"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
-)
-
-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)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest)"
-	)
-
-	ecm_src_test
-}