gentoo Easter resync : 12.04.2020

7 files changed, 98 insertions, 216 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index b8a00c83c420..0730a42c1cbd 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,9 +1,6 @@
-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
 AUX kio-5.67.0-memleak.patch 1461 BLAKE2B d891dd6e0012e23ac76216ad7f569215bcb17b2283e1e6dfc66ced2633fcbc41eae7830a3f670c8605396387c59b2338b2628f9919dbbeaeb557bea864b40931 SHA512 8dcff03fcd915c1adff16976839fc85b9e2ce6cf509aae29a93b4f385e8af0dad241360c87413943d5755c72de2b4c2da5423d35dc4be84dcc61756502abe407
-DIST kio-5.64.0.tar.xz 3176912 BLAKE2B 148e42792d16a5848ae82767d6b609c6475a0576d930ffafe6276fc44758751e5a435956250c937c05e1d8472a79198b5d4953e7eadc928a19ce74dbe5dc336c SHA512 fe629c397e09d045421ba7fe289e6f0c490510b2574190c23becfd5272c6fe760ed830d6a9282ab61da028028fcff768b82760ac4a010ea88ede0da1d3dc8652
 DIST kio-5.67.0.tar.xz 3223032 BLAKE2B 297ebb3f12282951e85edc4eb9869ff3b6fd9536aa312f32ab7403337bb13a142c37edc03ae2295fe55cc935d6952c70e0efda95a3fcc280709e6ef33c30ea04 SHA512 baf1e6abc6ae1ffa4010245a79cb676787217d365fb033f620a9da293565ec267186afaac08791104cead3ce5c87d3a76ec89b796355361b326b16f044691d72
-EBUILD kio-5.64.0-r2.ebuild 2344 BLAKE2B d3e798c1f2e962b09bcb51872819d12cb027664cc7b9bbeef048e4f2f51791cd91502961bd02bcb758c1f4274821586f8a890fdf3a4ac9cd0db35368d6429447 SHA512 641e02da13919f2566031f3c76c2b4b22d1af82b1744a70a21f8831055f76111a83b8ce456e534dfadb2570170f2fc08d35e86a277f191c1271dac673074d725
-EBUILD kio-5.67.0-r1.ebuild 2464 BLAKE2B 69e9d94d2e6f4e9eef75b1f2aa3d3a383d4171010437ca132d78969a8c2ca4d725f266a18924c901a8ba198664d1f91aa9a135013eb4bf43564f7a83f01a8f3b SHA512 37ce30608d2b4b80a0493fa42e9f8615333ac9fd25fed55ae8ad552649288fc5f6ec30d9fccff930a6b14b32c25b3686d778046f49aef01cc864249e97f5988d
+DIST kio-5.69.0.tar.xz 3225116 BLAKE2B c41c129251e9969fcedd085fbface7d040538c254ec56e4275773295fcbb66a49be288d5af9d1bce691e71d0d44e4de37f4fc94b240a308fbeca0f84bea2b8bf SHA512 872155ad2115e744ca25f99c225141e381512cd5eb371b8bc59f7793248f574c64af9d0b9f4673a0ea8f16951a82efc186a7796f2971c9af356d55f57a6640ce
+EBUILD kio-5.67.0-r1.ebuild 2461 BLAKE2B 72ea49e11d92138ac43f4470c1f63f2f44539af50983b5734994c5418c1c75c2c9b7ea9612e73362241f41c5a63aa706963fd0b6026947724b5c2d741d2ba8cc SHA512 6718d9abf8b53bf3ddd7132d9567e21bb92e6c12abfe1b3a8bc3f8d37f0f79d0d01f6a70d35d523e04621ea8ccb79668601b0316497aed1bf0040f9ec8a78e66
+EBUILD kio-5.69.0.ebuild 2395 BLAKE2B edc842f9980dcbf982627142bda4c7de8aa1ce522e429a7df89c99cdeda7b221bf6837e5f4a3c82a2b26654b3af0cee5d1cb536a7d67286440e8be4b1f73eb8d SHA512 7786c3063d373d062e8c7a25f0b17145d96b3d19f787738f227b4c756beaa8d93afc31ddc90ee5c7423b7fe66b1030e900d1f21968b9cf741c15f2b6ca0106a9
 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
deleted file mode 100644
index 17968ff6cdb8..000000000000
--- a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 2bde0a85d680..000000000000
--- a/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index 54f9755092f2..000000000000
--- a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.64.0-r2.ebuild b/kde-frameworks/kio/kio-5.64.0-r2.ebuild
deleted file mode 100644
index e400a929c18b..000000000000
--- a/kde-frameworks/kio/kio-5.64.0-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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"
-
-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"
-
-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)
-		$(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
-}
diff --git a/kde-frameworks/kio/kio-5.67.0-r1.ebuild b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
index ab22fcb45049..e46b20322eb5 100644
--- a/kde-frameworks/kio/kio-5.67.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org xdg-utils
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0
diff --git a/kde-frameworks/kio/kio-5.69.0.ebuild b/kde-frameworks/kio/kio-5.69.0.ebuild
new file mode 100644
index 000000000000..52bbb2edc065
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.69.0.ebuild
@@ -0,0 +1,94 @@
+# 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 xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}