gentoo resync : 22.12.2021

4 files changed, 13 insertions, 65 deletions

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 40d81053a193..312e89bc0b83 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.82.0-unused-dep.patch 1693 BLAKE2B e11fdcf22b656952871730e9144e69d9011215567dd3a6691e1f1484dedd8c314a10d01c39d2e945eb61a3ddc41a0304f89e9f6f7840fc0f9161bf0a3d4e4829 SHA512 f0b9cd6dd6f97e3d3747a1241221e01b43c31dfba7eb398c33f3515a5a8609e0c12ad2be64df89ea74b7ab95eadb0a8768cb7706b98df6201cd50294c198de8c
 AUX kdelibs4support-5.86.0-unused-dep.patch 1693 BLAKE2B b310444effa8bf0a2a203cdc7e427ade52caceabc77b1dce96cbc739443c9d8429c2f1186f3d1e5180a0b8ef6323ea805a040ded435b2a0a3abdcef0e4dceee9 SHA512 bf7637791517739ebfa296beb91f3873d21165c4760374df8972fa75f237dfefb24cac7ea7895f359dcf368a18f974005b83646f9ba3cd6891ba6181880a4a6a
-DIST kdelibs4support-5.85.0.tar.xz 3642876 BLAKE2B 436645e8ac519b5078c37797fdea854e25e71a8079a49a33436a88576f1f370409a6fd780ab778520c474263df66b3a37d06398fdcc1ddfbeef8be5933f30192 SHA512 6edf7d612be56f81b7908ae85f6cfcc9618b14e8b9741fb19e0c8eb55ac73b9b82963be923d67ddfd450401fffc29bf164d112e45cba3657f10a1c84f86e346c
 DIST kdelibs4support-5.88.0.tar.xz 3644168 BLAKE2B fe4e2411bfe1bf2e6bc661dd8b408f17f603027550f5774d99c18043cba67efe5b213a64a51d76b52fa55ec029891f79735389f9e254479683cba02db48ed6e3 SHA512 65dee336fb82f99cdb84e5ea0385fcd86edd0f5db8bf93ce9ff3a52df017e0f4b29042f9b667e6ea5250306f95331ff541d7e63bf775c8bf5e6d6fd045b45f23
-EBUILD kdelibs4support-5.85.0.ebuild 2490 BLAKE2B bdccd2180122fceb23c47eb94cbaf58619d22ba4775b29e77e16ebda67a1e109dc4204ae23844fae82099e21f87183eca35122b3c53a56b02d55c6094db15b0a SHA512 fb8f6171661a32ac7272925aa25244d00d4b93a7c992102e8c7c87ff612e10d192a829865d8add6e4f01d7c4e00629a51e2ed5b4447b2e2300c95960b4a695f7
-EBUILD kdelibs4support-5.88.0.ebuild 2527 BLAKE2B b344a83a575d098c918c2c24ea37fa298aa24a8b5cae0d959e7d200d5ac7248ec669efa1019fe24590ad406a65b67bce79c07df66d0fdc6fb893c6d6530e4077 SHA512 c6f0bc86e381bd1fb683ef97e6176641431c3903ca6cc6fe640e0a5c8858c4f67536a46db01463f24fdeaaa3258a872472494aa1329e35151a91d41a4a8cbfbf
+DIST kdelibs4support-5.89.0.tar.xz 3643764 BLAKE2B 2184ec6d6323820b405271a142403e0dd39df3a28882c6302323f0072f7542a89dbb0a6fe52181ac05503d26d3572980a99884c74e857e77c7a546f65f2eb06b SHA512 f626b77e93e3d08511784e17e4b90281fd44b7b0c0cb1ca7a9fdcefe7108294f0c1f6353d270f9ef529bfe87ee7a23a37366fd747082b8b0efed9c338ccf44e5
+EBUILD kdelibs4support-5.88.0.ebuild 2524 BLAKE2B a79bd5a3068e2c84a11ddaa9f7fd91a9946a1fcfb34b4141fdc914c89a464dfe3e1df98240d02368c0b978149b6aa2d623cde8b9dcead600821c2f45e4be9ffb SHA512 d863b999dc530695108de52eba6ab201940f22efcdc91e0a925159ba4f9eba364de1d27ff186056decebbaf004785447fc2515f8c66813758fa9257d53f4235b
+EBUILD kdelibs4support-5.89.0.ebuild 2527 BLAKE2B b344a83a575d098c918c2c24ea37fa298aa24a8b5cae0d959e7d200d5ac7248ec669efa1019fe24590ad406a65b67bce79c07df66d0fdc6fb893c6d6530e4077 SHA512 c6f0bc86e381bd1fb683ef97e6176641431c3903ca6cc6fe640e0a5c8858c4f67536a46db01463f24fdeaaa3258a872472494aa1329e35151a91d41a4a8cbfbf
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.0-unused-dep.patch
deleted file mode 100644
index e6a287ebda37..000000000000
--- a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.82.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.15.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.88.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.88.0.ebuild
index d8c19122d713..2b2f032d2af4 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.88.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.88.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 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.89.0.ebuild
index 32f631baaaa3..d8c19122d713 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.89.0.ebuild
@@ -12,15 +12,11 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework easing the development transition from KDELibs 4 to KF 5"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
 RESTRICT="test"
 
-BDEPEND="
-	dev-lang/perl
-	dev-perl/URI
-"
 COMMON_DEPEND="
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/openssl:0
@@ -49,13 +45,13 @@ COMMON_DEPEND="
 	=kde-frameworks/kio-${PVCUT}*:5
 	=kde-frameworks/kitemviews-${PVCUT}*:5
 	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5[X=]
 	=kde-frameworks/kparts-${PVCUT}*:5
 	=kde-frameworks/kservice-${PVCUT}*:5
 	=kde-frameworks/ktextwidgets-${PVCUT}*:5
 	=kde-frameworks/kunitconversion-${PVCUT}*:5
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X=]
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
 	=kde-frameworks/solid-${PVCUT}*:5
 	virtual/libintl
@@ -76,10 +72,14 @@ RDEPEND="${COMMON_DEPEND}
 	=kde-frameworks/kinit-${PVCUT}*:5
 	=kde-frameworks/kitemmodels-${PVCUT}*:5
 "
+BDEPEND="
+	dev-lang/perl
+	dev-perl/URI
+"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch"
-	"${FILESDIR}/${PN}-5.82.0-unused-dep.patch"
+	"${FILESDIR}/${PN}-5.80.0-no-kdesignerplugin.patch" # bug 755956
+	"${FILESDIR}/${PN}-5.86.0-unused-dep.patch" # bug 755956
 )
 
 src_prepare() {