gentoo resync : 05.12.2021

3 files changed, 7 insertions, 73 deletions

diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index cfd005b01b5c..56eda5b3f93c 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,3 @@
-DIST incidenceeditor-21.04.3.tar.xz 540124 BLAKE2B 044d0ece5f9ac83ecf0dc1c4cb08afc46ed6473b4fa88303f80cf8446a04608cf262f88b2b70160954607672e1ef3e2edb8d29c0b93d2f95e4a3c83f4063fd9c SHA512 65dc9257d0d6c238093b59cdaf76512938aa2aaf795e0a8e17c1c64afd75ccbb37941178a9295fcf240791e8daa9ca187184dcfd68294bd553d4ed5b9a9202ff
 DIST incidenceeditor-21.08.3.tar.xz 545508 BLAKE2B b2fd75e0830a56f5b81468e3f4796c2c38d19399c2a5d53d4d1f24420856163281d7d5f1c49a18ad19709dc914390ab5895dfdbafb5da3b99a8c3597118d0e78 SHA512 1ab847bdbb14b68ad3d3dc65a43006082fb0bddefa10048c9f7f909976d6cf975d69645a3d81e2018850679fa963c619eb92d41694cf6104495e341dbc8f972c
-EBUILD incidenceeditor-21.04.3.ebuild 1878 BLAKE2B 5016cdfe6cb23c9ffe6af174583c781992d9b156ec7bb01277204b59fda530c9b09f40c980eb86fc7b59324bca6460f28f5e2ed17df5faf69a249caca53aaced SHA512 ffbde87cdb0bfb6f20a4681c54dfe1411d1f926b7f1bf75002330169f133459502e66ffe3d40f59d4b2c321b6517ae2613f758abce3305fc670408187522ebce
-EBUILD incidenceeditor-21.08.3.ebuild 1977 BLAKE2B c703209ec60eba7f0da8e343f9d60dab24c8ed8ab51cd08c9a4d72e066d715a8d4f7435128b3b8060b86ac5c182ecaf5e07be876fb44056ade06409e2a41f461 SHA512 35135566cef6ea063587d1acd306befc193b0e22a93a7100ecd241bd042f3bbb7d28dc56aced7f65f342523ea0bc5eaf47755be00fe979bd259f4b16281db7d3
+EBUILD incidenceeditor-21.08.3.ebuild 2048 BLAKE2B 80ad2e99e9b88c64e0df37e7c89e4c771d83a214e5cb33974d31c5645a76ace04e931ce4e5ccc95f1e4d4240865f305b7ad1aaae29aceab2f8ea732e1dc3860e SHA512 1bc7d1a3f95c4225554a627b34f4ce2b763dfe2b36865cbbca113ed4d37d6aa698b55a3a4685745047b4bc755b78cbbc40bc6ddd26773188744de38ee4713185
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
deleted file mode 100644
index 71360435dd44..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-21.04.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/kdiagram:5
-	>=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/calendarsupport-${PVCUT}:5
-	>=kde-apps/eventviews-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kldap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[postgres,sqlite] )
-"
-BDEPEND="
-	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-
-src_test() {
-	# Paths exceed unix domain socket limit, bug 770775
-	local myctestargs=(
-		-E "(akonadi-pgsql-incidencedatetimetest|akonadi-sqlite-incidencedatetimetest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
index f90316d7cb4f..925e7831d79e 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-21.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for korganizer"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
@@ -59,6 +59,11 @@ BDEPEND="
 	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
 "
 
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DKDEPIM_RUN_AKONADI_TEST=OFF