gentoo resync : 16.09.2021

5 files changed, 9 insertions, 87 deletions

diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 5f05ca57944e..02f6bcb4b407 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,6 +1,5 @@
-AUX kwindowsystem-5.82.0-no-qtwidgets.patch 2499 BLAKE2B 30602fa8fec92647cf92abca73366c5343abb75f6e67e01774493217721b0369fb39cfc094a4a14457181b34aad2730a2cd4e006a5d199d04a17018b30eafe2c SHA512 0bd87cb8f922576960306f664d03b9718ee2bfaa5e386f087bd3d33c64e7d308f1c42a778811cc8903c5c3b1999d4d94c9b03c2e52ac99764ddf68e16fc8b44e
-DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
 DIST kwindowsystem-5.85.0.tar.xz 178256 BLAKE2B f18dbe1f56529f7500ede59bc3447d6dfd4439086dadbd59d137a21ddea01653cfdfe945f6120461f507e7007228ef2135687ba740981a37e2e9ffe1866e21d3 SHA512 517943febe93ec84d91792ece6a2ad4518c3976d4f9ae3ba631713bdb87cec72817d3231da0fa6318c93e7b6ccf4875ba1c079b3838d3d68ad28cb9c35211d43
-EBUILD kwindowsystem-5.82.0.ebuild 922 BLAKE2B 627b7d7260383ff83a7b778599d5c6559a43232ad3d45fb4d77ad60906db764b9a8252c7672c223c06005f6b7e4ec7acef986933452ce9153980f18a4c43054a SHA512 2dc1aff1b888ba35badfce72009989dc08f82baae45294a2a6c6da830119485f786f2397e8094ff1a919876fe8a67ba10014c1e736fce023e8c2f2226b4258bb
-EBUILD kwindowsystem-5.85.0.ebuild 859 BLAKE2B 70ab39adf48705f875651cabe6fc3fffcbaa21787ca74d490c14ea9c845368365eb6cc1ac930b628b72f6748a12c3b172dbd917ff1e29791284689122eaba076 SHA512 fb6116316e193d30863b29c63c22972b0bd55e5c68a0b45eb34300589267206a24fe73d9b28a5ae9e1a89a9a381704fea8db5865e86e6c3832f13debe658c38f
-MISC metadata.xml 455 BLAKE2B 134b0f3f4b2f38ab25d44a1daefc5f38113068cb041dc46722d9ad95846278b35d0c4a294a62266b3825627c6258a6d0f2ba3054350d2e6443f6fc82278f55cd SHA512 a8b4ea9fe9068223e7079de9e04a29c3ef461eb669ecd72a16a614e8c3b7ecec9e4433dab347c4e02140a6d42aaa25fbff77a5e269639d1c4311c59ecfa42c73
+DIST kwindowsystem-5.86.0.tar.xz 179152 BLAKE2B d765fb19f74fc3513fc012a725ae1cad1b80369e207493d7aa7f6226b00c3f3908185a47d5889d06821c2eab955b10f1781b40e8afea6814a2af9284bd978c32 SHA512 ca9097a0bee54ee12a5bad77a4c6fe0a0df126091938c43d644e6838fd9a01758ff397647d4058e088703b4c88535003d7d58863dbf8f14a745d47f0958e593a
+EBUILD kwindowsystem-5.85.0.ebuild 856 BLAKE2B 322e2a182351ae4bfc21761d4a6f7b3786ae91ac3c4504e10a7acb5885025fafaa25f5660740fb78b4a2bf1ac96b2b67078e71f6885452a739c3becb75a386a4 SHA512 ee4638e1ca03a993108b5a635102c8eabeaf919b014d4bae07b787bc063271bb35e430123823f53990e3042f292456fbe36a206df9459b405932d8e3f9bf89b1
+EBUILD kwindowsystem-5.86.0.ebuild 859 BLAKE2B 70ab39adf48705f875651cabe6fc3fffcbaa21787ca74d490c14ea9c845368365eb6cc1ac930b628b72f6748a12c3b172dbd917ff1e29791284689122eaba076 SHA512 fb6116316e193d30863b29c63c22972b0bd55e5c68a0b45eb34300589267206a24fe73d9b28a5ae9e1a89a9a381704fea8db5865e86e6c3832f13debe658c38f
+MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
deleted file mode 100644
index cfa7ab9a7988..000000000000
--- a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 374a29075694f530d2d0673e33a166c836d02a84 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 2 May 2021 12:38:58 +0200
-Subject: [PATCH] Drop Qt5Widgets dependency if KWINDOWSYSTEM_NO_WIDGETS=ON
-
-Use existing option to do that. Dependency remains for autotests/tests.
----
- CMakeLists.txt                 | 5 ++++-
- KF5WindowSystemConfig.cmake.in | 5 ++++-
- autotests/CMakeLists.txt       | 2 +-
- tests/CMakeLists.txt           | 2 +-
- 4 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 49eb05a..ecf98a1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,10 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KWINDOWSYSTEM
- 
- # Dependencies
- set(REQUIRED_QT_VERSION 5.15.0)
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets)
-+find_package(Qt5Gui ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
-+if(NOT KWINDOWSYSTEM_NO_WIDGETS)
-+    find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED)
-+endif()
- 
- if (APPLE)
-     cmake_find_frameworks(Carbon)
-diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in
-index 8267ef4..6c1b4c0 100644
---- a/KF5WindowSystemConfig.cmake.in
-+++ b/KF5WindowSystemConfig.cmake.in
-@@ -1,8 +1,11 @@
- @PACKAGE_INIT@
- 
- include(CMakeFindDependencyMacro)
--find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
-+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
- 
-+if(NOT @KWINDOWSYSTEM_NO_WIDGETS@)
-+find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
-+endif()
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake")
- @PACKAGE_INCLUDE_QCHTARGETS@
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
-index c1121a7..c964947 100644
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -6,7 +6,7 @@ add_definitions(-DAUTOTEST_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}")
- include(ECMMarkAsTest)
- include(ECMAddTests)
- 
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
- 
- add_subdirectory(helper)
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index c0865d9..c72eb1f 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -3,7 +3,7 @@ remove_definitions(-DQT_NO_CAST_TO_ASCII)
- 
- include(ECMMarkAsTest)
- 
--find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
-+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
- 
- macro(kwindowsystem_executable_tests)
-   foreach(_testname ${ARGN})
--- 
-GitLab
-
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
index 18350d22806e..f01e4c323842 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.85.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="nls X"
 
 RESTRICT="test"
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.86.0.ebuild
index 06682e5d7cd8..18350d22806e 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.86.0.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
 
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
@@ -9,10 +9,10 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing access to properties and features of the window manager"
 LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls X"
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -34,8 +34,6 @@ BDEPEND="
 
 DOCS=( docs/README.kstartupinfo )
 
-PATCHES=( "${FILESDIR}/${P}-no-qtwidgets.patch" ) # git master/5.83.0
-
 src_configure() {
 	local mycmakeargs=(
 		-DKWINDOWSYSTEM_NO_WIDGETS=ON
diff --git a/kde-frameworks/kwindowsystem/metadata.xml b/kde-frameworks/kwindowsystem/metadata.xml
index 85b864e35960..506ecf605bc4 100644
--- a/kde-frameworks/kwindowsystem/metadata.xml
+++ b/kde-frameworks/kwindowsystem/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>