gentoo resync : 12.05.2022

4 files changed, 8 insertions, 59 deletions

diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index b1a7285f2e2a..7a0791f03de0 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,6 +1,5 @@
-AUX korganizer-21.08.3-unused-deps.patch 1349 BLAKE2B 03f94970efeae4589686c645875e3678539e521b9767c2b398ca61bbdd3011a271054ff050faefdc9069ede3746d9f26871a5b6adc8392b0c84348a394c27fdd SHA512 d64f3371c0c12db919a16cf56484c5ec5c8b78a221294a011a0ceeaa6bb7115c87c86582d8cabee9d56046dc9d90341f121daffdcf41a9827a12638374c3c5d0
-DIST korganizer-21.08.3.tar.xz 2422856 BLAKE2B 73cb7ef0d87f3f51edf96ecc7da481e62ef03fbb8f1610a5bcf603998dbd3178a0c0254939772f050a0d3f8b15c829fcbe53532734feb23ae69ce23290922e8f SHA512 8453ed342b8d5e950a27d46cee7d9e1096834db55814b6e2607ce2fe435c6f49bf5d75d0cf8dc6ac872a81c64aa158bf6c0337bf7d63eb2b7ef5b6ad9f4da5b5
 DIST korganizer-21.12.3.tar.xz 2397184 BLAKE2B 67a63788e89af5a511980516a7e506c383496de6ab5fdbe338f2ae4097b42b2b970eb2e645de0b1f0b534b61d931e703cd8f9816d540f321efe18172f2686597 SHA512 4c415d9f7ee3e7345b3532b8357a7dc3120eaa02df66c544ccaddae14802d3643b73ef0addbd53c18f2cf3e452c8305ced2021f009957db7736824e3f998c155
-EBUILD korganizer-21.08.3-r1.ebuild 2837 BLAKE2B 1448c51044279881fb82f9dcba861f53d236ef27bec2b229a9d38822fe413d8148d5a40ab1a84c2ffe6abde63289e5498d1440023c1da3a8c9be0cd334164b74 SHA512 246324774f1aaffc45fc5d552cb36bec27e202da374424aa9b61f0e75084f89d8c5e251869f12c3b425699574f4168cd7dcbecc823fedbd598e3baa9bd784b71
-EBUILD korganizer-21.12.3.ebuild 2641 BLAKE2B 0933183cbfd5a7ab3f5cc090a26f5fe6749de6e4d720f0496987ffa4a3284706420b41f5e99c96d4f1eb61881bd27fc4f58375ba3ecc2e6a67cdc27c2804e380 SHA512 923b8710291849e4630e1a86ff97d2d4e6ba63e48f7ce92e6fb156fa7156b82ed050d0ea73fa193a363575502e15135566a45944ab62a59278c6b79983f6f1ba
+DIST korganizer-22.04.0.tar.xz 2309316 BLAKE2B 954f10db08dee542118fbac75d064354a2686310339c668184459207a53dd30b9089882010c34bcdc65fe3df7ae4a403f4e6a7454eac68b880d0547d638bc972 SHA512 b81a722acfbea730c6db983bfa42ee70ca648b9e078eb3d577546346a9490fcfcbe626474fa58176028c6ed00b72a337202d5819db559c1acd8058dd0ae84858
+EBUILD korganizer-21.12.3.ebuild 2640 BLAKE2B c80b2cc0f61872baf72f31f2ba930d85ca54b977d1ac3a68fec089a033a4d58fd6088414137e717dcc752f03085c046be560698188c8dfeefb30923148978d2c SHA512 8674ea4e700d8933510cfced27abd59e8c3149a988e6e6066db2cfb422fa3a74cd0156d195df28433d3a9463adbddcba931fd21c0f7d2f9effe3d05fcf567626
+EBUILD korganizer-22.04.0.ebuild 2582 BLAKE2B 926666926b12b43ff5179e33fe0ca02d5438342722c23e92ca1928bc8b0918e088ebec771640966185288e31590ac7fd735fd728f1cbb572cf70cfc4cf89bf69 SHA512 5395b41ddcdd62b4f65cf8020ac9745c17478e52785f64ef871fd6acacaf478807de11f61bcabfc577256ac24592cbfaa6ac64229344223b7f642e10d53ba701
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch b/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch
deleted file mode 100644
index 96df720f0c98..000000000000
--- a/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1b81f7493d446449ee3d44332f8fbedf52b149f3 Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Sun, 3 Oct 2021 11:48:52 +0200
-Subject: [PATCH] akonadi-search is unused
-
----
- CMakeLists.txt     | 3 ---
- src/CMakeLists.txt | 1 -
- 3 files changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b393f911..a46b6254f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,9 +75,6 @@ set(CALENDARSUPPORT_LIB_VERSION "5.18.40")
- set(EVENTVIEW_LIB_VERSION "5.18.42")
- set(AKONADI_SEARCH_VERSION "5.18.40")
- 
--find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
--set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "ttps://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in pim apps and Akonadi")
--
- # Find KF5 package
- find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
- find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 72b5a9f39..ea90c2203 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -295,7 +295,6 @@ target_link_libraries(korganizerprivate
-     KF5::AkonadiCore
-     KF5::AkonadiCalendar
-     KF5::AkonadiNotes
--    KF5::AkonadiSearchPIM
-     KF5::Contacts
-     KF5::CalendarCore
-     KF5::CalendarUtils
--- 
-GitLab
-
diff --git a/kde-apps/korganizer/korganizer-21.12.3.ebuild b/kde-apps/korganizer/korganizer-21.12.3.ebuild
index 19bb9ba0c356..01f63de0bfcc 100644
--- a/kde-apps/korganizer/korganizer-21.12.3.ebuild
+++ b/kde-apps/korganizer/korganizer-21.12.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/korganizer/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="telemetry X"
 
 # testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
diff --git a/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild b/kde-apps/korganizer/korganizer-22.04.0.ebuild
index 99002e60aaa8..fdb787d18783 100644
--- a/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild
+++ b/kde-apps/korganizer/korganizer-22.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/korganizer/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="telemetry X"
 
 # testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
@@ -29,7 +29,6 @@ COMMON_DEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-calendar-${PVCUT}:5
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/akonadi-notes-${PVCUT}:5
 	>=kde-apps/calendarsupport-${PVCUT}:5
 	>=kde-apps/eventviews-${PVCUT}:5
@@ -44,13 +43,11 @@ COMMON_DEPEND="
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
 	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kholidays-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
@@ -65,8 +62,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	telemetry? ( dev-libs/kuserfeedback:5 )
+	telemetry? ( >=dev-libs/kuserfeedback-1.2.0:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libX11
@@ -84,13 +80,6 @@ BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 GrantleeTheme
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package telemetry KUserFeedback)