gentoo auto-resync : 13:07:2022 - 13:36:46

3 files changed, 99 insertions, 5 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index a42f06f69271..23c77e00b5d1 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,7 +1,9 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
 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
-DIST discover-5.25.2.tar.xz 8300024 BLAKE2B 87ae77a48ec2327a55341979293f1b9a74287daa1eb588c5718696e6960dda4c3ba91b506d6ca1b6e69449e68931d2ebaab970cf8169b6232e0488d72466b9d3 SHA512 b7d8831037f9c02c1986e51da232f2184caa362f05b3d1c073e07a050f0ff6867173928f4e9c4c7e6befdb02751d7db10fa39e9f033b46444d5a4e9e7be04507
+DIST discover-5.24.6.tar.xz 8262256 BLAKE2B e01fe3da64f976c576f52c9882d76479b01aee45c008856c0dceca4dd243b5af0ee020912511ea57b15ebf2bee8a3a653896d83f663bea0c8ed79eee3f4e3b73 SHA512 3be308dcb302ee87d3a2983b822c0f7233837c80646c5387085714864c057cabd0c492013167f81b8b869947400ea2a30e4e1f3f3e73e2e03bc58953ea0080cd
+DIST discover-5.25.3.tar.xz 8306324 BLAKE2B b51c1884846f9af9f85a8e0120d9aa363fba6e0d86108d5acbae1d85d9c76631497f573859e40f7fa8c49b80288a5e3359003fdd3dcc20a7866834d46c90e807 SHA512 7d500a691fe7446445db59a8d8bed58e16db7e3a7e81635d746399efe243c4ab0cd5a47a5780ddd65f1ffe67dc783204f5d28e87108ba44dea62b236f07c4487
 EBUILD discover-5.24.5.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
-EBUILD discover-5.25.2.ebuild 2369 BLAKE2B e4d0f4956e52ba839698575ff331dd21a167277f6436f3952181d162ce894268a0d0e2ef2d842cf27b66d19dac3df48d703b188331ff1519bed02f0e4c644482 SHA512 26fde0bfcf66021c6338932744b33443793f754bb137d1a06c835a7d79cc4f128fda6e46437f89b02581e518168e1832817b7d500d9fa5585161faff8c1b9b2d
+EBUILD discover-5.24.6.ebuild 2451 BLAKE2B 195332c15d49d77f3a98bf583fb2088df4b90c77cdba19785236ef0fee22c314af26a165f6344f96ee657547441429c225a2ac18d9572db8957edcd77216f749 SHA512 1f119cb28e9a4cee023b6016f65e4ae0c78f6dd815f68a07382edc3f32e81615b4c3ec8c4960bdb9e54d63e24ef3a1ae23bd688c6a0a582ba9e1827871629741
+EBUILD discover-5.25.3.ebuild 2376 BLAKE2B def86b52fa259baacda8d098495e2c9e53bdeb3c8b6c7e511b6104643a6eb6056c1d966447b54b3aebffc0051d01812141cea725a3ac66362d35bba329dde1c0 SHA512 de1b3d34892b86ecc19ab9236461c7011d86b2b5159a6680121ef52adef3708e5dc99457b24875ecd714b901d31c5342cab3ebab140dd124c025447c09f7f578
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.24.6.ebuild b/kde-plasma/discover/discover-5.24.6.ebuild
new file mode 100644
index 000000000000..8456d6e21eed
--- /dev/null
+++ b/kde-plasma/discover/discover-5.24.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=5.92.0
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=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
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=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
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
+	flatpak? (
+		>=dev-libs/appstream-0.14.4:=
+		sys-apps/flatpak
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_kf_module Archive
+	# we don't do anything with this
+	sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+		-e "s/^pkg_check_modules.*Ostree/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DWITH_KCM=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/discover/discover-5.25.2.ebuild b/kde-plasma/discover/discover-5.25.3.ebuild
index fe6197a020ff..0f21d0949b79 100644
--- a/kde-plasma/discover/discover-5.25.2.ebuild
+++ b/kde-plasma/discover/discover-5.25.3.ebuild
@@ -4,10 +4,10 @@
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.94.0
-QTMIN=5.15.4
+KFMIN=5.95.0
+QTMIN=5.15.5
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm plasma.kde.org
 
 DESCRIPTION="KDE Plasma resources management GUI"
 HOMEPAGE="https://userbase.kde.org/Discover"