gentoo resync : 05.12.2021

4 files changed, 54 insertions, 107 deletions

diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 507e71791d30..75ce0f73572b 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,4 @@
-DIST korganizer-21.04.3.tar.xz 2408368 BLAKE2B 084c118b0502f7aee7cc6b016eabf0410974c31ce2b79ad36611896b1de6c850bf57fe55f4a323e7d672c3166f639be4e9b4e5eea3eea153bb672c297d0bc25e SHA512 fc57dc668bd2aa96c4b2668f7d4a232ef277601c5ce54f452fbb0174cb099dfe75b0416b9728bbaf030c72f588446fbc98901879631804861936ede1e8edbbad
+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
-EBUILD korganizer-21.04.3.ebuild 2795 BLAKE2B 0765334ff0ded5d226ad28711196ae042d2e068fdc1fb468c39c83d8fd75352eef8eb61f6f14cd98868c0d3f48cade6a9247641521862a59720e235e2859d58c SHA512 d69a6db13515bdb39b20c4931434cd3a918a4adaf58fea15acc0a35865882d4ab50d3e244a28975b546787db90fbca2d4a516372b2459f48ef5935548b1aeac8
-EBUILD korganizer-21.08.3.ebuild 2791 BLAKE2B 01c194ff061bce1fb381648363793ff48a4063bd601ab17d9bcd19d131cdf016538f7de9973f852fa28348c9e79ef08f2cfec9024b71c3ca236d649df512f647 SHA512 af8c8e69fc9eef4dbc994321c98ec554a0d4566077d2b9b2b2559a3800ea6389ee12480dc9deb6c9f7284353a7f255af93e1d8bd33ace7032c9f5241bed37245
+EBUILD korganizer-21.08.3-r1.ebuild 2837 BLAKE2B 1448c51044279881fb82f9dcba861f53d236ef27bec2b229a9d38822fe413d8148d5a40ab1a84c2ffe6abde63289e5498d1440023c1da3a8c9be0cd334164b74 SHA512 246324774f1aaffc45fc5d552cb36bec27e202da374424aa9b61f0e75084f89d8c5e251869f12c3b425699574f4168cd7dcbecc823fedbd598e3baa9bd784b71
 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
new file mode 100644
index 000000000000..96df720f0c98
--- /dev/null
+++ b/kde-apps/korganizer/files/korganizer-21.08.3-unused-deps.patch
@@ -0,0 +1,39 @@
+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.04.3.ebuild b/kde-apps/korganizer/korganizer-21.04.3.ebuild
deleted file mode 100644
index ba11b5d0c949..000000000000
--- a/kde-apps/korganizer/korganizer-21.04.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://apps.kde.org/korganizer/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry X"
-
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=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/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
-	>=kde-apps/incidenceeditor-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/kontactinterface-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=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
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=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 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package telemetry KUserFeedback)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-21.08.3.ebuild b/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild
index 02846257d72f..99002e60aaa8 100644
--- a/kde-apps/korganizer/korganizer-21.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-21.08.3-r1.ebuild
@@ -16,12 +16,12 @@ 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"
 
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
+# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
+RESTRICT="test"
+
 COMMON_DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -31,10 +31,8 @@ COMMON_DEPEND="
 	>=kde-apps/akonadi-contacts-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
 	>=kde-apps/calendarsupport-${PVCUT}:5
 	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/grantleetheme-${PVCUT}:5
 	>=kde-apps/incidenceeditor-${PVCUT}:5
 	>=kde-apps/kcalutils-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
@@ -82,9 +80,16 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=kde-apps/kdepim-runtime-${PVCUT}:5
 "
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
 
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
 
 src_configure() {
 	local mycmakeargs=(