gentoo resync : 18.11.2019

3 files changed, 50 insertions, 46 deletions

diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index 2add6e3a1f5f..c3e27f9fb559 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kontact-19.04.3.tar.xz 793564 BLAKE2B c2ee2208337108cd05f450ecbdfc1cea210f93a1ab84cc09b40e32c3bfc699594d055938483f98d79c1dafe008d69b0a8c95a5564e46f434af5ad6ff423d7d04 SHA512 7fe6a773dfa329dc7935d7ce44906cc0bbbdb9b844a5927e07fd988a4c36dcedf3c01c9895d02bc97ac7ee0a5bbee0e0892ed5efdf794d6ff266ca5933782b6a
-DIST kontact-19.08.2.tar.xz 794412 BLAKE2B c802f8cb78f688af1d83b8903480bbf6e9429b13418a6576aae3163904f30d0b411d8390f51c3ea39e858068b81f086afe8587bd615fbe8df3acf5f5f85ef60e SHA512 984e71f7cd28b5908441c8f36559e1669ef8719860af9967cb735906f30231ddbab9dab4aad9bfaba3e9394f621a0d2647f560637e9870355ee9ad383b0458e8
+DIST kontact-19.08.3.tar.xz 794920 BLAKE2B 516e3629fa76d123ad13f72899792542f25ea5f403cc6c2bceb2d21c6803c6f9cdff85dfa2a416b3a7a3e2fed527687ab4e3df80e3e8d6e9731c68ba7cfb0cda SHA512 1ff2e0abc2190b43dff223aa870901230cebb1e6badb7d50a501448e1c7def24b28149712c2856fbf312ca2005160d263f2b2920111c022f59c39e7edb441f74
 EBUILD kontact-19.04.3.ebuild 1204 BLAKE2B c387f726c8590b959c982edaed7dbbf1b890754a83f78a5a4910a04fcc59d74cc635b11c3b1a77ec801db17b1ce9138e71c302327eca4c3e835d2345ab277cd1 SHA512 1312b313b4439aeee416cc848d9de7fc0294f90a25d9ee8d65d1f140b2bb6396c04f8bd6fb7489e579a7bcc28e62c0592d1321d9621151b6ed1b0730f3564c15
-EBUILD kontact-19.08.2.ebuild 1207 BLAKE2B d8d9a9f41f853f7a4e0075237985adc91ecd341ff222e5a40f5f9ae0264af637c502ef8d32881b584cbc9bed567c7efc7b0f87cd6b3ff8b77836720b30ecc046 SHA512 31a541f5a23ec4081b186b86358d923a67911ddc7dbb1c1ec0211b0340db76434a511506c59b3890b08de0f833b476d570d90852a257b4a057df280298bf2162
+EBUILD kontact-19.08.3.ebuild 1404 BLAKE2B 61b1545bcb481851b9558f69850143f307bc17ec16ebfbd7536be9bebbb755b460d2720a63224f01848345954dc9511186d2950383627262fda22be3acb9634b SHA512 dbbc388a340ebf895ed4595b6d01e3b18b51681a114da4848a624672953bfbbabef956d5cb708c6f71fef0448c596ddf5339d425c1d62a60ab461ad56bc313d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-19.08.2.ebuild b/kde-apps/kontact/kontact-19.08.2.ebuild
deleted file mode 100644
index 0c785c30110b..000000000000
--- a/kde-apps/kontact/kontact-19.08.2.ebuild
+++ /dev/null
@@ -1,44 +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="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontact/kontact-19.08.3.ebuild b/kde-apps/kontact/kontact-19.08.3.ebuild
new file mode 100644
index 000000000000..7d015af34bdd
--- /dev/null
+++ b/kde-apps/kontact/kontact-19.08.3.ebuild
@@ -0,0 +1,48 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Container application to unify several major PIM applications within one"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/kdepim-apps-libs-${PVCUT}:5
+	>=kde-apps/kontactinterface-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"