gentoo resync : 05.12.2021

3 files changed, 7 insertions, 38 deletions

diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 08055e82ed1d..ce64c31c6bf6 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,3 @@
-DIST mbox-importer-21.04.3.tar.xz 28656 BLAKE2B 529b6d833655ee8d77b0cb080afe0191d1199abea68a2797041594c76d88df1807770ca60e7c669c441619e1c99854a615748a4082befe91969d2df5694ae3ba SHA512 6f92c052876b9bb0ac39ff1a3a3f1c96a8ef676c280cb915a0a9c472a25ff86573196b059035096bfe82d570d28483a092a8ef147099c1eaae82dacb50c45554
 DIST mbox-importer-21.08.3.tar.xz 28660 BLAKE2B b00dc3775e57968692b6faeb32171234c3bf6637306f2972c13a8a15d168b98f91ef365cc2eff72f9e0517f1ae19beeb72ed0c6375c68fa8fda9ac050408813f SHA512 0554f88b29e8bd416b45a7d592731f2071732c071c3f14d74c8920d62dc779687283954f62a41ef497750cb3faf2088e07ecac02400505b8fe21e9a578ce9080
-EBUILD mbox-importer-21.04.3.ebuild 922 BLAKE2B b4c7a93df7931e62eb5a63b91d5039d8999d1a4089a1bd5cd4c635d2e665dec3a02f90ed52320666d1db75bdbf21be4e2fdaa20814e82bd879dc282f54e547a1 SHA512 08f2c5df0622dcc197f91126876e99c4207133e69006b81d2b6841225af15d4c4e5b877219132e41f34fb4ae12c3235ad49b1159aa33e84b8e30d81504d9161e
-EBUILD mbox-importer-21.08.3.ebuild 925 BLAKE2B a4af0c50cd669b523477157035c75b9fdf19469ac996e710105e4965363fa0842aa4496ee41cf2700b95191e615573a58cc0004f5b8c0c4774e7de2059fabb9a SHA512 340d8c881b5648f2dcf7caaa86f63384a4e4fce9500d085730be8cff9a777e2845177f079d963b3a867a5e4865708f1cc8f161b60e4f8751ccc59fdf2c063641
+EBUILD mbox-importer-21.08.3.ebuild 996 BLAKE2B 4a42ecca09b798a4884793a2b14c97d85060d5ce9c69f36f53317c2b7ae7c4887d2860a8d55e866418617506d06436a045d235b881e661800e9e38dddb69364c SHA512 5ed1c1807a9c63e1bf2056f46799804dcaf0d7b9ad6037fd77fcd411ae0cecfcc7d7f4c3c3dd8c36082151820802d95d45ac7bf6753192f7463f95b27b9a1c66
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
deleted file mode 100644
index f48064124a94..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-21.04.3.ebuild
+++ /dev/null
@@ -1,34 +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="Import mbox email archives from various sources into Akonadi"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/mailcommon-${PVCUT}:5
-	>=kde-apps/mailimporter-${PVCUT}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
index 299a7d0f58b1..d959adf126b5 100644
--- a/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-21.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Import mbox email archives from various sources into Akonadi"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
@@ -32,3 +32,8 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep KF5 GrantleeTheme
+}