gentoo resync : 18.11.2019

3 files changed, 48 insertions, 44 deletions

diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index e569a6535d8b..c638fee934d2 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-contacts-19.04.3.tar.xz 392564 BLAKE2B 27cdedd9e7317292593af31cdd1bf010d855de78f89505de43da29a824a5d4b15afc8a761d730ec511ecaf5a92df987dbaeac6672be92961bb79c91071bf2def SHA512 c183dc31db60ec89dc36e24c0e3f04ee0969dd893f4eb37d5fe37b4153474e5ceed4d7a7aa1e1c63343db420eca4e1e117fd6db74b97f75e86d32cdc7a738081
-DIST akonadi-contacts-19.08.2.tar.xz 384864 BLAKE2B ef9823fd00909734b3652b266de6412141b8ea4de55698f56d17881abbc6230876e6281124f4750c08f16da8d4269f32b49d94f3115d443c96df529da5d22684 SHA512 9311068388b4a5f4be047849e93e5de82febd2fe7ee25c518ece41058ed71797200217d7ee2668d42a743e95f5fe1df5a60c7a83c5376adb3fb345e36333e232
+DIST akonadi-contacts-19.08.3.tar.xz 385320 BLAKE2B b533a1195a5e586b8aac42c44a2320c790db96680d9af8cc75f90a8f531b4ff7f53df03f294c4562edc38ccd6a67012c3205750a06c7a6bbb9e784f37cbb7cae SHA512 e22cb4406e06d4c39bca3ceb9cd507a70091e4ae1919b7ec137ce51c2c8151246eca071ec640ddfc1127cf7496deb945c8c617f3f64434a9739ff5736358d47f
 EBUILD akonadi-contacts-19.04.3.ebuild 1064 BLAKE2B 0560e4de4d72329a881da92b999d8c720416a626e9f84f39fcf77cc420de3582c04f090aa28088e3a84c011a056030c6f2b37567f17ef0808e15e945f71f58ad SHA512 42a0cba8d8ddf2e7f74332d89c2b34f6090e9d4fac10366662b1268cef8463633e2e480c845d81dd2b595f2f0d6ace73cf92df1cb03310d5d384a775c98a6cee
-EBUILD akonadi-contacts-19.08.2.ebuild 1070 BLAKE2B 450b7fd8c81190b5d1c9f92d93dacb890ac0f98ca7a2ee9eb2f08378c2522e954606509254f11845d03acca022277371779a20d2163be1763aed1b75fb40786b SHA512 add34a726449e52a02122297d6f030e8ac7a1e76b4e978e112a70b3a216a2249f78fcfff96592fca9dc428daa0abcb8609de05077fac9195c6b4aa74c2d6a667
+EBUILD akonadi-contacts-19.08.3.ebuild 1247 BLAKE2B a32b662224a8adb52f3c652d231f28e81275bb5cb4c9767d5eb17d2649a5a4500782c0b3139d470df476fe3773944940b4b791f971996712f8011395663e6e1c SHA512 0fad58bcc02206609d1ccb5c8c7e164111f9f22850436807110de0730e263427c31bfd303c3f3f84457cdbd3e5fe019aae0793e45a285adae706013a6513a6a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.ebuild
deleted file mode 100644
index f3cc30af0eaf..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="~amd64 ~arm64 ~x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
new file mode 100644
index 000000000000..4f6d6855f53d
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi contact integration"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/prison-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"