gentoo resync : 11.05.2021

3 files changed, 85 insertions, 6 deletions

diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 118f323df2d8..bf9bf2c536c1 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,6 @@
+AUX kwindowsystem-5.82.0-no-qtwidgets.patch 2499 BLAKE2B 30602fa8fec92647cf92abca73366c5343abb75f6e67e01774493217721b0369fb39cfc094a4a14457181b34aad2730a2cd4e006a5d199d04a17018b30eafe2c SHA512 0bd87cb8f922576960306f664d03b9718ee2bfaa5e386f087bd3d33c64e7d308f1c42a778811cc8903c5c3b1999d4d94c9b03c2e52ac99764ddf68e16fc8b44e
 DIST kwindowsystem-5.80.0.tar.xz 177340 BLAKE2B 9f659368706e0b849285758f103478078f15057170397bde3aa6ab0bc27390e4eee5d7e94900302be204c5e672618b48197581cf8459b0796a2dd92ee17e8e91 SHA512 a2e928568ca4ba7e5ae904888e273c8f3e7c57661b8a32246e22330426fa2db55535b96ec7b4e74681090f15f227586d282f3f077e44bdc3e0a86c9514f6151f
-DIST kwindowsystem-5.81.0.tar.xz 177724 BLAKE2B 9d22e4ca2f3aece2d85f694d381ae67db34e95794b54835dba3335237d5ce273dde2eb020038c560d0bbbd3c27e7bb92e8290976530bef7ef274451c694ac4e1 SHA512 05531784e51cf00d8f93e5fd87cd5f0b24cefd75f652ba2edac785343cf73c2e545d26ad039292a0c578a8d365346a8b6aaef9bf8e25402d341eb82ee9fcd1bd
+DIST kwindowsystem-5.82.0.tar.xz 177932 BLAKE2B e3089e51821f46eb061830863bca969e5da693a815bd17db3d674912fe1c924fe2d590c982c93ec9926d381ee8488287f669745113c1a96cd5e4f3f8ac3c1297 SHA512 fd823e718e439d40e85146195d03c6868c99d62cc9495d5733157db081f29884cd9a9d11421d81c47fe4cc5661107a1b52ff55dc9e0a00565682f1d7845a2e68
 EBUILD kwindowsystem-5.80.0.ebuild 809 BLAKE2B 6e614387bb5e67bdd0cf2013a70560c094fa30ab882a9434eb11382a42201760e16f5af8ce17b42a6fb9532d8dba3f7c04d425b4e18ab640392cf6ccf13389e9 SHA512 080211e701b45e31c88b2b9f816747d2da79338d358e78ada30e584be2411120e750670253a9a112892029d71352dde0af1c5776fc5b17452f1b4a03e2ff27ce
-EBUILD kwindowsystem-5.81.0.ebuild 812 BLAKE2B 59d3db9a14bd46a266655789d696045aa14605a7eadfc8ee5946478ed669e819aeb963bcf6248324bd55c51b447376a797bedd46594324caa329a115921c78d1 SHA512 38d06953743b85fdd2539334a8c2c43dd128fe79650007dbec5a633af65508a7528f955c21020bf7d9436f582e90a9a1428b26e955c4bc3147cc138e283b2a5e
+EBUILD kwindowsystem-5.82.0.ebuild 925 BLAKE2B ac7ffe3d337d7dda0e146b5b17192d2fd71e8d2ea734d597123d680295bb92816523a5f78febce72a6d9b3afdef88d0665b0e5811e0b9a8baf4b8154ac09dac8 SHA512 956c9d40fee44f59ff42bf9a1a275b590a1197c30431f7fe4f31870a68202e846e90f90f1f1f0c31c35293df7ba6519fc1ccc6a258370ae3f347914b604af103
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
new file mode 100644
index 000000000000..cfa7ab9a7988
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.82.0-no-qtwidgets.patch
@@ -0,0 +1,75 @@
+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.81.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
index 2cac1d55d6ef..c75dbd19a52f 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.81.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.82.0.ebuild
@@ -14,12 +14,8 @@ IUSE="nls X"
 
 RESTRICT+=" test"
 
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libX11
@@ -30,12 +26,19 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
+	test? ( >=dev-qt/qtwidgets-${QTMIN}:5 )
+"
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 
 DOCS=( docs/README.kstartupinfo )
 
+PATCHES=( "${FILESDIR}/${P}-no-qtwidgets.patch" ) # git master/5.83.0
+
 src_configure() {
 	local mycmakeargs=(
+		-DKWINDOWSYSTEM_NO_WIDGETS=ON
 		$(cmake_use_find_package X X11)
 	)