gentoo resync : 15.12.2019

4 files changed, 61 insertions, 56 deletions

diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 59c724a803d7..37733d3badeb 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-account-wizard-19.04.3.tar.xz 156172 BLAKE2B 0f67ba8f11cb4bafdaa8ffd0a353caa580536831da821949dfd077674751f4d43d384bd26116ab4efaa859e9c3ac6eabf39a4d59e3ecead87b78a94b6c76ba24 SHA512 7e7ead2473fb228ecc222aaf494ee6bbbe4b1a8d8da77910b83bcc2148d76b0414faea29658638412c423b72931d37134afeccbb28948191e44166f5268c6112
 DIST kmail-account-wizard-19.08.3.tar.xz 158132 BLAKE2B bee4936b376b23a5d0952497170f8de03723ad6f4e3298c887701c4ac01e055f980abb1044f4571f31ca540bcacb4872221698b739417267626c0b16f0472802 SHA512 17478c5611bba481f184acd043c8e21f02c832b8da28941ac9f41e37f5b8133c96c6944abd2402e7b42875c058028aaafcc117d5df465214dbae3a93e7e2596a
-EBUILD kmail-account-wizard-19.04.3.ebuild 1446 BLAKE2B 21336822e3067b26939ce944b72ebcf89ded5c36b75aca45c90b33f517e130c780b8328bf40681fb9d28f0310d4fec035659d89ad9900d03853fd15cf2c11a3d SHA512 a4c1073efd5916b3da993642c08b0148c8c06b1797b187370d873cdb8acbbcade58610cd9fcbb512d4dadff819f9c79bd88ad79412e13965cf082e3671ed8c1a
-EBUILD kmail-account-wizard-19.08.3.ebuild 1665 BLAKE2B b51ab4c1f6227d0f6538a192194c7ffa07a8ee0752825529988c9102342f33c18ff5a8f4ef03b0e708e5f13321b4bb23b42dc3b2b0801ebc0a4aa96fd3fbf255 SHA512 23ed5afa47c87001b450a64ecb4f01560a0163e8f953680001135dbccf228b3392c5823fd5a3746824261ce950be8befc0bf42c7ea6baf866a6f144586285d00
+DIST kmail-account-wizard-19.12.0.tar.xz 158164 BLAKE2B 69d285b903229778b4b21c1281be595fd53c5a336162b024ec574929fe41b63e22dacc617f1379825d97d444eb6ba83d720b15a0064531d79802ba525f25c200 SHA512 c4f3aadcaf1c60593a0e1c46c3a83aade0a1e5b5dba1b19d3dac22131eda913ce646d091d572c9d13e085ba26791bd42012b6693542af1fffa7dff3433bb9919
+EBUILD kmail-account-wizard-19.08.3.ebuild 1662 BLAKE2B 10617b9c762464bd811b6540cc54d7b39695ca794fcbc39cb0c8d4da0a3419da6ae5b1cc805f348f82e1cf972be1788172df6db0818f4d25482ff03869a600ea SHA512 188a26c137aeb9bc1028866193738ac2940cb72dd746e72fe6d0ba09ee158472a931f49050c6100a74194d1ccdf3842ab002335983de724661bd58146ee4c4d7
+EBUILD kmail-account-wizard-19.12.0.ebuild 1666 BLAKE2B 21b38bb68e064ae4e34b0d460ad55d88b4ee2f901ef1954bba3511c2ccb9dd46130c873b263994518d1a1637d3270fe395fc966cfdc741c9c15e9c8f407e1f3d SHA512 e18e079c165539bb80e8383e585e8f4a4cef247a7cb10bb794c5ec1865d742374daf598111cf47e6766d550b62d05e589a1ee02e65afe3f2926864436f4aa120
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild
deleted file mode 100644
index 181911fda2fa..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +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
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
index e934d8eece0d..d2459ed1f489 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Assistant for KMail accounts configuration"
 HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild
new file mode 100644
index 000000000000..446a5778a2db
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild
@@ -0,0 +1,57 @@
+# 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
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Assistant for KMail accounts configuration"
+HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}: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/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${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/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepim-runtime:4
+"