gentoo resync : 29.12.2022

4 files changed, 96 insertions, 10 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index acff9993b365..a42f06f69271 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,7 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
-DIST discover-5.24.4.tar.xz 8260620 BLAKE2B 3e908ee51eaac93254ab11be2f5961ad7f1fd0162335c855db412067db489e1c47846f089e61ff13096bc567b94329a18bedbcbf18712b68f0119c353a07c5c5 SHA512 d11fa406c9a44047de94b1e4047367205d35a142aecda79df934603a0c2cf04b761054235b3acd28030d6ee48f64005b44baf154ca4a279b5396268f75fc7191
+AUX discover-5.25.1-tests-optional.patch 3012 BLAKE2B a13aa4927a0ebc6c4c021400a8de15c248adf3a26558e3a4809f75d104b23bdbcf8b87670f1f28ab3683a1c852d43fc890692e86580512e6c3b9a3d275d901a7 SHA512 96c3c48786bc66d1d777a0b43a1b80dff717dcbd395277e1c7fe6cba9e12f15bb55ee9aadfee65b2c2896b35e0b6567c62322852b94baf3698150a147b600e39
 DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
-EBUILD discover-5.24.4.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
-EBUILD discover-5.24.5.ebuild 2444 BLAKE2B b9dd77a480f8dcdf22eeeeb39f04a20d8773da6b906d4e8fe6d231a198d05a66a52b092ebe38fae9338b9c7a1dbe613077de088bbf4ceab5a0fb6d0120103a18 SHA512 d9f401154542d249f5f2e37ff99b3ca397a3d7d7e888e54647a23c9768f96afdc7d57ab599c3bb8fb872199c45102e5b0f1e0460025cd85e459e434dc0885ae8
+DIST discover-5.25.2.tar.xz 8300024 BLAKE2B 87ae77a48ec2327a55341979293f1b9a74287daa1eb588c5718696e6960dda4c3ba91b506d6ca1b6e69449e68931d2ebaab970cf8169b6232e0488d72466b9d3 SHA512 b7d8831037f9c02c1986e51da232f2184caa362f05b3d1c073e07a050f0ff6867173928f4e9c4c7e6befdb02751d7db10fa39e9f033b46444d5a4e9e7be04507
+EBUILD discover-5.24.5.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
+EBUILD discover-5.25.2.ebuild 2369 BLAKE2B e4d0f4956e52ba839698575ff331dd21a167277f6436f3952181d162ce894268a0d0e2ef2d842cf27b66d19dac3df48d703b188331ff1519bed02f0e4c644482 SHA512 26fde0bfcf66021c6338932744b33443793f754bb137d1a06c835a7d79cc4f128fda6e46437f89b02581e518168e1832817b7d500d9fa5585161faff8c1b9b2d
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.24.5.ebuild b/kde-plasma/discover/discover-5.24.5.ebuild
index 67d530c388e1..be46b5a49318 100644
--- a/kde-plasma/discover/discover-5.24.5.ebuild
+++ b/kde-plasma/discover/discover-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-5.24.4.ebuild b/kde-plasma/discover/discover-5.25.2.ebuild
index be46b5a49318..fe6197a020ff 100644
--- a/kde-plasma/discover/discover-5.24.4.ebuild
+++ b/kde-plasma/discover/discover-5.25.2.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.90.0
-QTMIN=5.15.2
+KFMIN=5.94.0
+QTMIN=5.15.4
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
@@ -25,7 +25,6 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/attica-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -39,7 +38,6 @@ DEPEND="
 	>=kde-frameworks/kidletime-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
@@ -56,7 +54,7 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
 
 src_prepare() {
 	ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
new file mode 100644
index 000000000000..fc01ca3214bc
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
@@ -0,0 +1,87 @@
+From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Use BUILD_TESTING to make tests optional
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                     | 6 +++++-
+ libdiscover/CMakeLists.txt                         | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt   | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt     | 4 +++-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd8c61aa..8ce3fa8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,11 @@
+ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
++
++if(BUILD_TESTING)
++    find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ 
+ find_package(PkgConfig REQUIRED)
+ 
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index a26d6934..ca827f3b 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_
+ 
+ add_subdirectory(backends)
+ add_subdirectory(notifiers)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(discovercommon_SRCS
+     Category/Category.cpp
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 5b4aef10..38377d80 100644
+--- a/libdiscover/backends/DummyBackend/CMakeLists.txt
++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(dummy-backend_SRCS
+     DummyResource.cpp
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index 55e6b38e..e2d11b93 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ set(flatpak-backend_SRCS
+     FlatpakResource.cpp
+diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index 54f19e1f..ec3443e9 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ add_library(kns-backend MODULE
+     KNSBackend.cpp
+-- 
+2.35.1
+