gentoo auto-resync : 28:06:2024 - 07:59:59

3 files changed, 2 insertions, 97 deletions

diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 2bb5b8f41fc1..b2fa187adc35 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,8 +1,6 @@
 AUX discover-5.25.90-tests-optional.patch 3080 BLAKE2B 074ce41b4aee3fe8203f83fd63361189b78ddd4dc45a72a0d3e98a8ff50a92a463c680b93c7c7643e2bfc479e9374eda78148d41fed55c17035e751c0c584efa SHA512 bd82fe11d5ff1884c9457c655502831a3dab70ff172b5d49cdbdfa0cb6818735405ef1f4c519eaf46dd607bccf71077f11741cc11c85553f4e8f639125721767
 DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37
-DIST discover-6.1.0.tar.xz 1020224 BLAKE2B c3de0301853fc473f63b132fd14a6974ec3ffbc6f76b2f11f8c4513cc2973120e4af85b139cde48a1012262f00847f48913d27d93364d5e0b37ce24c33f3237e SHA512 d081b0f1ecf367d85a7f47b9ba4d2c0a1e0aaae5c3e861b746aa89501d72dff45e28e227e0ec3d7d6c72947cde4a8188c148b0044d1f3c6bb11398ef1118cebe
 DIST discover-6.1.1.tar.xz 1020300 BLAKE2B a022bf53c1181dddeec92c0a7350a0d6267aa9988a3b6c5fbc26c4deb563264318225741ade77029f7212fd9ad5d2240f0c0efb224ab739ef14a83e8444000d0 SHA512 5dacc422d9c3d343970ed2d9ae1878db25c6d0d2f082bf257619667572f72cb2a4b9b3b3cf66f73618e5bfdb51e5c78553e05249081bd0a63fe3f40302386233
 EBUILD discover-5.27.11.ebuild 2778 BLAKE2B e9561e7f177bf8d123f06201aa209c31f9e5a769872ec5cca265d437cf71fd1f2aa9fc30fca997e009883ae5b2e2cb1c62df7a7eab08ec20e6041f976e0da11a SHA512 a7296b8848de18084cccf8751434a8eb195bb808db8cb2577b7c2772b9758d32757d674bf53a3b52d210e41bae1abc5e904aedfe3d4e2b2fd86d9707b2f293b7
-EBUILD discover-6.1.0.ebuild 2719 BLAKE2B 30d00d06ce2c99e51ed9b3395583d619d186109961abaa2e0451838adabc740bc98d365929622a486fd91cf66a0943439d661787fd1da981788b434b18a0eb4a SHA512 e36b9f0f2037d179392c5fac0558a9659c680b07d0a3922c89c374823db59283d96e3c98d0e579a19d5ef2a07e948a486935b943e9ac7524d1af2dd559e01b31
-EBUILD discover-6.1.1.ebuild 2719 BLAKE2B 30d00d06ce2c99e51ed9b3395583d619d186109961abaa2e0451838adabc740bc98d365929622a486fd91cf66a0943439d661787fd1da981788b434b18a0eb4a SHA512 e36b9f0f2037d179392c5fac0558a9659c680b07d0a3922c89c374823db59283d96e3c98d0e579a19d5ef2a07e948a486935b943e9ac7524d1af2dd559e01b31
+EBUILD discover-6.1.1.ebuild 2726 BLAKE2B 86523350718e43d28cdf7d346320e6bff68645330564faf6609e5bb4245619f5ab392103dfca57ec5a5c12e1c7218f56c17fc3f0c0364ce39faf1a2892b25f9b SHA512 a956268969ba09da4445f81e4e484e6bf8517f5600ac1ca68b30e56098b68d0705497cbcf82bd2ae6608bab9943e121d8ab6ed6fda20426eef3c7f2d1e16ef4c
 MISC metadata.xml 845 BLAKE2B 87d892ce29180263400147d7a7b98e42093d613897bc09764b58e43712faff76bc13f0b9e09782faf6c6f8c78d02a555271159be54ccc5213241422931d43e65 SHA512 6fda677eb8dfe74813872cad68d234d7f272f7466f654b1d0a2725b6ceb6872f51887b5861f419cf5aeb09ffc593af230a923eafa22c0db9e1353b831a4a7187
diff --git a/kde-plasma/discover/discover-6.1.0.ebuild b/kde-plasma/discover/discover-6.1.0.ebuild
deleted file mode 100644
index 06d46c861821..000000000000
--- a/kde-plasma/discover/discover-6.1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.7.1
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE="+firmware flatpak snap telemetry webengine"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=dev-libs/appstream-1.0.0:=[qt6]
-	dev-libs/kirigami-addons:6
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=kde-frameworks/attica-${KFMIN}:6
-	>=kde-frameworks/kauth-${KFMIN}:6
-	>=kde-frameworks/kcmutils-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kdbusaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kidletime-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kirigami-${KFMIN}:6
-	>=kde-frameworks/knewstuff-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/purpose-${KFMIN}:6
-	firmware? ( >=sys-apps/fwupd-1.9.4 )
-	flatpak? ( sys-apps/flatpak )
-	snap? ( sys-libs/snapd-glib:=[qt6(-)] )
-	telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
-	webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
-"
-RDEPEND="${DEPEND}
-	snap? ( app-containers/snapd )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-
-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.*Markdown/#&/" \
-		-e "s/^pkg_check_modules.*RpmOstree/#&/" \
-		-e "s/^pkg_check_modules.*Ostree/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: Port PackageKit's portage back-end to python3
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON
-		# Automated updates will not work for us
-		# https://invent.kde.org/plasma/discover/-/merge_requests/142
-		-DWITH_KCM=OFF
-		-DBUILD_DummyBackend=OFF
-		-DBUILD_FlatpakBackend=$(usex flatpak)
-		-DBUILD_FwupdBackend=$(usex firmware)
-		-DBUILD_RpmOstreeBackend=OFF
-		-DBUILD_SnapBackend=$(usex snap)
-		-DBUILD_SteamOSBackend=OFF
-		$(cmake_use_find_package telemetry KF6UserFeedback)
-		$(cmake_use_find_package webengine Qt6WebView)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest|flatpaktest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-6.1.1.ebuild b/kde-plasma/discover/discover-6.1.1.ebuild
index 06d46c861821..05d7f096d73c 100644
--- a/kde-plasma/discover/discover-6.1.1.ebuild
+++ b/kde-plasma/discover/discover-6.1.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="+firmware flatpak snap telemetry webengine"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend