gentoo resync : 16.09.2021

5 files changed, 69 insertions, 17 deletions

diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index fc0d92f1f612..3f8cdf4cb4c7 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,7 +1,8 @@
 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
-DIST kdelibs4support-5.82.0.tar.xz 3553264 BLAKE2B db2db6b67e27b0b0562b88afbda739fa109faff52689d7132519b75784a5dbf95c5585bb8ba9c1e85a06553ca572dd8f6480e00a99b1ce252505fb10c6e89cf1 SHA512 0662810f884d65d33b789fbae02009e5e6c92d8df45a4355899722a96dd7402168a46998150a9ee580e5dad8873a38a829c1f73d8157cc3cbcff495cd5a875d9
+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
-EBUILD kdelibs4support-5.82.0.ebuild 2485 BLAKE2B 8f115b67bc325848a02b6ffd565d602b99f0984e471290608bb5a91606d2dd023bdb92b6b1d736ea2a1c3c25968f86037be1261c70176d9b1435bca86ecc2e53 SHA512 d3e280bd5505080bdf67124ca410ccddb61d6abcbd839314525af06fbf478e9d44d7b89b89c38ecb7896eade4c028dd35fe5b645ed73efd90b9c6781ad6d387f
-EBUILD kdelibs4support-5.85.0.ebuild 2493 BLAKE2B 8a84e1020093609b1e61c8103f4997315e0bae99ad7204e3b77a1f95ce56c8ac37f6985f0be32c181b314ddc91f93e6753bbba565a49bf62f966917adf887aec SHA512 7150f861bba85f7e5e19c26bb7a73b8f31e7572c9d3b08fc09d3593e420ce74aa3c1e4853d76d93073e37e07e32159eb351942e614aa46d00d136f034bcb31f6
-MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
+DIST kdelibs4support-5.86.0.tar.xz 3643140 BLAKE2B d857c7a128f26a289195b39d1ce2a948c483902e21d913d05a1397aa326402986abbd7ffa5c7af03e6b70a1d4cdd311c921fb978435e578abe1cd67b5e3b0631 SHA512 c02743f74db0e228fc77d152de7b72053d1decbfb0c4979c47c425ab256adf34464b493942b55388466800cab86efc13b3bd412597fa330cce794473c1fbf59a
+EBUILD kdelibs4support-5.85.0.ebuild 2490 BLAKE2B bdccd2180122fceb23c47eb94cbaf58619d22ba4775b29e77e16ebda67a1e109dc4204ae23844fae82099e21f87183eca35122b3c53a56b02d55c6094db15b0a SHA512 fb8f6171661a32ac7272925aa25244d00d4b93a7c992102e8c7c87ff612e10d192a829865d8add6e4f01d7c4e00629a51e2ed5b4447b2e2300c95960b4a695f7
+EBUILD kdelibs4support-5.86.0-r1.ebuild 2527 BLAKE2B b344a83a575d098c918c2c24ea37fa298aa24a8b5cae0d959e7d200d5ac7248ec669efa1019fe24590ad406a65b67bce79c07df66d0fdc6fb893c6d6530e4077 SHA512 c6f0bc86e381bd1fb683ef97e6176641431c3903ca6cc6fe640e0a5c8858c4f67536a46db01463f24fdeaaa3258a872472494aa1329e35151a91d41a4a8cbfbf
+MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
new file mode 100644
index 000000000000..8614a8490222
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/files/kdelibs4support-5.86.0-unused-dep.patch
@@ -0,0 +1,51 @@
+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.2)
+-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.85.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
index 267add834f65..32f631baaaa3 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.85.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.85.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.82.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0-r1.ebuild
index ac93c4e494ce..d8c19122d713 100644
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.82.0.ebuild
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.86.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="true"
 ECM_QTHELP="false"
@@ -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 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="X"
 
-RESTRICT+=" test"
+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() {
diff --git a/kde-frameworks/kdelibs4support/metadata.xml b/kde-frameworks/kdelibs4support/metadata.xml
index 85b864e35960..506ecf605bc4 100644
--- a/kde-frameworks/kdelibs4support/metadata.xml
+++ b/kde-frameworks/kdelibs4support/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>