gentoo resync : 25.11.2020

4 files changed, 8 insertions, 62 deletions

diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 2129183a86a5..d7f0aa6d22fa 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,5 @@
-AUX drkonqi-5.18.5-init-bools-w-false.patch 1702 BLAKE2B fb60d49278011acdd8ffc4eacc5cfa07afc34f3dbe240945bf87c2ed23f4f94bd4284fe3df25e53e28467a2d4ced54b47461a440cd70be41e17412ed9c2d9c52 SHA512 87d3ec1db263b1cb1eb27684da40815eafcfc8bf512ec771eebd3481bc032a6653686aa22f71313b46dfda7e1dcbdfd5b2bde9930d69f0939ed2ddf7b25529c9
-DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
 DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
-EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
-EBUILD drkonqi-5.19.5.ebuild 1644 BLAKE2B 0514f69cc5b926938f41eccdf2c0e8b407843eedbe5e7098872d899c166f1b84643f1122e59a9708a4a99beea129a7dc6b47ca06148be5b3954b02bb75125ac2 SHA512 324a1ab861f1ac30944c66aaaa0bc1271ab9f8245712aac3715fd5817396d1c70d7ed40cc05c53f6b08735aec3955ae269fc8ecca2169de550ce3f0255fa1e2c
+DIST drkonqi-5.20.3.tar.xz 754608 BLAKE2B c54d704278d0ec6e4286b32dc020e634936a073d709b30c49473f80c6c308fcf78a1cc099a3a7b0af52b2c04c77ad626d4569efa1fef095229ba2aebc3038505 SHA512 0efbd66035c2acc749cabfea439e286e2934b11ac7b957c729f5692b3ac236a9eab992742fd721214578cef7807e4306b13c8bde64acb4b63f0df30c332f46cb
+EBUILD drkonqi-5.19.5.ebuild 1641 BLAKE2B 1277c750214b86b6419ef30f07c07d88f014dbdd7613707f280dfdbead0c6dcfa613f35f794c6345ddf52035fe67c58385bff763e3ced75b21a58611042ecee8 SHA512 8c0056c6b8ca5091d8ce4edf71a0f3506d740f7629c3dae4c4dd996e3a48d136a54ff3c79b8626da0312ec9bf4133b69a2ef6553b14b621f19683f84907e815c
+EBUILD drkonqi-5.20.3.ebuild 1644 BLAKE2B ca4da4615321276ca6f454a75052ee5995f14345f339f62aa1c2b772cf53e7dbbab0e2073084319a5e13e4423ad7a29117f58217d8bacc451dac3ecd20157282 SHA512 29a125ad3459a99ccfde6ddcc5e5ff5ca89848489f3dc827adbd5d86d925915f4d31323aa2ef51b1f76d82df08df0733a9eb0b151754e968b23015274836f622
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
index 55352758f183..dad96335a28e 100644
--- a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
index 03342eff8d10..830deaf8d0ab 100644
--- a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 RDEPEND="
@@ -35,16 +35,13 @@ RDEPEND="
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
 	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-init-bools-w-false.patch" # in Plasma/5.18, KDE-bug 421187
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X Qt5X11Extras)
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
deleted file mode 100644
index 6ce33a7198ab..000000000000
--- a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c517b795936fdab641849ca83ec8c3e253e32de8 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 12 May 2020 12:25:52 +0200
-Subject: initialize bools to false by default
-
-Summary:
-This should fix random 113 errors (user_not_insider) coming out of the api
-
-I can't really reproduce the problem other than by setting the bools
-explicitly to true. Seeing as they were previously not set explicitly
-they could very well end up true accidentally.
-To fix this let's set them explicitly false.
-
-BUG: 421187
-FIXED-IN: 5.18.6
-
-Test Plan:
-hoping for the best!
-tests still pass tho
-
-Reviewers: davidedmundson, apol
-
-Reviewed By: apol
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29675
----
- src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-index d30f379..8b4e4bb 100644
---- a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-+++ b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-@@ -34,8 +34,8 @@ class NewAttachment : public JsonCommand
-     BUGZILLA_MEMBER_PROPERTY(QString, summary);
-     BUGZILLA_MEMBER_PROPERTY(QString, content_type);
-     BUGZILLA_MEMBER_PROPERTY(QString, comment);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_patch);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_private);
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_patch) = false;
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_private) = false;
- 
-     // flags property is not supported at this time
- 
--- 
-cgit v1.1