gentoo resync : 15.12.2019

4 files changed, 39 insertions, 34 deletions

diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 05a798db9837..a179c9aa6023 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
-DIST mailimporter-19.04.3.tar.xz 540420 BLAKE2B 79ab6ef86746085f9a13b0610205b94bb822d332438f8aadfeec4e1f16ac3d051abb99edead969ac2c1baa99a67d484bc6bfc86e41ab602c6f8e5f2cee285734 SHA512 5e0033182e32f9b5fa00b9d18b6cd0180f28d10ed236d89b1e461de80db9449a5b4567d5310b8a236bc30f7a8c2447502d8e9bc6c17f600731ba3bb1f83c66c6
 DIST mailimporter-19.08.3.tar.xz 540544 BLAKE2B c6424a27e1ae47b268596b65dea94323bb8fa458618ee9362ec32734acbd09952a6b98543f3f57e86838e28a37cafa7a756fcdf13b1584e30a51d2fecb08bf4c SHA512 f0c924eba0b5dbb262402f3f6ee4f4d883304b0578e61399df366e11c1301a1e00d9e72d7c7e5ee62bd2a1339b69354a4dc2e229e80a4455a7d85923d6c9cf0b
-EBUILD mailimporter-19.04.3.ebuild 655 BLAKE2B 422a810b82ec460d46d210c52ac363796a80f308ef353ae3ec3e38180d27dc91b0d70e8e4c368c451db1d469dc09af0206a18a82aa154d618cf83ec28133f225 SHA512 dd785d28b1a15382bdcfb8b3ba085d398aa180d971eb2fc051cd112adb29b98ae81a103920d3650fcfb996887044fc47cf9128cd9d543114eb51428af070e797
-EBUILD mailimporter-19.08.3.ebuild 775 BLAKE2B c90fe969f72ddb28b52dd6573113647d9c81b07046a02c48935705e43233b44458325e1c8a0c035bf6443bc90423acd41a42c11156163ac482b5add3c59c2ee7 SHA512 792467ecdbb454cba0ec786aa6ad1c69d99b00c49d0d630eba896be86521c3da7c485dffecb560822f8a8fe1dd47d577ee4e25c96b560210d12b65f86fc176fa
+DIST mailimporter-19.12.0.tar.xz 540600 BLAKE2B d9087cc1772b6b3b75aaaf1400a610f449f4bf4dd42b488ac7091e64f9cf0f18dbc6a6298a6fcae52b6d988fc2270852d8069e6bba61e3eedd6ccff512461e9b SHA512 48a27bb75f6cec5b3aa3788a8c04f2bc39f449551343fa26c455bd8b14abdb41b5b699a2243434526f6944a0dab536e705aa2afd052421b8420a3036650dfe97
+EBUILD mailimporter-19.08.3.ebuild 772 BLAKE2B d917b8d21d2ceced977ee534d292b2cf33800cf1668c64d11a707cc7b435d04aa9d37cb95e02eec4754670f385b63f9bf1c174fe75446f5e745a121a692dd69b SHA512 57ea33b78ccb593f5175bcc1fad3cbb3c849dc3fbc5a70ff32620ba2e7cdab37cae30e1b79033ce458227efcf06eb3f280388536acab1f6713108d4257b89697
+EBUILD mailimporter-19.12.0.ebuild 776 BLAKE2B 1511b94d909d2777d451953ae65a3521e4b346c3fa4635ab4cc48f8dedb013f79389e86457b349a49d864854bc1715dfa8dc5eef48f06d36188fc88a3426e6a2 SHA512 df48ceb12affc9a4ab21c56724fbca93ec111f2c975f4286c7c5d0cf35de8206ed44cba32a13b92afd74efb35884a3b900562aaf07b8c60679f6a1e1701d23c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-19.04.3.ebuild b/kde-apps/mailimporter/mailimporter-19.04.3.ebuild
deleted file mode 100644
index 2b9a5eb39506..000000000000
--- a/kde-apps/mailimporter/mailimporter-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/mailimporter/mailimporter-19.08.3.ebuild b/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
index 8c9ca5eb4bbc..9f12781e7cb5 100644
--- a/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailimporter/mailimporter-19.12.0.ebuild b/kde-apps/mailimporter/mailimporter-19.12.0.ebuild
new file mode 100644
index 000000000000..59b5db1899f4
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Library to import mail from various sources"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"