gentoo resync : 13.11.2021

4 files changed, 235 insertions, 2 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 63ceec65f69f..30b3381ea10b 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,9 @@
 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
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
 DIST kio-5.87.0.tar.xz 3260188 BLAKE2B c9681bd404a3a60eda4d0b5f9b05254cedba2f20a74942314f4462b5306b81d206bac24e8032eab31287c7083e8fafd8db15c2064342feb746abb0629def7041 SHA512 55a3dbdbb2169a1f3b59b6b1857552ef75ff07ffa8dd7871f72aae1c42aa027fdfbbe80e2d7874b3c1914862bd6ff09cdbef3e19766cc7178b642a73e8dc8c19
 EBUILD kio-5.85.0-r1.ebuild 2622 BLAKE2B 326ebbf29032e342e73b733dd721ad5c11902048233ab566a8570b024a580ccd3a26b6ace2838f5f2f9af79241c18d811e1b4ac646b3f4c04fe65f1eb52bfeea SHA512 507a63d154d91561d2e5e7ea08f93536c8c1c8b5b9d722793e53464f2eda089ef0f3db139259c351100fc00edbd8c7b00e39c45c8f41a12f0a394dd7927fa39d
-EBUILD kio-5.87.0.ebuild 2432 BLAKE2B 942486a3eff422422b18101539bd78a903d004975ebc63428b2b6542f9f26c3e27c63e36f3c21aefa27e0e6aab985e168c30435b38581889410a12ed1fd7cad0 SHA512 094f60150e13476b1d0efe5fcd93f82282232d58c7b98dcdaa7ebba22a90989468836f9de540694c4ad04f5d420944af88ef39a397528745a374d0a8134ebf89
+EBUILD kio-5.85.0-r2.ebuild 2690 BLAKE2B 4eaff9ffea62d5a2a7903f63d8b94de0225229e808b84eee1ad2ae4af409d90185a82422e94577de54f272ea773e1c4a58ed625c1976de7507a61fa12e6102e0 SHA512 85e2cf6a8ffb231a92bd7eaa7f4dffdfed520e1bec56a0fddb37cba87053dee05cdcf218b852c20ca6495896844825e754d4903a776521c37739d061c4195b41
+EBUILD kio-5.87.0-r1.ebuild 2518 BLAKE2B 28c6f435e609adff5fb3b97759d95b50f5d861a334e97ad7a14ed5649d3ee24a3a674fafac8c2eb34b20e821c79f91781b17746624d1dc620dca2ffa86a67f14 SHA512 24bf35fc2fe2336d2d1255dbfc99c9af271d69f3d693934d05948bf7b510236d5b378f32dcdcfc3b0c5fa8379c69414229e10725bacf0be87cda6c2000b2f8fd
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
new file mode 100644
index 000000000000..1f4c7cf06157
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
@@ -0,0 +1,128 @@
+From 221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Wed, 20 Oct 2021 20:01:40 +0200
+Subject: [PATCH] KMountPoint: revert to parsing /dev/disk/by-{uuid,label}/
+ manually
+
+Apparently libblkid is causing some performance issues when resolving
+UUID/LABEL tags from fstab when the device that has that UUID/LABEL isn't
+present.
+
+Parsing /dev/disk/by-* is more basic, since it's a simple check resolving
+some symlinks.
+
+Thanks to the users in the bug report for the investigative work, because
+personally I couldn't reproduce the problem on my machine no matter what I
+tried.
+
+BUG: 442106
+FIXED-IN: 5.88
+---
+ CMakeLists.txt                      |  3 +--
+ src/core/CMakeLists.txt             |  5 ++---
+ src/core/config-kmountpoint.h.cmake |  2 +-
+ src/core/kmountpoint.cpp            | 18 ++++--------------
+ 4 files changed, 8 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca374a4cb..f1bb1a59b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL"
+ # Used by KMountPoint
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+     find_package(LibMount REQUIRED)
+-    find_package(Blkid REQUIRED)
+-    set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND})
++    set(HAVE_LIB_MOUNT ${LibMount_FOUND})
+ endif()
+ 
+ if (ANDROID)
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index be19e9b62..67a1b1cf7 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -236,9 +236,8 @@ if(ACL_FOUND)
+   target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
+ endif()
+ 
+-if(HAVE_LIBS_MOUNT_AND_BLKID)
+-  # libmount links against blkid anyway
+-  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid)
++if(HAVE_LIB_MOUNT)
++  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount)
+ endif()
+ 
+ # this should be done by cmake, see bug 371721
+diff --git a/src/core/config-kmountpoint.h.cmake b/src/core/config-kmountpoint.h.cmake
+index f824d4042..3673eb141 100644
+--- a/src/core/config-kmountpoint.h.cmake
++++ b/src/core/config-kmountpoint.h.cmake
+@@ -1,7 +1,7 @@
+ #cmakedefine01 HAVE_GETMNTINFO
+ #cmakedefine01 GETMNTINFO_USES_STATVFS
+ 
+-#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID
++#cmakedefine01 HAVE_LIB_MOUNT
+ 
+ #cmakedefine01 HAVE_SYS_MOUNT_H
+ #cmakedefine01 HAVE_FSTAB_H
+diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
+index e2d32055c..f41cff5ee 100644
+--- a/src/core/kmountpoint.cpp
++++ b/src/core/kmountpoint.cpp
+@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive;
+ #endif
+ 
+ // Linux
+-#if HAVE_LIBS_MOUNT_AND_BLKID
++#if HAVE_LIB_MOUNT
+ #include <libmount/libmount.h>
+ #include <blkid/blkid.h>
+ #endif
+@@ -176,7 +176,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
+ #ifdef Q_OS_WIN
+     result = KMountPoint::currentMountPoints(infoNeeded);
+ 
+-#elif HAVE_LIBS_MOUNT_AND_BLKID
++#elif HAVE_LIB_MOUNT
+     if (struct libmnt_table *table = mnt_new_table()) {
+         // By default parses "/etc/fstab"
+         if (mnt_table_parse_fstab(table, nullptr) == 0) {
+@@ -202,23 +202,13 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
+                 // or some network mount
+                 if (const char *source = mnt_fs_get_source(fs)) {
+                     mp->d->m_mountedFrom = QFile::decodeName(source);
+-                    if (mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) {
+-                        // Use blkid to resolve UUID/LABEL to the device file
+-                        if (char *blkSource = blkid_evaluate_spec(source, nullptr)) {
+-                            mp->d->m_mountedFrom = QFile::decodeName(blkSource);
+-                            free(blkSource);
+-                            if ((infoNeeded & KMountPoint::NeedRealDeviceName) //
+-                                && mp->d->m_mountedFrom.startsWith(QLatin1String("/dev/"))) {
+-                                mp->d->m_device = mp->d->m_mountedFrom;
+-                            }
+-                        }
+-                    }
+                 }
+ 
+                 if (infoNeeded & NeedMountOptions) {
+                     mp->d->m_mountOptions = QFile::decodeName(mnt_fs_get_options(fs)).split(QLatin1Char(','));
+                 }
+ 
++                mp->d->finalizePossibleMountPoint(infoNeeded);
+                 result.append(mp);
+             }
+             mnt_free_iter(itr);
+@@ -351,7 +341,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded)
+         }
+     }
+ 
+-#elif HAVE_LIBS_MOUNT_AND_BLKID
++#elif HAVE_LIB_MOUNT
+     if (struct libmnt_table *table = mnt_new_table()) {
+         // By default, parses "/proc/self/mountinfo"
+         if (mnt_table_parse_mtab(table, nullptr) == 0) {
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.85.0-r2.ebuild b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
new file mode 100644
index 000000000000..ad40012c385b
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/kguiaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
+	"${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613
+	"${FILESDIR}"/${P}-revert-to-pre-libblkid-parsing.patch # bug 821103, KDE-bug 442106
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/kio-5.87.0.ebuild b/kde-frameworks/kio/kio-5.87.0-r1.ebuild
index 6c1d184379bd..d33ade8d2205 100644
--- a/kde-frameworks/kio/kio-5.87.0.ebuild
+++ b/kde-frameworks/kio/kio-5.87.0-r1.ebuild
@@ -50,7 +50,6 @@ RDEPEND="
 	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
 	=kde-frameworks/solid-${PVCUT}*:5
-	sys-apps/util-linux
 	acl? (
 		sys-apps/attr
 		virtual/acl
@@ -71,6 +70,10 @@ 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
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DKIO_NO_PUBLIC_QTCONCURRENT=ON