gentoo resync : 15.01.2020

7 files changed, 218 insertions, 88 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index b75922d44c08..4c4823b94997 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,5 +1,8 @@
+AUX kio-5.64.0-fix-ftp-proxy-settings.patch 1328 BLAKE2B e98d9be736b6f2df4928e113533d5894858cb174456407dafab00fd496379f8f223b028beeea0ff37afbac0c676ee6ac78717a48d27bde73bbd7396c8fd9b796 SHA512 44aeb4f6edfa1aa95157cd1596bfac5aa920d66619de1976f22c4fcf214b2ee5fe5856e28fe9d8c1c4a7036d7aa00bc2e1f7217a0395ee25fd9c1e11c7132389
+AUX kio-5.64.0-fix-http-proxy-settings.patch 1357 BLAKE2B 06d2a706dc71eb4febf5577b9243ac21636b55e28f0952208a1fd65189629fbff9fdd45dddba7b003b453510e54623670dd8a344ddc34c6f31a96fe44d6a453a SHA512 931b3bdc63409c997c945c98376152fe397835eda98cb5c312feaeead8136092e73b3ebb22cd054169a9214bbc85f0c6d27adb5a7b70fb47d051165b4f549678
+AUX kio-5.64.0-fix-no-proxy-settings.patch 1722 BLAKE2B 884221f34e9370889e4ca3076fbe824e87eb6801b9463b534856b7b9cb5087b1de1073013d6c9185e6de7a5d4a852a7a6a6ac5f7cca1ef91809947228df54150 SHA512 568169ac2f34114f85ceadbab8a010f4cbbdee790e17132808cb9fa1fc7a3525a545ec47ff242ba29f5f088c33cbf4cbaa22c9e9585a21866ad5820dbe517102
 DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652
-DIST kio-5.65.0.tar.xz 3191312 BLAKE2B 7fb70da6d662311b951c2b9ec7c655227ba021902fa51f4531765e66beb9ee42864a6ebfa935b04d4350944fb59b94ca5838489b91b5709a51f0e66ab06abaa4 SHA512 e8e758595c0ab7457798d69b0a4adc5749169122c3a82fee6083ecc1cac1bf75e343dc74e5b2e34c633d2d9d2b9d2a2705f1c3e86ce8e6c26a7ab589bd76116a
-EBUILD kio-5.64.0.ebuild 2214 BLAKE2B e8f421f3d461b92c72e9dec589a21a2b1aaa32ccdf648623c3a4e1c40fcda963b435d5c85e1f114200eb0c4eabac04963e3575dd8602555083319c98f28be863 SHA512 5fd9a0eaeea477947cca3d15c940490ca774b64ca345ec8bfeb0df76438fed65ed8b1533e18d533b1c186f6a9cdae60e875692665c823d37efecebfa0f3c50b6
-EBUILD kio-5.65.0.ebuild 2187 BLAKE2B 45c347cdcdd2a39f5b862e7e84a6eead85bf41daa6cf0a281aa5bd8c515fedf3c6822d2490c7c9991712615ffd47bd5f28d73c240905826c08ee6804a5f97254 SHA512 3b134591f6ae35ca5c91f75ba654f5fa9cd8a6ed50330115320431fb96d556e82ddd6f53f8dc4f0cfd9b866b15b04644735ebcb4d91fa64ff92acede95d20da0
+DIST kio-5.66.0.tar.xz 3202728 BLAKE2B 74721ebaa9ab63fb29b5310f4f49562b20df2e97a3582f80e1060613719096d624e9dac682f3433e16568a6c0cb82c789a1af67afe659b1f7ab1f0d0b79665ab SHA512 7be872029fb93e76663291e868e829603f14fadfb0264c2c7dff351eba64a8574776a595ae57ca920a394e56940b220fc1065c01d0d88858fe3b7a3e5757ce87
+EBUILD kio-5.64.0-r2.ebuild 2344 BLAKE2B d3e798c1f2e962b09bcb51872819d12cb027664cc7b9bbeef048e4f2f51791cd91502961bd02bcb758c1f4274821586f8a890fdf3a4ac9cd0db35368d6429447 SHA512 641e02da13919f2566031f3c76c2b4b22d1af82b1744a70a21f8831055f76111a83b8ce456e534dfadb2570170f2fc08d35e86a277f191c1271dac673074d725
+EBUILD kio-5.66.0.ebuild 2248 BLAKE2B 52a2ceb156fb722261909e41772fc83cecae9464368bd14a847cd12b584e85aec2e938c3ead043ba89ac086197395a9ce585ffd8b0c8b748715080c5a2b3b6fd SHA512 0b1dbe4070c64d7cede686d0002219881394b626cd3356fc13793101965a75dadd15212db06ebd3532baa837d62112b50e6357c9c9f3e28813538273cf193383
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
new file mode 100644
index 000000000000..17968ff6cdb8
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
@@ -0,0 +1,39 @@
+From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com>
+Date: Fri, 22 Nov 2019 12:39:48 +0100
+Subject: Ftp ioslave: Fix ProxyUrls parameter passing
+
+Summary:
+QVariant stored in mapConfig always contain QByteArray values.
+So QVariant needs to be converted string before splitting to StringList
+
+Relates to D25432
+
+Reviewers: trufanov, #frameworks
+
+Reviewed By: trufanov
+
+Subscribers: kde-frameworks-devel
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D25438
+---
+ src/ioslaves/ftp/ftp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp
+index 8cd58c9..4266a6c 100644
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u
+     qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user;
+ 
+     m_proxyURL.clear();
+-    m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList();
++    m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
+     qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls;
+ 
+     if (m_host != _host || m_port != _port ||
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch
new file mode 100644
index 000000000000..2bde0a85d680
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch
@@ -0,0 +1,43 @@
+From c0ae03d14b0e58f2d3a23680b7b63c9fe46bdce6 Mon Sep 17 00:00:00 2001
+From: Alexander Trufanov <trufanovan@gmail.com>
+Date: Thu, 21 Nov 2019 14:25:02 +0300
+Subject: Fix HTTP proxy settings
+
+Summary:
+After SlaveBase::config() was replaced with SlaveBase::mapConfig()
+the reading of "ProxyUrls" value had beed broken as QVariant with
+type QByteArray can't be directly converted to QStringList.
+It should be converted to QString and splitted.
+
+Reviewers: #frameworks, meven
+
+Reviewed By: meven
+
+Subscribers: meven, kde-frameworks-devel
+
+Tags: #frameworks
+
+BUG: 414346
+FIXED-IN: 5.65
+
+Differential Revision: https://phabricator.kde.org/D25432
+---
+ src/ioslaves/http/http.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
+index 2b9ca9a..aca847b 100644
+--- a/src/ioslaves/http/http.cpp
++++ b/src/ioslaves/http/http.cpp
+@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection()
+ 
+     // Get proxy information...
+     if (m_request.proxyUrls.isEmpty()) {
+-        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList();
++        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
+         qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls;
+     }
+ 
+-- 
+cgit v1.1
+
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
new file mode 100644
index 000000000000..54f9755092f2
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
@@ -0,0 +1,38 @@
+From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 23 Nov 2019 20:11:21 +0100
+Subject: Repair FTP/HTTP proxy querying for the case of no proxy
+
+---
+ src/ioslaves/ftp/ftp.cpp   | 2 +-
+ src/ioslaves/http/http.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp
+index 4266a6c..f310871 100644
+--- a/src/ioslaves/ftp/ftp.cpp
++++ b/src/ioslaves/ftp/ftp.cpp
+@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u
+     qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user;
+ 
+     m_proxyURL.clear();
+-    m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
++    m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
+     qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls;
+ 
+     if (m_host != _host || m_port != _port ||
+diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
+index aca847b..5f9cd7c 100644
+--- a/src/ioslaves/http/http.cpp
++++ b/src/ioslaves/http/http.cpp
+@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection()
+ 
+     // Get proxy information...
+     if (m_request.proxyUrls.isEmpty()) {
+-        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','));
++        m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
+         qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls;
+     }
+ 
+-- 
+cgit v1.1
diff --git a/kde-frameworks/kio/kio-5.65.0.ebuild b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
index e902e794ce37..e400a929c18b 100644
--- a/kde-frameworks/kio/kio-5.65.0.ebuild
+++ b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
@@ -70,6 +70,12 @@ PDEPEND="
 # tests hang
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-http-proxy-settings.patch"
+	"${FILESDIR}/${P}-fix-ftp-proxy-settings.patch"
+	"${FILESDIR}/${P}-fix-no-proxy-settings.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package acl ACL)
diff --git a/kde-frameworks/kio/kio-5.64.0.ebuild b/kde-frameworks/kio/kio-5.64.0.ebuild
deleted file mode 100644
index f0c269e69103..000000000000
--- a/kde-frameworks/kio/kio-5.64.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-RDEPEND="
-	>=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/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
-	>=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
-	dev-libs/libxml2
-	dev-libs/libxslt
-	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
-"
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.66.0.ebuild b/kde-frameworks/kio/kio-5.66.0.ebuild
new file mode 100644
index 000000000000..ea827da873c0
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.66.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
+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/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
+"
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(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
+}