gentoo resync : 18.11.2019

3 files changed, 58 insertions, 54 deletions

diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 2242d7bf82db..59c724a803d7 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.2.tar.xz 158592 BLAKE2B e7d20c1c7bbdb2f34a35da3dadd3c5985e0ddf72cb23c16f0799a62519e6a738f4fc5c4455f4b294d30272563088828264d19b602b2b9b39cd447515ca40c800 SHA512 9c466dda13003dd8d3c40b60d0566cd914d1de496350c84ccd929f8ad8077e4ffc05d74fe12e5ea653605962abd87471bb314971a7641575cfa771b867fc8b1e
+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.2.ebuild 1449 BLAKE2B 780aca6d9d645bd7d9ddf38d41a67cf2e42c436e3ad295577bbdac7d52c660b884735a08cba0be1f17a70eee9ccabf6bd3707b5eeb68079b4cdbec6b6f330dbd SHA512 79c2b77bf402e142e89005b55ef8a65a7e18136862de4abcd91d8c2497ccaf8c399209465bbcd7567dfac250d0cc927d1e679fec9de48d91127870fca398b49a
+EBUILD kmail-account-wizard-19.08.3.ebuild 1665 BLAKE2B b51ab4c1f6227d0f6538a192194c7ffa07a8ee0752825529988c9102342f33c18ff5a8f4ef03b0e708e5f13321b4bb23b42dc3b2b0801ebc0a4aa96fd3fbf255 SHA512 23ed5afa47c87001b450a64ecb4f01560a0163e8f953680001135dbccf228b3392c5823fd5a3746824261ce950be8befc0bf42c7ea6baf866a6f144586285d00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.ebuild
deleted file mode 100644
index 9c19a766bb80..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.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
new file mode 100644
index 000000000000..e934d8eece0d
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
@@ -0,0 +1,56 @@
+# 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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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
+"