gentoo resync : 18.11.2019

3 files changed, 51 insertions, 47 deletions

diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 31ff0d576f86..5e4690422c60 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
 DIST akonadi-search-19.04.3.tar.xz 82496 BLAKE2B 1c3db64d6703bb22fb0c61c5adec8fa56ed5705115dc5d903dcbdd80f63b794159e05deffc6c02bd83659b4eb4cca1d93ed46428f78d995a400d80e604c0e723 SHA512 896f7b38de04bf7d2cfbdcba2e3cfa9da84060d9eac037edcc28dffa261c6d3f35d92f4152da992585d210262d630b2c2ada8c9674e600f2bd4c29bc6009e62a
-DIST akonadi-search-19.08.2.tar.xz 82744 BLAKE2B c48924ac94524fbadb432c97013ef90d2afa99d6533d9664a1d9aa77865a6dd67e6de82bfae55f4cdcd57b41f81e3e51a5ad5c2e75c16548ae3ff3d80039f76c SHA512 bf7d3006d03d1fda9ace33eeeb93e24263006fd6829f3e94f2932e0afa20f1cdbd859fe68227fb5602b007aab3c386803cdd458bb911774703a873975072ccad
+DIST akonadi-search-19.08.3.tar.xz 82480 BLAKE2B eeba0750d0c77d0942efffd01043ddfb02836a0b1174b9c3848c3f696744d6fcb7c7b0f38701da791db0f5f0a209e41ceac3ff1bf9331562b32944186d85065d SHA512 48e9b6247acab7c8dd874693c7302566b43f7758089a51b2c2e4d4c1eeb6ad6d217529c418254f8d930370d69c977264ddd1919f26a7f692ba0cff2426d0b3ec
 EBUILD akonadi-search-19.04.3.ebuild 1131 BLAKE2B e131b048b4e34552c13674e3be728afd78c6c8a747741eea3248d46fb8e66d78766648558cbfa50894b8cb1107d2d0e3196130a35149b8fcb3757bcd7c9c98b0 SHA512 215dc4b854cc2e3ad1f39958f6b83b2500dfe8b5cae8c8570d68af12294b8054409837df8fb589bfb484c626b70708dc0e9e5644e7ada5e0d97594de33d48f5d
-EBUILD akonadi-search-19.08.2.ebuild 1145 BLAKE2B 929982ebe114b42ff0ba025ecb09651543385549344483af4ba0c1c254788061825a7c34d5c0bbd0ce1858f161321ddb53a5685a9c7df46b89fd0cdfb14f85f0 SHA512 2fc60070146a6118eff20622461c7bf802452cacfcb60f0c5ea20e400307e60f942b03bfa0b33601bc6cc6c2de2a2edaf89912ffa791c5635ffe39ec23a7e3cb
+EBUILD akonadi-search-19.08.3.ebuild 1305 BLAKE2B e2b149400a0f53a0d951d219e8c5e311dbc6f97c79bcd4481f7ce96c2ed23cc94f791df861b6d00485428b366c99bbeec9d840ba4f51a8e7d97f4d30d26c67d9 SHA512 739493c5a4ad58ecc96c63ccb54e37b8e98dbfcc4503163c6bf3c3b8d09bfe5aa8bae956a457426018c22521425f6730d1e1acb83352058aac86a7277a351d8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.2.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.2.ebuild
deleted file mode 100644
index 3d75506dce1d..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-19.08.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
new file mode 100644
index 000000000000..367c64b8dc8c
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${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/kio-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/xapian-1.3:=[chert(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"