gentoo resync : 05.12.2021

3 files changed, 7 insertions, 53 deletions

diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index f338ccdd5b4a..f7655dc274f5 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,3 @@
-DIST akonadiconsole-21.04.3.tar.xz 201740 BLAKE2B 89964b6592a155b80357299842aed95e7c1bc371734b408811f1345381e360a3c278f46f42806306182ad2becd8007962c54de5a928847744ddf82bb57c52d47 SHA512 d2a1daf6feba0154dedbdfebdfb1a5744e523a44d35ca38f46567c7cb50683ac83c604057230957be9d735ec5790e2a28abb2bbf1947156c7dd3104b9a2bafe4
 DIST akonadiconsole-21.08.3.tar.xz 200736 BLAKE2B f8365e5e985f573dd5ac3e695580fedd6a77239cec013e116f3338755a5ae7c80ff8d61b868bba8fd66745361752124c623d68d6b6434a9f7b3bc3a3b0b72c3a SHA512 699a943a02bb307e01fff4ab25384a49833e16208b3d72d760b29e332e47acbc23a80857fff91d692349744a192668165412d4b4aa2de7625c13ba95756268f0
-EBUILD akonadiconsole-21.04.3.ebuild 1481 BLAKE2B e2dd020491ea028c1267b5fcff9818c8e9cf0370f06348b2dde18ce4a21deafbc8d91af0883e6741dfafb7bbfeba8e563eaf322ea7c5b23f16edea2ef16465b0 SHA512 f5ec58f18a8028142f4c7712f72896811187c5ae87ca6cd617807631ed8dd38c3026dfcd1492651547ba4916f1693c88ed72c252809c020c3c209973c3680441
-EBUILD akonadiconsole-21.08.3.ebuild 1484 BLAKE2B 1367310f7857357f4ea8656b465160ffa1f98cf49f9387204f2d5f675312f3f0b106bfc1f06e435a88f4d8c50033b5f5a6de778862f86f2a9c32c98df35837ff SHA512 aab164125c688ff3e9264dd30fa591900d55168c2b7f3b45dddbb98264cb6ec80107860180e33c1851fc1ef4222a88654ba58b0789b3e8f3a670ff62c91ad4c9
+EBUILD akonadiconsole-21.08.3.ebuild 1555 BLAKE2B a748d208309661cca3c946b25fe3a8768579f971f3d74addbbd82accf17cca4b8b659729933b1edc9e7a5bcc53b47f9ee2e512edf8c894aacb81b99972d0e7c0 SHA512 0d6b15dfda565bfe90fc7f7df19163378d9fd19d7227d88e89c3360e93510b9c1c7de42d0823d959caf77a9043182342766898804b832c0893cdb714fa519d76
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
deleted file mode 100644
index 9505674d566a..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-21.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/xapian:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-search-${PVCUT}:5
-	>=kde-apps/calendarsupport-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=kde-apps/messagelib-${PVCUT}:5
-	>=kde-frameworks/kcalendarcore-${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/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
index 1fb49cc99e52..c978f8038d2c 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-21.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
 
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
@@ -47,3 +47,8 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}