gentoo resync : 15.12.2019

4 files changed, 51 insertions, 46 deletions

diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index c638fee934d2..ee56293f9246 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.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.3.ebuild 1247 BLAKE2B a32b662224a8adb52f3c652d231f28e81275bb5cb4c9767d5eb17d2649a5a4500782c0b3139d470df476fe3773944940b4b791f971996712f8011395663e6e1c SHA512 0fad58bcc02206609d1ccb5c8c7e164111f9f22850436807110de0730e263427c31bfd303c3f3f84457cdbd3e5fe019aae0793e45a285adae706013a6513a6a2
+DIST akonadi-contacts-19.12.0.tar.xz 393264 BLAKE2B 2f5cd44fd14e0dbe88be60697e27ec882ecd5d5bc16c3ddfe302c3415a3d5532fbc6cf58c37e8c496cc2afa4e8ca9c5ee016bc2e069a74b5668862524061c1eb SHA512 ebf93cb3e40da1115be36455fd89ab3204648e98c917bb817bbe36ece4fd9c983e2552a8dbb8005ef6adef645898b012d8f34806ebabd5d3e03c2ef7d59cddcf
+EBUILD akonadi-contacts-19.08.3.ebuild 1244 BLAKE2B 48f081a536f1c5904c48c6338156401ce1cca7b0181ffc068dece68e2726c03dc840dda1b050d419220b3b278f18dd3c1f3214d3a30e2e9c048895f33692cd9f SHA512 5f0a72b9fa23866f0ed49e76757cf0f19aecfc1b2140ba85ad229403b0e714197806a50e64bf89f8aa687907784dd0383183ab0ae59cd729150ef3a20789d9e3
+EBUILD akonadi-contacts-19.12.0.ebuild 1248 BLAKE2B 6e994aad63ce0ee8ae500059917dc00a08bb1964450f519745ebce0f2539228954a353dc1a9fc5e055c2ac70536e338e6195758084db9550beb52a4b8d48b725 SHA512 82f5d65f3466d021d2b6ec4b3665f1ee63b7248363ba293aae595736a9da7f707222a3070a8e180f7eb04e8e5b2c43f2cf71132748a6635f55c1f32f68de0b39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.ebuild
deleted file mode 100644
index 363d10d52f67..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.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 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 kcontacts)
-	$(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
index 4f6d6855f53d..6ea0b7c059ef 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi contact integration"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild
new file mode 100644
index 000000000000..5bf2fe36e8a4
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# 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.63.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
+"