gentoo resync : 15.06.2021

4 files changed, 7 insertions, 59 deletions

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index f93d275d7d8e..d02b7d4a4e06 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,8 +1,7 @@
 AUX kdelibs4support-5.80.0-no-kdesignerplugin.patch 5689 BLAKE2B 74771136992074f7e39eb110d7b838ed6ff3bb34ca8b44242d57359b3efc4bebde8ae615b27df31cba42d14349697ba303b3aa20b09c1d83d044cff2cd6700f0 SHA512 2a7a1c05c6ef7f440ca84eef7b65f65f92d780fa411301e2a8554115717cbe543127e1878ae5642f07f7ddcae4a62ed075468f85e7c7cdb13992b4bada270bff
-AUX kdelibs4support-5.80.0-unused-dep.patch 1693 BLAKE2B e4757501ae07b954d7c9010b219d7a233d3d12dbb0c48a72b2f28ae83ad94787290a638f8304624c93ec122f106994d0145ce13de2523c1cc011a1ab274bd80d SHA512 42719d2d8fefcbbf2a0ed0a7cb9d86150973cbf609494834a5a953af214c52098665d1c0aa95404a357ec4e8377d6a76b9c8c4593bfe2c87927368d4e2e6ae77
 AUX kdelibs4support-5.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e9144e69d9011215567dd3a6691e1f1484dedd8c314a10d01c39d2e945eb61a3ddc41a0304f89e9f6f7840fc0f9161bf0a3d4e4829 SHA512 f0b9cd6dd6f97e3d3747a1241221e01b43c31dfba7eb398c33f3515a5a8609e0c12ad2be64df89ea74b7ab95eadb0a8768cb7706b98df6201cd50294c198de8c
-DIST kdelibs4support-5.80.0.tar.xz 3547060 BLAKE2B 2108c2076d962cda829f43d37423f30259c59c443fa062b998260155c33544043e8eb077a3ea372e036c46f3fe56c8f2c2c22e7093a675e749a60d54bba5c672 SHA512 2cffc9c291adf24125e5b3898cf9138cd95cec9ac325a4a619d3b8fded50978c5850bb40265e4dcbf3dc3a0c851cdeaea3e3cbd0b873ef6b46f2b2d53ca32c09
 DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
-EBUILD kdelibs4support-5.80.0.ebuild 2469 BLAKE2B 3401aa1e114112e87631206e1bff32f699e2d7ad3a2f32d9b643098311b333823956a30e7218043bef1b02c020c85870c689915d41a9892431de31a027940f8e SHA512 cd5a5eefc19aa139ea80487982bd4fae87a42e863a09c07db577af4199d6acf594b4caf9c86fcf65b3a88a93f9c0ed7d7e0dc0fe3656508077eaee5078829f4a
-EBUILD kdelibs4support-5.82.0.ebuild 2488 BLAKE2B 2b487246830473e7617a0c2a8735892f447f53da7425ac1f1957907b2885a3bb2fe7541a6a9a052b34bc36ef1f0d027c0f608c03a6e4482a324ecd89d2a76473 SHA512 e4b12fa86af0eeac4b1f05a6d54611f4870d98d373f8a7ef486233ae722944f30885c3f255bdf6b262b54e4c414c2e2b2f1954f440b3bbde92f173a523856ab3
+DIST kdelibs4support-5.83.0.tar.xz 3552740 BLAKE2B 337bde57e013438a8fd3c09e5255a1997b58443bfd8853aa62275e889c8a8a068630b7f954397db60cbf3c21df648173568e45a7aa1b2aa340a1e250808dde9b SHA512 5d2927c50525ce22d819013eca8a1d8e100f55f9e90eb98fbec443fa0667077b0bbf868c8ce7af97272116e1aca0dfe0e576e58e76f438c7e031fb976feb4541
+EBUILD kdelibs4support-5.82.0.ebuild 2485 BLAKE2B 8f115b67bc325848a02b6ffd565d602b99f0984e471290608bb5a91606d2dd023bdb92b6b1d736ea2a1c3c25968f86037be1261c70176d9b1435bca86ecc2e53 SHA512 d3e280bd5505080bdf67124ca410ccddb61d6abcbd839314525af06fbf478e9d44d7b89b89c38ecb7896eade4c028dd35fe5b645ed73efd90b9c6781ad6d387f
+EBUILD kdelibs4support-5.83.0.ebuild 2488 BLAKE2B 2b487246830473e7617a0c2a8735892f447f53da7425ac1f1957907b2885a3bb2fe7541a6a9a052b34bc36ef1f0d027c0f608c03a6e4482a324ecd89d2a76473 SHA512 e4b12fa86af0eeac4b1f05a6d54611f4870d98d373f8a7ef486233ae722944f30885c3f255bdf6b262b54e4c414c2e2b2f1954f440b3bbde92f173a523856ab3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch
deleted file mode 100644
index 44e474ae0e91..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.80.0-unused-dep.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b51d32df6a89e559871469178de1c6fd8c8a2882 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 22 Nov 2020 00:27:55 +0100
-Subject: [PATCH 2/2] Drop Qt5Designer dependency
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                          | 2 +-
- cmake/modules/ECMQt4To5Porting.cmake    | 1 -
- cmake/modules/FindQt5Transitional.cmake | 1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a432591..e503999d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ include(GenerateExportHeader)
- include(CMakeFindFrameworks)
- 
- set(REQUIRED_QT_VERSION 5.14.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport)
- 
- find_package(KF5Completion ${KF_DEP_VERSION} REQUIRED)
- find_package(KF5Config ${KF_DEP_VERSION} REQUIRED)
-diff --git a/cmake/modules/ECMQt4To5Porting.cmake b/cmake/modules/ECMQt4To5Porting.cmake
-index 4204fa54..01b8f995 100644
---- a/cmake/modules/ECMQt4To5Porting.cmake
-+++ b/cmake/modules/ECMQt4To5Porting.cmake
-@@ -160,7 +160,6 @@ set(_qt_modules
-   DBus
-   Network
-   Test
--  Designer
-   Concurrent
-   Xml
-   UiTools
-diff --git a/cmake/modules/FindQt5Transitional.cmake b/cmake/modules/FindQt5Transitional.cmake
-index df354fc6..68fa6d47 100644
---- a/cmake/modules/FindQt5Transitional.cmake
-+++ b/cmake/modules/FindQt5Transitional.cmake
-@@ -6,7 +6,6 @@ if (Qt5Core_FOUND)
-       Core
-       Gui
-       DBus
--      Designer
-       Declarative
-       Script
-       ScriptTools
--- 
-2.30.0
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
index 8cf2a1aa39dd..ac93c4e494ce 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RESTRICT+=" test"
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.83.0.ebuild
index c5beda64a305..8cf2a1aa39dd 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.80.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.83.0.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 RESTRICT+=" test"
@@ -78,8 +78,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-no-kdesignerplugin.patch"
-	"${FILESDIR}/${P}-unused-dep.patch"
+	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
+	"${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
 )
 
 src_prepare() {