gentoo resync : 15.12.2019

4 files changed, 41 insertions, 36 deletions

diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 903b06cf9c26..a48648597748 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
-DIST mbox-importer-19.04.3.tar.xz 33404 BLAKE2B 1d60252cdd2c08da796780db8b98875a05050b392cd006971f6b6781be35ae7b9a6a20c2240975c5d87915eecf86dce1c7b186c33e1143d789ae23774ff8251c SHA512 5788adc0ea7432d612e8ee5f45997b6c466cbccc3f4d79fee09137a56f9f8dda117f1f7c04a3ff68a86b3597e69e34f68d1332d8a5e0d6ee04cfbe311c6dbdb6
 DIST mbox-importer-19.08.3.tar.xz 33320 BLAKE2B 2c555414502951b1071a5af82a2f3ff9ea3618e8ae229a469b9e872208b86567d0f11587f0c63bb995d31f0f82082857d277c1ca7a7c3f3aca4c2f40491cdf65 SHA512 f48cd0e62c5e8820b7c4f764e13be19111d34b7c182283e06afc7a88f4a95c7fe2cf885aa4913aa466db927a6e3bdacd26a9943f68ab8e3da7ab51674733bd8f
-EBUILD mbox-importer-19.04.3.ebuild 828 BLAKE2B 3a55bd22891f03a39346d3582a6b9b9237ccf17478d719c36b2397fc5e5ca79307e1b919dc8d34fe3022532a4c6731baf84675417a65ec3424197db081a60846 SHA512 c6a5bbe54005083cbc7215185b41aa2f90aa670e568587f0daeaef01fbb7551a35a204fa8e547b2940c7879a831541cfb52c89307a115a65da7a06f11b3724fc
-EBUILD mbox-importer-19.08.3.ebuild 960 BLAKE2B 316907637630e340918d37bb130a9ca37dbf7b2e464d6450f47e8344960e9d7dc1bb9d1a844c85399bab71b265bd5d21bda24287a4f38150292a5b0b44d5cfb8 SHA512 1911eece644d3dc21ec07e6127e7e5c611a1b4371b2870a50c67b1439c5c6ef53e1dcac17cbafbcad3dbde099b5e2148f4bd0bba147edf7820a2f5cd98005ef0
+DIST mbox-importer-19.12.0.tar.xz 33344 BLAKE2B bfeff269670860d12ec8fac02594dcf6ed389a4c896c4c401365c9288280dc40f1fe483a6c561ab3bc3612f2daf4fa5a58287cd0e6abbbe8f95549b12174aece SHA512 4375de381759c913d47cf98744df20a6a979e89eb40269ea2fd776a7d3c9b34cdfedca605a3b11b288a377b47ff5b1c122fae079954b7ffa0876f36c7a405a17
+EBUILD mbox-importer-19.08.3.ebuild 957 BLAKE2B 41ed513145775ce3c1f89a7b93608cb960079404afbe38c3de53a56096ad9c388f483a756554e7c0860a1867aba5168e4484554a974c62e4193f7a8a9e14706e SHA512 4e6f383d0942505256ec8648440ea2746a62f6fe7e5d819c386a06346e1ee7dc0a1a8c491c03b7e186f6a32b8780f71ea7d834edac5daef982bc401190307d37
+EBUILD mbox-importer-19.12.0.ebuild 961 BLAKE2B de5c3552d462bb9ca7fcf9deca6c258fb5aeabc518a1beb69341ce605443d5fd80f9f22d93df00baa19a854168e96e2edd52e65c626e5cfff11d6b635e70d653 SHA512 037192401ef1879d6354ac77fccba4725007c7f1ab0ebd4f76d4a0f1f1eca455e68b2749b3548a80879ddcbdb024de694ecb95de7f6d4513a166e5d5e87ad427
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild
deleted file mode 100644
index 58e61fd17813..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
index a70c3a16b47a..368670991504 100644
--- a/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
@@ -12,7 +12,7 @@ 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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild b/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild
new file mode 100644
index 000000000000..2f08b9a3479b
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+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 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"