gentoo resync : 15.06.2021

4 files changed, 125 insertions, 19 deletions

diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index c2b7ee1af2a5..4c5f43d76cac 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,8 @@
 AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 AUX libkworkspace-5.21.5-standalone.patch 4984 BLAKE2B 84a43baece5d0233c7e274c28a7212d6fcec6692c51047ebe5459c9502bfc0fab9a46687fa57424d29691d20987ed9e2bd207b7d2d99a13ddfa7b5091267fa18 SHA512 710d9804ec23fed811d57e1f713738b435a526511609540f45953fa678eb733542682487d8a429940b20dd26bb898fbd70f2d6da3727fa6d26ff9cd839c6c447
-DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
+AUX libkworkspace-5.21.90-standalone.patch 4996 BLAKE2B 1f09de9fbd1426fc065066897b1b966cda3993f0b1b6ac2a490d4c3c71863b93212e58ccc87353dc836fd58d969cc22c0a3ab8e6c6aacf81ac35823624e693dd SHA512 8702b74cdefbfc793e9ec0a1ce6ed6cca9f92b6c2d8c60d1a40c1530336af9c212d460ebca31ba8d28e3bcb02c1e6ae99dbea39d3572f1658e8d3575d1d947ca
 DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4
-EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15
-EBUILD libkworkspace-5.21.5-r1.ebuild 1242 BLAKE2B 6527e217d14ec8e5b021416e3f8d5fa5b437d46a6ef191d63d78c1d1eba895c953bf4e1eb41d9233636b74906023c6761c7ec710014069b138b31df8338b5db0 SHA512 081e2b0b73db8c93f4e345f4ba7e38c196304ac8c7e32402755e875bffa902c3f0287e7bfedadf00eaee5c21ade56f8e6d2310f0be2dad48d2e4be3ccbbc7870
+DIST plasma-workspace-5.22.0.tar.xz 8349176 BLAKE2B 61993be02589be83911c8eebcf1bb21dab7377b47bf011a9900791f6aaa5a3e59d545116ad0728afd6565763e6396d12c6e3992fc3ea55c8ab76cfb14e5b21c3 SHA512 fb57dde0ae5f774cb782ab305a526ce22404972197d531a2c5e6972eb6400d57b99a7ce397fd417c0c42c8de58f4c06d9e9771b64eb94f501987da910054f4af
+EBUILD libkworkspace-5.21.5-r1.ebuild 1239 BLAKE2B 29b2a81890471c12443c93501ed5420dbc6fd6113a951dca6cb9ed58de6e22047c3fa54d11c5007e04ce6932aceb46742797cb17cd357a48f29aa8b849bda565 SHA512 ec2f1e5d5ce1cec05042a736ea48917521fa4c147432b92005e9675c3c0cf177f2598ead48ba043ceffab735fa5dcb419a64457e4620af050c950821525eba05
+EBUILD libkworkspace-5.22.0.ebuild 1319 BLAKE2B 4b3ab68da0124ec5f71ae70b4e79308eae68d12e09b41321451cba29fe92d7c9a8452d380f30880b05349c9491e348e0d23a68adf065fb7a84b164ea7dac1ee2 SHA512 1d505add16154af3b0ea90b6c72eaf0b89db23da8115bd2a968070f01122340cf494e9f6dc00d21aa61d22d453cd9decdfda99c4bdf7bf1bb1e632d080986fc0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
new file mode 100644
index 000000000000..430b98aadcb9
--- /dev/null
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.21.90-standalone.patch
@@ -0,0 +1,108 @@
+From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 2 Feb 2020 18:29:57 +0100
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 015c5181f..0aa635e11 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.16)
++
++    set(QT_MIN_VERSION "5.15.0")
++    set(KF5_MIN_VERSION "5.82.0")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(ECMMarkNonGuiExecutable)
++    include(CMakePackageConfigHelpers)
++    include(WriteBasicConfigVersionFile)
++    include(CheckIncludeFiles)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(KDEPackageAppTemplates)
++    include(ECMMarkAsTest)
++    include(GenerateExportHeader)
++
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem)
++
++    find_package(KWinDBusInterface CONFIG REQUIRED)
++    find_package(KScreenLocker 5.13.80 REQUIRED)
++    find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++    find_package(X11)
++    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++                URL "http://www.x.org"
++                TYPE OPTIONAL
++                PURPOSE "Required for X11 support")
++
++    if(X11_FOUND)
++        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++        set(HAVE_X11 1)
++    endif()
++
++    if(BUILD_TESTING)
++        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++    endif()
++
++    check_include_files(unistd.h HAVE_UNISTD_H)
++
++    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+ 
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+                         kworkspace.cpp
+@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\")
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++endif()
+ 
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+                             "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
+ 
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+ 
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -98,3 +158,8 @@ if(BUILD_TESTING)
+     add_subdirectory(autotests)
+     add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.31.1
+
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
index 10cabe55d613..73f46ec757b8 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.5-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.22.0.ebuild
index 23228e860975..683900192dfd 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.22.0.ebuild
@@ -5,26 +5,25 @@ EAPI=7
 
 ECM_TEST="true"
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/kscreenlocker-${PVCUT}:5
 	x11-libs/libICE
 	x11-libs/libSM
@@ -32,13 +31,12 @@ RDEPEND="
 	x11-libs/libXau
 "
 DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-plasma/kwin-${PVCUT}:5
 "
 
 S="${S}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" )
-
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -46,13 +44,12 @@ src_prepare() {
 		rm -rf po/*/docs || die
 		cp -a ../po ./ || die
 	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
 
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+	eapply "${FILESDIR}/${PN}-5.21.90-standalone.patch"
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
+	cat >> CMakeLists.txt <<- _EOF_ || die
+		ki18n_install(po)
+	_EOF_
+
+	ecm_src_prepare
 }