gentoo resync : 25.11.2020

3 files changed, 6 insertions, 103 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index b7f71478d036..0739c9391967 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +1,3 @@
-DIST kio-extras-20.04.3.tar.xz 618056 BLAKE2B 35f0760948634407e02193ffcdd60176153e37ead99545a39bb777bda600f5685c3ed3bd76aeabc2620ba5ddc11aa094aeaf25c896150acb8da53e894c78e6dc SHA512 25de00a7e34ce9dce36a0935544a5f4684f31db6b73e191dd0e781cc3f3f0c761d504a8d85ce8fa1fbdb827f0adccb0f4fbb09c7295456074835ffb23e114ba3
-DIST kio-extras-20.08.1.tar.xz 629980 BLAKE2B 865dce2806dad78f5319ed7cadea5e409c5b50725f5ccd2e073797faab9374ba5fb7a7060777e7f2e77cd8e3e6508f26db11a46ba45859de83d2ec4b3c575c7a SHA512 b8e40f54de08e813b775fa2f1a16c4c444cfb17c74d0c13dcb431a5a26e684beae5951662b8b28ef84d5c5f2a5d988dc7c0ce90d19cfa4bc76f5aa8b63db9fcd
-EBUILD kio-extras-20.04.3.ebuild 2652 BLAKE2B 7fcbd1918df53e92753b3878f44e204171a02a81256cfb7b68d7f8e24be8a1164e1af282a0d8ba6a3a40bfb9334de015cd48d1f991c8196b99c8fb347430b7d6 SHA512 380e389416c7e167258e3ad418998e67f32ca9f6861c8449f633ca34760ad7c6f4a48650712260c80effb8650a0105fa37813c5a4a70554e725488af7b92b793
-EBUILD kio-extras-20.08.1.ebuild 2656 BLAKE2B ca42df199424d790714c2f1e8a1579db09c34bc8d8a9e01ca2462c851f7b6180c8c003bd2d6886ddb5101f3a3fdfe8566f7fa544ce452e629f823dd421f4bfd0 SHA512 340cc12f3bf1592b42f800bd74ca9c42d80a9bd757098ff772c824484c08c0e731066784bbf2d85d76edaa09da77bd9c028aabd2a79b7a5b93c31e03f53c40c2
+DIST kio-extras-20.08.3.tar.xz 630900 BLAKE2B 85d10431df29f62744c92dd6a3fe29442170e2cc18b9a0bd91a6726eccee9d63d6fec89e1f2eddddf3f2fa046c486e543d65bb4777b85c6c23bb14d142077c0a SHA512 c9336b2a348ced91c4edc36628afd2698891d9b52cd9ca6819e13e00a93745bf112eb98ed7d85940a41ae046f538d192d3bc7d8164d8fd65eb8464490d9471f2
+EBUILD kio-extras-20.08.3.ebuild 2635 BLAKE2B 63126d8efb9686012104f6e837cf3449eb1a8f03edd7edee21ee35635a2d53b0e1060efe1e54ffd307ef940f5425297efc524a533a009e7e7ba1964a852e0e30 SHA512 7d4a8883140434b455bba4a22ff74ef1f916c05fe87a1b930d638d02bc6404b786e50a965335b8ff70756be6eabdef2e4d17da28cebed378aa85d11f62d476cb
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-20.08.1.ebuild b/kde-apps/kio-extras/kio-extras-20.08.1.ebuild
deleted file mode 100644
index b822577d3886..000000000000
--- a/kde-apps/kio-extras/kio-extras-20.08.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.72.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-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 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
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdnssd-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-	activities? (
-		>=dev-qt/qtsql-${QTMIN}:5
-		>=kde-frameworks/kactivities-${KFMIN}:5
-		>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	)
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	nfs? ( net-libs/libtirpc:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	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
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package activities KF5ActivitiesStats)
-		$(cmake_use_find_package man Gperf)
-		$(cmake_use_find_package mtp Mtp)
-		$(cmake_use_find_package nfs TIRPC)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(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/kio-extras-20.04.3.ebuild b/kde-apps/kio-extras/kio-extras-20.08.3.ebuild
index 2e9a67fd0dfe..a1c479c1e9c7 100644
--- a/kde-apps/kio-extras/kio-extras-20.04.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.08.3.ebuild
@@ -5,8 +5,8 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -28,7 +28,7 @@ DEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
+	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -54,7 +54,7 @@ DEPEND="
 	mtp? ( >=media-libs/libmtp-1.1.16:= )
 	nfs? ( net-libs/libtirpc:= )
 	openexr? ( media-libs/openexr:= )
-	phonon? ( media-libs/phonon[qt5(+)] )
+	phonon? ( >=media-libs/phonon-4.11.0 )
 	samba? (
 		net-fs/samba[client]
 		net-libs/kdsoap-ws-discovery-client