gentoo resync : 28.04.2021

5 files changed, 6 insertions, 82 deletions

diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 8a40ca25a99c..ddcd60302dd0 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,5 @@
-AUX kxmlgui-5.77.0-fix-key-recording.patch 929 BLAKE2B c880e82e443f2bc4ca3df5a358843322dab68c2b47f075f5b25aaa9f9a5ad08820ecf9162c23d5595898ba15af3117538268a8db26cc0cd53bc3e43c822abf2e SHA512 66c5e6dcf10742c947b0da909edb762346e55111769c6481c0820bf45b8ccc5c4af8fe61a1f76072ff33b77d62c981f419555709348b49c68c2e36b76c3d3b78
-AUX kxmlgui-5.77.0-no-kwindowsystem.patch 1591 BLAKE2B a7034d980cd0c6106b87b3bf33fc719552af846648f3139e1604a4314e5aea6273c5dec73026dc3815e90f7c4355ad457e5dad99b65bbcac4df193785e7b1a36 SHA512 6395aaf426ac1ccde9f9cd14e296f92f00d8540e5a753ececa7cded09229a9131c733081e1d9d1a93fd03948eb2a9a4c63e0785e8d1c44a9d072674254694ac3
-DIST kxmlgui-5.77.0.tar.xz 860548 BLAKE2B c862dd9524698c5fc3f83933a20b229ad8b52c94b3b5a703f64518bd4e13543f46bfa2dcf85ed21a0d19c0d72e9efafe412f6cbf6698c14e4827ad4f38da6afa SHA512 bd0e9f0b41927f6e90b71328f5e680a9d83a9c9f502edefc78f898fcab6be3cf553409b63e117c80cc8541b7a48ceb66de49fbcc6e7c8afc33a0d9fd901512b0
 DIST kxmlgui-5.80.0.tar.xz 861784 BLAKE2B e2a3673594806100e416206cf108fe1cab5c0647f2b68eede7608dc0fb886852587f4e6aed8d25f7ccd97fcbe5eaf9ad313a52a36ace5eace7f6a0df0fb7ac82 SHA512 ae19b33329c3c371d1cc94c83ebdae5f02b95e0e3562fed915a4f7185c7d9c639b0a0d8afaef8cb06598d1c44c48595b3f7d7a0a10c8a0c555a8d5d923361a16
-EBUILD kxmlgui-5.77.0-r1.ebuild 1382 BLAKE2B 53102ac0e8cc851b1ed131954ba69678c942c10805505e35627873e738fe27c491294f5a1c54170ff0b716834f161a701cb1ce4a60abf80f04470e4c2187424e SHA512 092c3aa992231779e7b70e0689e441315847c49759cbfc8c46d45b03788383cf27be2b7ebe32d1203363d301ceff4ebeeb2dfb07550d9a812a659e8e7a2ed1c6
-EBUILD kxmlgui-5.80.0.ebuild 1285 BLAKE2B 9e08e818264e5f23502b2df9562cce838fa1f0ce8dcc07712eed24f5a1e8b884596bee891d0ec9377ed10f4b9a05c6798e1d109def42297c2be9178022f31303 SHA512 8a5d113c1e29eb30083b8d53bc6feaf51238c4a89674afdee23fc0c4a857dd3ce2d06f1cff975f99228718006319c5890b402abbf9a7de2c272cf23a4ecbda78
+DIST kxmlgui-5.81.0.tar.xz 862492 BLAKE2B f9ba5ae603986a53f3f8675a56018d5ffe75be9df936f0d410145ebb1ab6958d9c2b9ab53fab7de4e662a634ed7978753706c33ac23f892fa900f10b4af7d7af SHA512 950c03601b6ab0f83d79d3fd958ec050d98779619143ef4969213e9ead016cf8c6693ee4da5136533c9793ab73336a1c49678b189028e3fab140fc69ff166dd8
+EBUILD kxmlgui-5.80.0.ebuild 1282 BLAKE2B b70ebf07b32922e3305161543dffa76c619b596b9a98dca886f286519561d293fc4479459934a81533779cfbb6decd6c11147e7ffde9632d9bbf8b9b6e957491 SHA512 5b0b2f1b60f784947253b08a929a155777948130082af735811c2412574e6cfc2665fca6ff3063e8805368c55494e64675ebcccbb46aaa13ff23638cbacecc4a
+EBUILD kxmlgui-5.81.0.ebuild 1285 BLAKE2B 9e08e818264e5f23502b2df9562cce838fa1f0ce8dcc07712eed24f5a1e8b884596bee891d0ec9377ed10f4b9a05c6798e1d109def42297c2be9178022f31303 SHA512 8a5d113c1e29eb30083b8d53bc6feaf51238c4a89674afdee23fc0c4a857dd3ce2d06f1cff975f99228718006319c5890b402abbf9a7de2c272cf23a4ecbda78
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch
deleted file mode 100644
index ae1269ac6679..000000000000
--- a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1bd9ac05b0eed3582937829150b31ea48fd95bb0 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Thu, 17 Dec 2020 11:12:40 -0800
-Subject: [PATCH] Fix key recording by setWindow before capture starts.
-
-It is common that during the construction of widget, it is not yet added to
-a window. Thus windowHandle will simply return null in this case. Always set
-the window to before the capture starts.
-
-BUG: 430388
----
- src/kkeysequencewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp
-index a51c6cc..c1f5c42 100644
---- a/src/kkeysequencewidget.cpp
-+++ b/src/kkeysequencewidget.cpp
-@@ -493,6 +493,7 @@ void KKeySequenceWidget::setCheckActionCollections(const QList<KActionCollection
- //slot
- void KKeySequenceWidget::captureKeySequence()
- {
-+    d->recorder->setWindow(window()->windowHandle());
-     d->recorder->startRecording();
- }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-no-kwindowsystem.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-no-kwindowsystem.patch
deleted file mode 100644
index ba7c45eb6a01..000000000000
--- a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-no-kwindowsystem.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ffd68935c2ef48fc60cbbb1b4159d49a018e597b Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 10 Dec 2020 17:22:21 +0100
-Subject: [PATCH] Remove unused KWindowSystem dependency
-
-Since
-https://invent.kde.org/frameworks/kxmlgui/-/commit/28a80aba1463b83ea8845ff22566a2110c8fb041
-it's not needed any more
----
- CMakeLists.txt     | 1 -
- src/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7ffac4..0e516c5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,7 +54,6 @@ find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Attica ${KF5_DEP_VERSION})
- set_package_properties(KF5Attica PROPERTIES DESCRIPTION "A Qt library that implements the Open Collaboration Services API"
-                        PURPOSE "Support for Get Hot New Stuff in KXMLGUI"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index e965d8d..3875a6b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -110,7 +110,6 @@ PRIVATE
-     KF5::ItemViews           #KWidgetItemDelegate in KAboutApplicationPersonListDelegate
-     KF5::I18n                #i18n and i18nc in many places
-     KF5::IconThemes         #KIconLoader and KIconThemes in KToolBar
--    KF5::WindowSystem       #KKeyServer in kkeysequencewidget
-     ${XMLGUI_EXTRA_LIBS}
- )
- if (TARGET Qt5::DBus)
--- 
-GitLab
-
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
index 45acc6a3678e..76de3d89245b 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.80.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 LICENSE="LGPL-2+"
 IUSE=""
 
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.81.0.ebuild
index fe6e58394fc7..45acc6a3678e 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.81.0.ebuild
@@ -5,12 +5,12 @@ EAPI=7
 
 ECM_DESIGNERPLUGIN="true"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 LICENSE="LGPL-2+"
 IUSE=""
 
@@ -35,11 +35,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-no-kwindowsystem.patch
-	"${FILESDIR}"/${P}-fix-key-recording.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Attica=ON