gentoo resync : 25.08.2020

6 files changed, 31 insertions, 223 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 7735eaecd378..08d5c28019dc 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,7 +1,5 @@
-AUX kio-extras-19.12.3-CVE-2020-12755.patch 973 BLAKE2B 3d82cb6c5ed37067f518fb568fe2c4f35148056ef4fd1db0d47377bc7d8cb29bb48e4f5fb8683535469f9327b95ee2790ef4a30f494cb7e30a3eb346da0eba72 SHA512 776ea79e81c7b4c1b0da983261f751503dbdcf034e91e4f2a49dee5dfea0e3d557cae439efba4ac1f5e7b8ce161f17384dafd51e9aecde28e7404da9cd664187
-AUX kio-extras-19.12.3-kio_nfs.patch 6433 BLAKE2B 66358b2cd0953b8a46492a7f0f7c03b249a25de678c92a7450fdb23098d4c9e483a01690071e54ddf00dd4c982eb00429f3139cdf6624ea4f57b2491420b7a93 SHA512 9eb757d42412193c9ea96f608289a58505bfd385b641c2c0061316063587cda8ec7479e27e63fccac6d60bc2427b7a6cb55ac0e336e214d28d41c466c093431a
-DIST kio-extras-19.12.3.tar.xz 581020 BLAKE2B b4f9ca0812d535222c1a156ef2ce056df95dfab0786b108418fc98da860617c272ffaab044d0faf8559dee04d8bbc799da6eb004bea170c41a1b3bd30e91a40f SHA512 289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7
-DIST kio-extras-20.04.2.tar.xz 618236 BLAKE2B 9e42bd1dab0e7e2258cb5b68f7debfb1e4c8fa362a12ca2e8799b67dc54a47a91b5a0c9a9dd2885442145a10ddf00d7c19fddbc4fcd56300e11d1fcefdb53c13 SHA512 50c895f678ca4b8b7b60e1b7dd4821fc5e665159a0b48cf5d1fbccef8ef83ef129e08cb0792cf2d4b243ccff021269ed47b9bfa4c4f8628cfa424a06071e16a1
-EBUILD kio-extras-19.12.3-r2.ebuild 2533 BLAKE2B 4f308f8173433ae81f3c0c6668ce9af4d397d8ca6988be2b07fdafb11538eeebf509e41b5d157dc83b2f4f77683ed29b89466900cf75a5a85252677b430562e8 SHA512 be8c9a1e623fb1c5a97d7cc4706a9b68837396590a4dc58372a0b6c23f7d99ca10d35a3c7d32f9953a35edc8415be03156743f15c9e55ed45996e1d87c203a77
-EBUILD kio-extras-20.04.2.ebuild 2650 BLAKE2B fbcc42276dc21eaad8087db6079acc93d6370c0802b7daeb84c202903f8e76cd103111d9d1af0eeba324bdcead546a17cf6dbab88eb998667d08ca299288260e SHA512 db1b1df43eb01034dcab3042ae4b83f7bd6f86d8cc1d59e9d4fbe9a9079d250b3f83af9253c83922f4e7d18ae568f103ba39173c8125c8d8208f8931739e0c2d
-MISC metadata.xml 747 BLAKE2B 8972b1b4e04ad771c76e465c066d261cf237c36b9a80ede31a70d7b6af2f91d8c99a108f18c13fafa6b6d5714d8fb2270f85f63706f355c1481a1fd84ecd1562 SHA512 3fd163a8b2861213b00eb84773aeaff95bb5abf40dd20228dc519ea78ef50cd6536c9d6c7d3ef607586765001e90925265e7cfbf763d13cb17c2becaf3a993e9
+DIST kio-extras-20.04.3.tar.xz 618056 BLAKE2B 35f0760948634407e02193ffcdd60176153e37ead99545a39bb777bda600f5685c3ed3bd76aeabc2620ba5ddc11aa094aeaf25c896150acb8da53e894c78e6dc SHA512 25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3
+DIST kio-extras-20.08.0.tar.xz 629824 BLAKE2B 781599986faed29a8ac3f8c2bc9b0f49b3faf7c1b71ce1c12c0b556e78aade6ae59c7de19910987f511436f6cc09864ee7ae60195521a0938ca732ccebdf60b3 SHA512 2d31becceacb3f377754aee44297b9975fea26c5cc2470e08acc99ba5546703cbe37d9a33fc87789904922161e48eb72e66d526fa24f5fa84c84747888fa7aad
+EBUILD kio-extras-20.04.3.ebuild 2652 BLAKE2B 7fcbd1918df53e92753b3878f44e204171a02a81256cfb7b68d7f8e24be8a1164e1af282a0d8ba6a3a40bfb9334de015cd48d1f991c8196b99c8fb347430b7d6 SHA512 380e389416c7e167258e3ad418998e67f32ca9f6861c8449f633ca34760ad7c6f4a48650712260c80effb8650a0105fa37813c5a4a70554e725488af7b92b793
+EBUILD kio-extras-20.08.0.ebuild 2655 BLAKE2B 17cea27d3ec1c929062c8dd2f64da7495fee871f45a1f0e9faacbaa7000b298f2b3cc403fd045ee4e251a148008d72e26e0481c3725b948738e3ef8b35f82edc SHA512 49c9dfae7bd55c9f7d17e80865f3610e5a08505e085ccf289212e351eee53b64fd61f46b5b998da215efba95981c16749c3bb0620ae4411eeae0ce265d86b6b0
+MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
deleted file mode 100644
index 188eb28f1043..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-19.12.3-CVE-2020-12755.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d813cef3cecdec9af1532a40d677a203ff979145 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sat, 9 May 2020 11:20:48 +0200
-Subject: Only store password in KWallet if the user asked for it
-
----
- fish/fish.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fish/fish.cpp b/fish/fish.cpp
-index a18ef34..ccd71d3 100644
---- a/fish/fish.cpp
-+++ b/fish/fish.cpp
-@@ -595,7 +595,9 @@ int fishProtocol::establishConnection(const QByteArray &buffer) {
-             infoMessage(i18n("Initiating protocol..."));
-             if (!connectionAuth.password.isEmpty()) {
-                 connectionAuth.password = connectionAuth.password.left(connectionAuth.password.length()-1);
--                cacheAuthentication(connectionAuth);
-+                if (connectionAuth.keepPassword) {
-+                    cacheAuthentication(connectionAuth);
-+                }
-             }
-             isLoggedIn = true;
-             return 0;
--- 
-cgit v1.1
diff --git a/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch b/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
deleted file mode 100644
index 4bdf9af413a7..000000000000
--- a/kde-apps/kio-extras/files/kio-extras-19.12.3-kio_nfs.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From a0a7ccb17fbb702ebc9122015f40fa9b112cedc6 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Tue, 27 Nov 2018 23:37:13 +0100
-Subject: [PATCH 1/2] Add FindTIRPC.cmake
-
-Taken from https://phabricator.kde.org/D12761
----
- cmake/FindTIRPC.cmake | 60 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 60 insertions(+)
- create mode 100644 cmake/FindTIRPC.cmake
-
-diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake
-new file mode 100644
-index 00000000..20e78f9f
---- /dev/null
-+++ b/cmake/FindTIRPC.cmake
-@@ -0,0 +1,60 @@
-+# - Try to find TI-RPC
-+#
-+# The following variables will be available once found :
-+#
-+# TIRPC_INCLUDE_DIRS - The TI-RPC headers location
-+# TIRPC_LIBRARIES - Link these to use TI-RPC
-+# TIRPC_VERSION - The TIRPC version
-+#
-+#=============================================================================
-+# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_TIRPC libtirpc)
-+
-+find_path(TIRPC_INCLUDE_DIRS
-+  NAMES netconfig.h
-+  PATH_SUFFIXES tirpc
-+  HINTS ${PC_TIRPC_INCLUDE_DIRS}
-+)
-+
-+find_library(TIRPC_LIBRARIES
-+  NAMES tirpc
-+  HINTS ${PC_TIRPC_LIBRARY_DIRS}
-+)
-+
-+set(TIRPC_VERSION ${PC_TIRPC_VERSION})
-+
-+include(FindPackageHandleStandardArgs)
-+
-+find_package_handle_standard_args(TIRPC
-+      REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS
-+      VERSION_VAR TIRPC_VERSION
-+)
-+
-+mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES)
--- 
-2.25.1
-
-
-From 7cd0142ada663ac1bfcf4926f80f7ac53ccfb37c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 27 Nov 2018 23:43:18 +0100
-Subject: [PATCH 2/2] Build kio_nfs against standalone libtirpc
-
-Summary:
-Since glibc-2.26, cmake skipped over nfs when standalone tirpc
-was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...)
-
-Use FindTIRPC and make kio_nfs optional that way
-FindTIRPC taken from https://phabricator.kde.org/D12761
-
-Test Plan: Built with libtirpc successfully.
-
-Reviewers: #dolphin, dfaure, rdieter, sitter
-
-Subscribers: kde-frameworks-devel, cgiboudeaux, arojas, kfm-devel, meven
-
-Tags: #dolphin, #frameworks
-
-Differential Revision: https://phabricator.kde.org/D17205
----
- CMakeLists.txt     |  9 ++++++---
- nfs/CMakeLists.txt | 15 +++++++++------
- 2 files changed, 15 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 347caaad..37d56b3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -134,6 +134,11 @@ if(UNIX)
-     set_package_properties(Gperf PROPERTIES TYPE OPTIONAL
-                            PURPOSE "Needed to build the man kioslave"
-                            )
-+
-+    find_package(TIRPC)
-+    set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL
-+                           PURPOSE "Needed to build the NFS kioslave"
-+                           )
- else()
-     # FIXME: on windows we ignore support until trash gets integrated
- endif()
-@@ -178,9 +183,7 @@ if(NOT WIN32)
-    if(Gperf_FOUND)
-      add_subdirectory( man )
-    endif()
--   check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
--   add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
--   if(HAVE_RPC_RPC_H)
-+   if(TIRPC_FOUND)
-      add_subdirectory( nfs )
-    endif()
- endif()
-diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt
-index 6436e0d1..7189b25a 100644
---- a/nfs/CMakeLists.txt
-+++ b/nfs/CMakeLists.txt
-@@ -1,10 +1,12 @@
- ## Check for XDR functions
--include(CheckFunctionExists)
-+include(CheckCXXSymbolExists)
- 
--CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T)
--CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T)
--CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER)
--CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T)
-+set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES})
-+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS})
-+check_cxx_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T)
-+check_cxx_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T)
-+check_cxx_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER)
-+check_cxx_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T)
- 
- if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T)
-     message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!")
-@@ -24,9 +26,10 @@ if (HAVE_XDR_U_LONGLONG_T)
- endif (HAVE_XDR_U_LONGLONG_T)
- 
- add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\")
-+include_directories(${TIRPC_INCLUDE_DIRS})
- 
- add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c)
--target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network)
-+target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES})
- set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs")
- 
- install(TARGETS kio_nfs DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
--- 
-2.25.1
-
diff --git a/kde-apps/kio-extras/kio-extras-20.04.2.ebuild b/kde-apps/kio-extras/kio-extras-20.04.3.ebuild
index 2c57fbc54160..2e9a67fd0dfe 100644
--- a/kde-apps/kio-extras/kio-extras-20.04.2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.04.3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
 KFMIN=5.70.0
-QTMIN=5.14.1
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 BDEPEND="
diff --git a/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild b/kde-apps/kio-extras/kio-extras-20.08.0.ebuild
index d217f1c9cabf..2941215d16cd 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.08.0.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,13 +15,19 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 BDEPEND="
 	man? ( dev-util/gperf )
 "
 DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
@@ -40,24 +46,25 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
 		>=kde-frameworks/kactivities-${KFMIN}:5
 		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-		>=dev-qt/qtsql-${QTMIN}:5
 	)
 	mtp? ( >=media-libs/libmtp-1.1.16:= )
 	nfs? ( net-libs/libtirpc:= )
 	openexr? ( media-libs/openexr:= )
 	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
+	samba? (
+		net-fs/samba[client]
+		net-libs/kdsoap-ws-discovery-client
+	)
 	sftp? ( net-libs/libssh:=[sftp] )
 	taglib? ( >=media-libs/taglib-1.11.1 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+	)
 "
 RDEPEND="${DEPEND}
 	>=kde-frameworks/kded-${KFMIN}:5
@@ -66,11 +73,6 @@ RDEPEND="${DEPEND}
 # requires running kde environment
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-kio_nfs.patch"
-	"${FILESDIR}/${P}-CVE-2020-12755.patch" # bug 722152
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
@@ -83,6 +85,10 @@ src_configure() {
 		$(cmake_use_find_package samba Samba)
 		$(cmake_use_find_package sftp libssh)
 		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package X X11)
+	)
+	use samba && mycmakeargs+=(
+		-DBUILD_KDSoapWSDiscoveryClient=OFF # disable bundled stuff
 	)
 
 	ecm_src_configure
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index 5a7f243d3802..a938f1e44e6d 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -12,5 +12,6 @@
 		<flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
 		<flag name="taglib">Enable audio thumbnails via <pkg>media-libs/taglib</pkg></flag>
+		<flag name="X">Enable support for XCursor thumbnails via <pkg>x11-libs/libX11</pkg></flag>
 	</use>
 </pkgmetadata>