gentoo resync : 15.12.2019

5 files changed, 50 insertions, 74 deletions

diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index c12837cce6b9..a05c203c89c5 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,6 +1,5 @@
-AUX akonadi-import-wizard-19.04.3-missing-header.patch 683 BLAKE2B 35cbaaf10fa7ed95935ae06f655cbce0ad8b8c5a092fe652498017fc202e01d8c117173f023624bfb7514cad3d7c849f63d27533a3655b72fce6c18b3e999913 SHA512 9966d80e83b4d42c20037cc0fcf1262a2818c35686e9aeb89b386e1fae7e2649f872a4542c320bc30ea08882605b0d9b98f5a50ccef74bb628b854312b5c25c5
-DIST akonadi-import-wizard-19.04.3.tar.xz 438784 BLAKE2B 12ef065b14195b81f5aba705e5ef6f59f1def0e257c1758a29625184919effc1b3c09bd4e8843f907b8d4c859e4eb10df3af90e64df5f4ca788bf75cd360ebb5 SHA512 20093df36a3d6a2bf2a1549664c12e687dfe22e0decc57b6151ab91a3dc5a3c2f1ef0c1d11c5f30ff1e700f2e8670f1e26ce945667ff3134a536e15b76407e48
 DIST akonadi-import-wizard-19.08.3.tar.xz 438896 BLAKE2B e49aac5ce6f282933e5c31637ef9230a62f176f1f321118986e1b8c39d37ce9b84fb420524fd7d8a9797cf8e17dd1d9305348a1526405257f397706a6b68fbe6 SHA512 8564a9a7d3aa87583bc486de9eb09d31fcc7e7351bdbed282a0dc17e4aa7caf41b8153341bc1e01c58154563f1b6d1e8b85bd46225219a3ea6e59daeec8b4c61
-EBUILD akonadi-import-wizard-19.04.3.ebuild 1148 BLAKE2B 92601b02a881967cb6a97a1b367ed7fbe0d247e415096ea26d3d8e34622248bfda454e1b652fb7d9f042685942196fff6c32b76bfd744ed44f1308f25f097ddf SHA512 d160eca6372cb4d590e077f299ef5e131ba79b714777e894875c28d43ca6373c814040437a9d85596c043f106cfe30c1832230ca6f7ab845e78e09f80afb7c45
-EBUILD akonadi-import-wizard-19.08.3.ebuild 1266 BLAKE2B 38b139a777146a7bfe4d1a7d368d5842e75c9b8efe7d7581806e94c40549870bd921910c8c37899b006765fd7b7194a826780d604f212b2bd727485866c0206d SHA512 67195c4be6472484e331eda52ac759dbb6a624cb4406854e5c5c36450ea3190750460ef78195d16b735bdeb25fcaad6a2e27f2d3d50a783a91de8a6ffe68371f
+DIST akonadi-import-wizard-19.12.0.tar.xz 439116 BLAKE2B 6d02e3d279b9d09b48ea15c74884ab85dfcc947e870358fc62f27f2f099d917a5ca4624fe111b920425e1fb76f3b3a22424847cc9c673a26404cb8a7a9324be1 SHA512 d6e2f75f23f139bbdd0d520756976af83193430de75e193d281b40754fb891ada62359a575233f5ef7210cdeba71bcc3be3a133a58e12a173894043d8c189736
+EBUILD akonadi-import-wizard-19.08.3.ebuild 1263 BLAKE2B 5837545329f4bd0333fce2b4da61b84a78e35b48c82811e543fa5b776c60c6a7da24981bd5ec75e3767533e7bf84f8cd03d6a88f3deca46f1a6822d1a87a53ba SHA512 ef87e02385d2573679e52289da81450d813bdbae65583b83b8b2539f25a7f007dc67c3be42234cd320163ebd92016b4bff6afc74a3883e11cc56d31657e10fd9
+EBUILD akonadi-import-wizard-19.12.0.ebuild 1267 BLAKE2B 795266f566e985d6f36e57849cd09b469d0dfdc76c1290bbf04f49c6696a49a6259548213c2050817e7fde7c86dde688f93f80742cde9299c0931b204a9b97e3 SHA512 5b9e65f5aaa9bf9d693c46d5a608aa17a8081aba82f4d5e6b9d1b31f5ba9df40c982ef407acd8fb92ce8a4fe676218d34bbf5f9f07e02a0756d18abb1b142508
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild
deleted file mode 100644
index 105ce90171bf..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
index 878ef07ac770..93a6ddcf1c74 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild
new file mode 100644
index 000000000000..49bd357f72c7
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Import_Options"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch b/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch
deleted file mode 100644
index 262d364326d2..000000000000
--- a/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2b520d8417323d4af6595b510978153063d50b98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 12 Jul 2019 13:17:39 +0200
-Subject: Add missing QVector include
-
-Fixes build against Qt 5.12.4
----
- src/importmailpluginmanager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/importmailpluginmanager.h b/src/importmailpluginmanager.h
-index a7c1049..7f3a100 100644
---- a/src/importmailpluginmanager.h
-+++ b/src/importmailpluginmanager.h
-@@ -20,7 +20,9 @@
- #define IMPORTMAILPLUGINMANAGER_H
- 
- #include <QObject>
-+#include <QVector>
- #include <KPluginMetaData>
-+
- namespace LibImportWizard {
- class AbstractImporter;
- }
--- 
-cgit v1.1