gentoo resync : 02.08.2019

4 files changed, 2 insertions, 114 deletions

diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index da46318d75e2..5fb510ab1343 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,6 +1,3 @@
-AUX akonadi-search-18.12.0-cmake.patch 2096 BLAKE2B 6659077a290eaa582a2eb35df4a02d54d07c700baa833a952e6f59e01a0398fa0caf4d6fe62601683d7f0e7230ab448c67af1b5657a284262431f42bce50fd67 SHA512 02e8394cfaa1d4117a8b7e990779d54335741746cccba06dfd57ea77d2e674cf3b2604adb89198c94e762ed3f36165ba9f009cf737fc0b36c10a6b9177ece205
-DIST akonadi-search-18.12.3.tar.xz 82804 BLAKE2B 34b0b42e851dea5a52ae64a30055384b9194c23e2dcc6ea1a4f173333f745e6006b4555cedc67b4e0574ecf570f4d11bda926e07788e94394a1bd72dcc5fdbef SHA512 4e2c02956635d043080cdad8acbbd65efa93e991ca6897d40e4c693f02d3122d226080a5264121a764cd5a82c293add8f8911403839d5c8cad9576cbcaef3ab6
 DIST akonadi-search-19.04.3.tar.xz 82496 BLAKE2B 1c3db64d6703bb22fb0c61c5adec8fa56ed5705115dc5d903dcbdd80f63b794159e05deffc6c02bd83659b4eb4cca1d93ed46428f78d995a400d80e604c0e723 SHA512 896f7b38de04bf7d2cfbdcba2e3cfa9da84060d9eac037edcc28dffa261c6d3f35d92f4152da992585d210262d630b2c2ada8c9674e600f2bd4c29bc6009e62a
-EBUILD akonadi-search-18.12.3-r2.ebuild 1221 BLAKE2B 67d0eaa2efe8025e9b83b15351a24285e5b7a50a7fe197207d5639fe336887c791de961c424e27e21cc44c25e1434bd808c22459940206ec926fdcff28f0c064 SHA512 5eba1eae0ecff1f0655d7dc4dff524557dd8673c4f9093c0b914430b44a7921ffdc4ea2e52fa4cba7a673616aaa4c40e9032c2d95eca65e79d69a8e64f36aa77
-EBUILD akonadi-search-19.04.3.ebuild 1134 BLAKE2B c7a9ddf33beb7bc58628ea35798b1d9554ab28f1d553364d4130e3fbf0ad4d6f482b1f1cf1dd4619cf029dbf7961389a85634c9dc3a9285f4ccd424d0c7cce37 SHA512 3c6637f7ee295eb331e075cc2102a3cf253ec8f2bff538076aa638795908aa27410d982f1c8f06da31259b0fb6fee72eb1309169a55e1b7e836dbfb4b33a0bb6
+EBUILD akonadi-search-19.04.3.ebuild 1131 BLAKE2B e131b048b4e34552c13674e3be728afd78c6c8a747741eea3248d46fb8e66d78766648558cbfa50894b8cb1107d2d0e3196130a35149b8fcb3757bcd7c9c98b0 SHA512 215dc4b854cc2e3ad1f39958f6b83b2500dfe8b5cae8c8570d68af12294b8054409837df8fb589bfb484c626b70708dc0e9e5644e7ada5e0d97594de33d48f5d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild b/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
deleted file mode 100644
index 27bd08a491b0..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-18.12.3-r2.ebuild
+++ /dev/null
@@ -1,47 +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' 18.12.3-r1) )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi '' 18.12.3-r1)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(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' 18.12.3-r1) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.0-cmake.patch" )
diff --git a/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild
index de2275bc353a..b4d2aa564265 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch b/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
deleted file mode 100644
index e6a6bd79d45f..000000000000
--- a/kde-apps/akonadi-search/files/akonadi-search-18.12.0-cmake.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f5af0d46904125f0c4c874b462c9f44d4688a528 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 19 Dec 2018 14:21:13 +0100
-Subject: [PATCH] Use KF5_MIN_VERSION instead of KF5_VERSION
-
-Summary:
-KF5_VERSION is overridden by first KF5 find_package version found result, which may be higher
-than other installed Frameworks versions at the time, leading to cmake error.
-
-Reviewers: #kde_pim, dvratil
-
-Reviewed By: #kde_pim, dvratil
-
-Subscribers: dvratil, kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D17684
----
- CMakeLists.txt | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f54a17f..708a266 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,9 +4,9 @@ set(PIM_VERSION "5.10.0")
- project(AkonadiSearch VERSION ${PIM_VERSION})
- 
- # ECM setup
--set(KF5_VERSION "5.51.0")
-+set(KF5_MIN_VERSION "5.51.0")
- 
--find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
-+find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- 
- include(GenerateExportHeader)
-@@ -39,9 +39,9 @@ set(KMIME_LIB_VERSION "5.10.0")
- set(QT_REQUIRED_VERSION "5.9.0")
- 
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test)
--find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Config Crash KCMUtils)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n Config Crash DBusAddons KCMUtils KIO)
- if (AKONADISEARCH_ENABLE_KRUNNER_RUNNER)
--    find_package(KF5Runner ${KF5_VERSION} REQUIRED)
-+    find_package(KF5Runner ${KF5_MIN_VERSION} REQUIRED)
- endif()
- 
- 
-@@ -57,8 +57,6 @@ find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
- find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
--find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
--find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
- 
- ecm_setup_version(PROJECT
-     VARIABLE_PREFIX AKONADISEARCH
--- 
-2.20.1
-