gentoo resync : 29.12.2022

4 files changed, 71 insertions, 11 deletions

diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 26374dd02c9c..3163ace736fe 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,7 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
-DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
+AUX xembed-sni-proxy-5.24.80-standalone.patch 2177 BLAKE2B 9b10237e4108a312d2896cba4fa45dd24bec0cf5e6559845a4dc9cb9adb3786e210ebc5a9e6620285024250ad9af810ca22f205262fe98ef471d2711661aff09 SHA512 2320578033606c958ceeb7891a9d71e9fd6c788e1752d7a3293214fe54c72f4be8bf31fe131754b7b5561b7f5d5be2da66f4a29294cb0ff5732df5587ee465f6
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
-EBUILD xembed-sni-proxy-5.24.4.ebuild 1015 BLAKE2B db108b3c849fba5b6b1e2dfa0e66fdd730c9b983b7c53ae54d5123678e43d0dc9153cc016a30fe08316035a779c8c4e9b83e569b5097d26470a25e2c0dc58a3a SHA512 b09744ad6078ba7b097b14047d92f7e447647c99caf489bb74d9eb4ed89a7d69e46c851284e401bd937df43cc28324b69419ea4e7a8ffca6431b03f95d9505cb
-EBUILD xembed-sni-proxy-5.24.5.ebuild 1018 BLAKE2B a658a977463c9812864123305492f01c37231884a1968de9d144597305ead16583a0ac6176865cf5b06808c0b5f672aefc0814a089575d426e24644bbf6b9aab SHA512 e7bfdaf3795a863f9dc769c36b962b2e5d82d4234d6c0bd14599ea9bb74a1e3a1659c6d3864ea1d41a991b19dd7b3a3e1544606bc578d6305950d83b1f833957
+DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105
+EBUILD xembed-sni-proxy-5.24.5.ebuild 1015 BLAKE2B db108b3c849fba5b6b1e2dfa0e66fdd730c9b983b7c53ae54d5123678e43d0dc9153cc016a30fe08316035a779c8c4e9b83e569b5097d26470a25e2c0dc58a3a SHA512 b09744ad6078ba7b097b14047d92f7e447647c99caf489bb74d9eb4ed89a7d69e46c851284e401bd937df43cc28324b69419ea4e7a8ffca6431b03f95d9505cb
+EBUILD xembed-sni-proxy-5.25.2.ebuild 1042 BLAKE2B 73cb6cf214b3c41683c45e8c231fe7e526e6bde71ac6232c02711f6a51295cfd65144e4b585549c76f26e8597dd5efd7ae8007db08eeef45f7975486ff0c1d50 SHA512 56272ac9025b24868208d2d4f44d0ab18244619de451648fd7486035b2910cd780f3a23036af8b3c92997d8895603cdeb9453029f95566f45c6473dc429a46fe
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
new file mode 100644
index 000000000000..f6e8413e3763
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.24.80-standalone.patch
@@ -0,0 +1,60 @@
+From a381c7441140e77208c0ed3a8dd45cb61197afd9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Sep 2020 22:34:28 +0200
+Subject: [PATCH] xembed-sni-proxy: Allow standalone build
+
+---
+ xembed-sni-proxy/CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt
+index bcc583bfa..41d50d112 100644
+--- a/xembed-sni-proxy/CMakeLists.txt
++++ b/xembed-sni-proxy/CMakeLists.txt
+@@ -1,3 +1,35 @@
++project(xembed-sni-proxy)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_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.89")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
++    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(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(ECMConfiguredInstall)
++
++    find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
++    find_package(X11 REQUIRED)
++    find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
++    set_package_properties(XCB PROPERTIES TYPE REQUIRED)
++
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++else()
++    set(PROJECT_VERSION "5.24.80")
++    set(PROJECT_VERSION_MAJOR 5)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_CAST_FROM_BYTEARRAY)
+@@ -64,3 +96,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+ 
+ ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION  ${KDE_INSTALL_SYSTEMDUSERUNITDIR})
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.34.1
+
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
index b73f5cac8f27..4930f2576348 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild
index 4930f2576348..a946c9694bb9 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild
@@ -4,17 +4,18 @@
 EAPI=8
 
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.90.0
+KFMIN=5.94.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
+QTMIN=5.15.4
 inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
+CMAKE_USE_DIR="${S}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -31,13 +32,11 @@ RDEPEND="${DEPEND}
 	!kde-plasma/xembed-sni-proxy:0
 "
 
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" )
 
 src_prepare() {
 	cmake_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+		-i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
 }