gentoo resync : 13.06.2020

4 files changed, 2 insertions, 79 deletions

diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index d82bb4d49c8e..b830c025c2bc 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,6 +1,3 @@
-AUX baloo-5.67.0-sync-IndexerConfig-on-exit.patch 843 BLAKE2B 471e15932172e6cbfe7d3d7e85b51f0e4cf24dfa0e26dc54af493e6b5c7ccde57fc5f43f37955202c8faaf9eef1d1dbaba02af2a23d9b325358f806e1b9537dd SHA512 6cec3aa43a5c46baee3899787b11019952ee3590a94f760ed31670fee23097aff4c38bd611a7bfa8547d37c97dd1b4969c1e906d355cdb49cd6c4657de36c60e
-DIST baloo-5.67.0.tar.xz 273900 BLAKE2B 059ae680e887b5fcdbeb6d68c6760f035660919d727f2d46cf838e6426b0f83625faecbc754518e6968262ef3efb2fb9ea9852ab652e0d80629de9dc59db781f SHA512 065fb29c86e29a848c0bcac68851eb6b02b46e9f32269175a6d8cae80325dc619e020ac1c1f564998381a678d8918c1d7ddb81697e475663816eecb127831d5c
 DIST baloo-5.70.0.tar.xz 273108 BLAKE2B 9ece044d50462f19b4c27543f5e108c80031dd9d1782ebfbf46c7b71ce9e96e0160adb5b072afbff239e5a43fb04a33905c906a3f6784bd87274cd0982cb42d1 SHA512 9d2455c29f7f5609897d06271a62c285e03370fdb8d842be252953f8b1644351b6bf8f5dc2f685bfa1cab9ed494747b59eccfd4f0f616625822c72e97692a390
-EBUILD baloo-5.67.0-r1.ebuild 955 BLAKE2B 864de0f57b5f84a49571a8a49d2eff68fa31a72b5b0919f634ab116da5d46952cf77541060ded68367f007c089d393c6d0282be8f3e90d3235fbeaa2252709d7 SHA512 16c0e065b5c0b6e378703076e21242c04bbdb17cafc7cf0905fe424673030aebb0e3df48eda3998a03f969e71b9ef4e6138a3d8fa4b91f60e0fb2750c9abb4e3
-EBUILD baloo-5.70.0.ebuild 893 BLAKE2B 9ae3e14cea0e79e92f6aea5bd04dcfd00068b866351f0aa09cb1ae64f8359e67341935e6dc330385df0338073ac6e84072187dbd2675ca85c2c3a1fcc664d475 SHA512 9bf12a1bf1b7ed19795e401633443cb77a9376b534cceb022441d11956e92e56b32e52f8f7a6904b7a6d8af4cc47deb25f37289ec8b8dbbbfe87e84d1bb9be19
+EBUILD baloo-5.70.0.ebuild 890 BLAKE2B 7399d3641680ae22b358d43abbf4a52b710f680aa4e160d001b6080852bd05432e193394e9a42f59a71d19ad38789bd918e07bbfd5185f75daa939de54d73395 SHA512 b20798207d159bf16bb33509348be4877b8306c2e868f3baa27a3ce9f7d6c70756bf918d8fbd7b08d27715ea5d0b9ec6e421cce8d1fc2364151597ec701f2abf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
deleted file mode 100644
index 1e140d9e7e35..000000000000
--- a/kde-frameworks/baloo/baloo-5.67.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for searching and managing metadata"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-db/lmdb-0.9.17
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kfilemetadata-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kidletime-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 624250
-
-PATCHES=( "${FILESDIR}/${P}-sync-IndexerConfig-on-exit.patch" )
diff --git a/kde-frameworks/baloo/baloo-5.70.0.ebuild b/kde-frameworks/baloo/baloo-5.70.0.ebuild
index ba93e6eb57ef..d1c33b4d7e20 100644
--- a/kde-frameworks/baloo/baloo-5.70.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.70.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework for searching and managing metadata"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch b/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch
deleted file mode 100644
index d18b7e2a1694..000000000000
--- a/kde-frameworks/baloo/files/baloo-5.67.0-sync-IndexerConfig-on-exit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a0f8e748159b6bc0b8e5eaa1f9eb58a18ca736fa Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Thu, 13 Feb 2020 16:52:40 +0000
-Subject: Sync IndexerConfig on exit
-
-Summary:
-KCoreConfigSkeleton, unlike KConfig does not automagically save on exit.
-
-BUG: 417127
-
-Test Plan:
-balooctl disable
-balooctl enable
-
-Subscribers: kde-frameworks-devel, #baloo
-
-Tags: #frameworks, #baloo
-
-Differential Revision: https://phabricator.kde.org/D27376
----
- src/lib/indexerconfig.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/indexerconfig.cpp b/src/lib/indexerconfig.cpp
-index 66786b9..19ae342 100644
---- a/src/lib/indexerconfig.cpp
-+++ b/src/lib/indexerconfig.cpp
-@@ -43,6 +43,7 @@ IndexerConfig::IndexerConfig()
- 
- IndexerConfig::~IndexerConfig()
- {
-+    d->m_settings.save();
-     delete d;
- }
- 
--- 
-cgit v1.1