gentoo resync : 15.06.2021

4 files changed, 5 insertions, 51 deletions

diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 9b8c459de187..24df4a92f957 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,6 +1,5 @@
-AUX baloo-5.80.0-update-filename-terms-moving-file.patch 1187 BLAKE2B 9cd26aa380582da48d226c2d328ead1300776219868de7669d2761a94292bbe05f7fd7784f16a85520ccccd87a5f937b99ac7a59adc5042882d4b60f869232fa SHA512 0fa7ad005485a444a381742d946e72ffabb3375d41333f26389b9f70080a08594a54209562620e7530806e4687f4d4debc8e7d57ab3a2875bb93eccf3ea42e9d
-DIST baloo-5.80.0.tar.xz 288452 BLAKE2B 0de1a6d356438b18845df034f3e6a7d891b9c4ac988a7b8075702d0e669c46aad87bf094a13172e56d5e3992e06e37eb231357a64a99e7a8af0db4bf335500c9 SHA512 e7431f78609d42de61a23478067f28168cd3e2a032543fd3d4d5fc444396d73a0d9f67b39d4602d80bad814d6e1af071327261b8b22cb5d9966a375d328b3759
 DIST baloo-5.82.0.tar.xz 291468 BLAKE2B abf25e14f5cca320c89a909bf4fe1d483b7e4ba1b77bce8ac12152b242af28a525179605078ed11f4c4f3e5abea338dfb510992d02748bf9a746eade1d1c7160 SHA512 aed73f3c67f3c7331706fa121c0fbc062b4619adf8ebe65fdb4edbd033f6c4bdaca17f8c00fc3eb3f4159af1cd5bf89c144bbf87d87e9ef60d5b682dabe059db
-EBUILD baloo-5.80.0-r1.ebuild 981 BLAKE2B 6caf21d48d47f57380e4c1da6c3a5914ee7a4c98a3802a7404a6509866ee4266ceb3fc1054dd85b47fd88af680efc16800c6dac8ebbe0d0579f98d0904a1682a SHA512 dd723c57f18201bc28b3bae3f62ddc2fd78b7631895bf2ac6e39cb54715590103804c3ff1d945e3ba7fb9a9d3d3712e3a13b6fbd71f7de677bb569b5d9913eaf
-EBUILD baloo-5.82.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
+DIST baloo-5.83.0.tar.xz 280700 BLAKE2B 71d4fa0e1260317cd382639c1b7d58a296867a2c9e7462ac339f808eff0ea544334120bc355d1146076e151bd4f1a472caf172e22ec2029606c8678433c50b47 SHA512 4cc7a46d0c298455cbae37189da2b107f8d6aba4e5790d3b217251d6873bc295481b6fa7890b38c118e40705abf0611f4ec9716cc2b81eb2d397ad850c156822
+EBUILD baloo-5.82.0.ebuild 890 BLAKE2B 62db950b70933b74eb5580d0b3ecff4f7abc9411f3c5d835ae0055ef61a2b2c9c0c26958788ee834359520c068a95d0fd2e07a824852b62798adec0028c55f2c SHA512 31f145bf2ef03289eb9c6db7109114e06a82c9f1f43e468db0f5bd1f70a6ee069ed9acda85c2ab7bc6184d701c2588310776e7e2f0e0c042aca1c58c3af4ce3c
+EBUILD baloo-5.83.0.ebuild 893 BLAKE2B 9ddc845ba9f79d9ead827ff7b10d4bdbc0ff851a05b02213b491b49af10b3c5f9af55b51b343436ad19ee81878b029d259760874dd46abc74535151cc44e8f30 SHA512 d9aa61fd813ae8ccea4a68aec037246dc6e309e869b79fb9feb3219911057dd1f65e51ec15ec6188cde5a081c1b173c05608f6d4265c0c5fbdcc6e43411b22d3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.82.0.ebuild b/kde-frameworks/baloo/baloo-5.82.0.ebuild
index 245f2f64562f..abf1a63e7684 100644
--- a/kde-frameworks/baloo/baloo-5.82.0.ebuild
+++ b/kde-frameworks/baloo/baloo-5.82.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=""
 
 RESTRICT+=" test" # bug 624250
diff --git a/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild b/kde-frameworks/baloo/baloo-5.83.0.ebuild
index c98a88a85959..245f2f64562f 100644
--- a/kde-frameworks/baloo/baloo-5.80.0-r1.ebuild
+++ b/kde-frameworks/baloo/baloo-5.83.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=""
 
 RESTRICT+=" test" # bug 624250
@@ -33,7 +33,3 @@ DEPEND="
 	=kde-frameworks/solid-${PVCUT}*:5
 "
 RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-update-filename-terms-moving-file.patch" # KDE-bug #433116
-)
diff --git a/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch b/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch
deleted file mode 100644
index a5ba6232d260..000000000000
--- a/kde-frameworks/baloo/files/baloo-5.80.0-update-filename-terms-moving-file.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f6a7845b8f3cd3188053ba58f9fe7053558aec86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sat, 27 Mar 2021 13:32:55 +0100
-Subject: [PATCH] [MetadataMover] Update filename terms when moving/renaming
- file
-
-After the removal of BasicIndexingJob::index() (bd1041ea2826e295 "Make
-renames a DB only operation") the filename terms where left empty.
-
-BUG: 433116
----
- src/file/metadatamover.cpp                | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/file/metadatamover.cpp b/src/file/metadatamover.cpp
-index 70ca9822..2bff5a2e 100644
---- a/src/file/metadatamover.cpp
-+++ b/src/file/metadatamover.cpp
-@@ -8,6 +8,7 @@
- 
- #include "metadatamover.h"
- #include "database.h"
-+#include "termgenerator.h"
- #include "transaction.h"
- #include "baloodebug.h"
- 
-@@ -99,6 +100,11 @@ void MetadataMover::updateMetadata(Transaction* tr, const QString& from, const Q
-     }
- 
-     Document doc;
-+
-+    const QByteArray fileName = toPath.mid(lastSlash + 1);
-+    TermGenerator tg(doc);
-+    tg.indexFileNameText(QFile::decodeName(fileName));
-+
-     doc.setId(id);
-     doc.setParentId(parentId);
-     doc.setUrl(toPath);
--- 
-GitLab
-