gentoo resync : 05.12.2021

4 files changed, 34 insertions, 7 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 30b3381ea10b..2d9d0f675553 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,9 +1,10 @@
 AUX kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch 1839 BLAKE2B a09e264a7c6e6bc8bf2ceda44937b8aac7c70a3fc40383dac70a78dcc7126c9387a7bfb478d52f7b2fb8c829b7e996d4336aee27c141ecb229f3f903ff6f37ba SHA512 7b4124d839337074e85fe499eeb1ef6b4290b000be9c180cf7c09432c85bc2a6f931207aa3f3c3cab94d4f877efaf1a73701394c1be3fbf15c9950ed6dffc816
 AUX kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch 1156 BLAKE2B 4a36114a86844b7d5abe0a5ab89ae979b99dda3e2fe307d7887fc66ef31c81da311f708927b2cddf0367ede36e12945ed9eee715178c6fd23abb99a6f47e4109 SHA512 579b74442c0057a5629cc516b5955a9d7b5504727d0eaeb3f5a5eb7ef828f30c2869e286000b492800b9139b602b98293cd3a67e91877993c2ea5deb70f4890a
 AUX kio-5.85.0-revert-to-pre-libblkid-parsing.patch 4908 BLAKE2B 55436d26509966c05d445b3d8041271893be362c928fab4cfe6552995c1325001f072e84a1c2ce6e31c60687e29164c5e732dba2dc9ee3359585f5c1aefbc358 SHA512 eead88e9bf955a22157464b2d16ee9ad90c82e8c88ee454eff2ce5389a71dba3321bae26bcacc5899dd1555d378c6da63829dc5f4f9536b1b75c4f21deabb7cd
+AUX kio-5.88.0-fix-copy-between-filesystems.patch 1094 BLAKE2B 0528d84cd6cb61ee370c9f4c50c48852420a02e403f622742f71920455c8cae90fc05e0026cd59fa0d8ab9a404bc531a80ba47d231fdd273fe89a8d27f10cf4f SHA512 becdf85d9bd9c52c05d5b8b23762fa0ba3794cd617b46fa50643200bbca793a5636275f77d2dcad709f69e34bc8fa1cb6a73998f23bb9591a484b73551ced0e8
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
-DIST kio-5.87.0.tar.xz 3260188 BLAKE2B c9681bd404a3a60eda4d0b5f9b05254cedba2f20a74942314f4462b5306b81d206bac24e8032eab31287c7083e8fafd8db15c2064342feb746abb0629def7041 SHA512 55a3dbdbb2169a1f3b59b6b1857552ef75ff07ffa8dd7871f72aae1c42aa027fdfbbe80e2d7874b3c1914862bd6ff09cdbef3e19766cc7178b642a73e8dc8c19
+DIST kio-5.88.0.tar.xz 3247924 BLAKE2B 3687e97b3c936c93e7ee87f314340f8e9889e2afae584d360eb44414994406a34678ea304fff081a65beb03fa98ec1f22870f3a3f86e124352bc96f51c142c1f SHA512 3d79bc90c2f6aa54080824c15da282f54d18530362ffd144f36754f1751f58c0c48c9fd12ffece49f0b455c524b8585ba6c2baa684b0992471b7ec0636350c19
 EBUILD kio-5.85.0-r1.ebuild 2622 BLAKE2B 326ebbf29032e342e73b733dd721ad5c11902048233ab566a8570b024a580ccd3a26b6ace2838f5f2f9af79241c18d811e1b4ac646b3f4c04fe65f1eb52bfeea SHA512 507a63d154d91561d2e5e7ea08f93536c8c1c8b5b9d722793e53464f2eda089ef0f3db139259c351100fc00edbd8c7b00e39c45c8f41a12f0a394dd7927fa39d
-EBUILD kio-5.85.0-r2.ebuild 2690 BLAKE2B 4eaff9ffea62d5a2a7903f63d8b94de0225229e808b84eee1ad2ae4af409d90185a82422e94577de54f272ea773e1c4a58ed625c1976de7507a61fa12e6102e0 SHA512 85e2cf6a8ffb231a92bd7eaa7f4dffdfed520e1bec56a0fddb37cba87053dee05cdcf218b852c20ca6495896844825e754d4903a776521c37739d061c4195b41
-EBUILD kio-5.87.0-r1.ebuild 2518 BLAKE2B 28c6f435e609adff5fb3b97759d95b50f5d861a334e97ad7a14ed5649d3ee24a3a674fafac8c2eb34b20e821c79f91781b17746624d1dc620dca2ffa86a67f14 SHA512 24bf35fc2fe2336d2d1255dbfc99c9af271d69f3d693934d05948bf7b510236d5b378f32dcdcfc3b0c5fa8379c69414229e10725bacf0be87cda6c2000b2f8fd
+EBUILD kio-5.85.0-r2.ebuild 2688 BLAKE2B 0d526978d9366666662467f681dc56b25c7badf3d1a543f0b556f82e551ed1468f9014535727aabb5575dc76a15925838f0c7d9f2d9d72ccd0e6c638ecaf9f73 SHA512 16ceea38cfd4480c7c67342cae557f350bf45c8fd20cd361f70952dcc3c9ff8e4a3ae33b1e107735150628c640e9ddf875b8cb8aaa48a51188018ab905833e24
+EBUILD kio-5.88.0-r1.ebuild 2478 BLAKE2B 0cd43ec5c67b133331e34892e71c8d07fc9a354c091f99d0f86ed0c24ba3133e5ca054dc434584e6f1b0ab2d346044ca5582ba76f4cb2ea063f91d82597797c0 SHA512 4286305457b80b13654bc9ec6d154e5993f0210ace0bb96e586d55611cd58492826ebb188ef186d91921b130c16c9195c49407265882a914480d44152e418913
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
new file mode 100644
index 000000000000..a6a4877cf0f4
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.88.0-fix-copy-between-filesystems.patch
@@ -0,0 +1,28 @@
+From aef544ebbb11e842209f3b071eaa9d1c2f26fa40 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Wed, 17 Nov 2021 23:45:17 +0100
+Subject: [PATCH] Fix copying between different filesystems on Linux < 5.3
+
+From the copy_file_range manpage
+
+EXDEV  The files referred to by fd_in and fd_out are not on the same mounted filesystem (pre Linux 5.3).
+---
+ src/ioslaves/file/file_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
+index b4eca2ae9..02b5dc14c 100644
+--- a/src/ioslaves/file/file_unix.cpp
++++ b/src/ioslaves/file/file_unix.cpp
+@@ -813,7 +813,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
+         const ssize_t copiedBytes = ::copy_file_range(srcFile.handle(), nullptr, destFile.handle(), nullptr, s_maxIPCSize, 0);
+ 
+         if (copiedBytes == -1) {
+-            if (errno == EINVAL) {
++            if (errno == EINVAL || errno == EXDEV) {
+                 break; // will continue with next copy mechanism
+             }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.85.0-r2.ebuild b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
index ad40012c385b..8eb655b88799 100644
--- a/kde-frameworks/kio/kio-5.85.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-frameworks/kio/kio-5.87.0-r1.ebuild b/kde-frameworks/kio/kio-5.88.0-r1.ebuild
index d33ade8d2205..dcc6a8a9819b 100644
--- a/kde-frameworks/kio/kio-5.87.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.88.0-r1.ebuild
@@ -70,9 +70,7 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.85.0-revert-to-pre-libblkid-parsing.patch # bug 821103, KDE-bug 442106
-)
+PATCHES=( "${FILESDIR}"/${P}-fix-copy-between-filesystems.patch )
 
 src_configure() {
 	local mycmakeargs=(