gentoo resync : 15.12.2019

4 files changed, 46 insertions, 41 deletions

diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 692f245c6245..e30b0b4ec115 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-mime-19.04.3.tar.xz 136596 BLAKE2B 53203e06de035140e9ee3bf90ec49ab844a36c80ba8d6a8229a9df000e547445be350f7879670c83f49a9a7e45523cb7c9522bc148544be5d765591cf0a29e61 SHA512 e0f1eb074b81948537d87e0dc177319e41bed5435eca2efd8f96e55735caae54d8506aeddb0fa5e952e529078e6c630f6a5cf9f9413be77c1729c5be9294bba1
 DIST akonadi-mime-19.08.3.tar.xz 132756 BLAKE2B 4083a820e8ff6c1134f34fc14c179064abbfbb8747a52c1d7ee82a065ae9c96b8e17ac6857e308674ee41f24ed8993a342adf4ff8348751d275e07165aa02a1c SHA512 a8f501f36107818f5e0553aef7a4b958ad58fdea9c335e5ab53fd4dbb7729f49be2c459c6e3ad3d42ff4807817ef38059acbb1d1a11d1f9f88290758299c84c6
-EBUILD akonadi-mime-19.04.3.ebuild 866 BLAKE2B bd11d3ca8964d723abb24c9d19a811d50dd945730bbf3d4896b17c9ce1c922f3c5eeb7149edc6a4bb4d8ef9778c976e89dec42fb3338900089aca1ad60f643ce SHA512 60382394409bd2e300b208922f9158e93e730ff118b900bce802f3d1e64f7f2a517d3ace0952e76b8a21bda1e8b6f01f2364cf7a60b9079c2470a71579be85d0
-EBUILD akonadi-mime-19.08.3.ebuild 1004 BLAKE2B 30b15da6f53e5b59403d4f10ddc39bfdeb5c814de8c50f1f006ac0d68ad57ad02ab50c9a23219664844a6498b493cd44b313abd19e30ba619079e51e969697b0 SHA512 436fa4706084cbc21069669b0c3fc8904a161f1eb6071656a19d71adc8a3f192c7afac2e8792cd4fa4f33f737b39b194b54a7a1874b256557be54ed48a4e0bed
+DIST akonadi-mime-19.12.0.tar.xz 132972 BLAKE2B ad752651c5173e6db60d415f6ea3039748ec461bd8e4b81d9ea2b14481c289e6518010d9d54527adabb1aa894d06d52420d4fc450b796a5a10d7b21642cd2fbf SHA512 27c66e8c6069fbca2d82fccd1c2dbf77c3dfcda97e5f16353db5efd4928b361a719da964397fb04322f32b2a147d25b3310f7101886ec94c959c71ebe62c6a23
+EBUILD akonadi-mime-19.08.3.ebuild 1001 BLAKE2B 14865322f2adb3724e5fb9a25580a4ddcee2dd96b7d7a63821f17b3ce1699bc82a31586cc552cf18d594cbd3bee54dd67fa25b07368dcf54271eba79b65efe12 SHA512 f5c09e46e63e03592bb74eee1396411ce7ba4b8ce02eecc52df76308e5624dfc451f33af381d70d972593b70838971b1c57cfc6bbf796c7057d4a2181ab46eb0
+EBUILD akonadi-mime-19.12.0.ebuild 1005 BLAKE2B 2eb2d4b283a9a254171eb6ebd16fa847afc76a4c28c9bc48bed549cb01a910f347eb0e8857c8aac200b70c7c18e4c0a0e5cff7fdaa50f410451453c5e8494f99 SHA512 0ec1fb9d8efa9319ee00500ef75bd7fb89f78473ef7f9f751756315a3b9819187f86bd95a9f4553c78c2886046155021ab3c09c579a7f321e60d7a69ea683f33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild
deleted file mode 100644
index 5406eb43e1be..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="amd64 arm64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
index b597bca87af3..6ffd471e42f6 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi mime types"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild
new file mode 100644
index 000000000000..2aeef523c323
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi mime types"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${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
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"