gentoo resync : 05.12.2021

3 files changed, 8 insertions, 50 deletions

diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index c8c387760314..fadaa084e9ee 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,3 @@
-DIST akonadi-calendar-21.04.3.tar.xz 353884 BLAKE2B be9dca3e2e4920d1e3fe253dfe986035618cd5d0a28150b757044a5e336549a3c8283142ebda3b4d4688a5a27bc7d14b871ddbb9170f65c47aa330ac704424f1 SHA512 220f5ef5d403d3b1f59faf7f57bbd33670e9bd909896ac786618563c8fc67856727f4587039b1666f1f5b1d4bbce93357d474e865b29ac629b21fb59f023801c
 DIST akonadi-calendar-21.08.3.tar.xz 352800 BLAKE2B 00a44feb32622d6cb4c14157451fb891ea4a4115ac4809ae59a2ad0b26c021cc0b910d285663794afcd3a92d61304666a68e8cf40e8899d003e0b8d6e2901d87 SHA512 80578a9761b1fcff2c6f4c0065a7788ca1b9fc8cf3864c65780ca9777df31cf4c69e607829da3106d108686d505beee6341f4622da7f069a41f2a425dcecc2aa
-EBUILD akonadi-calendar-21.04.3.ebuild 1192 BLAKE2B 0b7fd4fcfbb5f29f2328a63f5ae60b02e5b40cba7c3c8ca747b6d4dde14edf5d0909eabec4c24da2ee1662ff32bf708586f16fb82e9d94d56931ec506e791a6d SHA512 76cc55f624ab11e2612ae1f2654138dc71ef4a6d53647afefbc569c1f0ffcb40a6abccd00a1bb5b6ad508fc2e0222855cd1285b126fa89e6ff2bca25a195fc3c
-EBUILD akonadi-calendar-21.08.3.ebuild 1193 BLAKE2B 82390a3c5709fed1e65707464c2aefd0050a290e80513fcdea1decd33ec5e67625cf03611d122aafe82c73ec562bb0655b4149a375f7cfaec8e866e1f3f51529 SHA512 dc19e4f50d348c17567f8e60b363acea72fc482c9e268ade026340cbf9cac0c8e5cb1f39fa59368dd8dbb1724755ed64a0a68c404b9189d915fcebf06884ce1d
+EBUILD akonadi-calendar-21.08.3.ebuild 1271 BLAKE2B d0cb1dd30dfcaab6671d6b24a4a2f031fe6952981bb96038ec9eb871d0bde53abc79d6d1c313fcc0d44c6ece2e702c92b4d91305186519a84fad751614161a98 SHA512 eb146cc9a7a32b673a73fd9930cb8b21c5cd54c1d057746f98e911a2e07f9d17f355f9edb080463ec4c7274a502a33590aa0d90f57063cc16d70618c6e824e71
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
deleted file mode 100644
index 121277a76a91..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.04.3.ebuild
+++ /dev/null
@@ -1,45 +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
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${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/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
index 7d80d7a03db0..799852719c16 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-21.08.3.ebuild
@@ -13,9 +13,11 @@ DESCRIPTION="Library for akonadi calendar integration"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
+RESTRICT="test"
+
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -42,4 +44,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}