gentoo resync : 15.06.2021

4 files changed, 4 insertions, 102 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 257b21cb005f..0bf3d0607c74 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,7 +1,6 @@
 AUX kio-extras-20.12.3-thumbnail-check-shm-size.patch 1945 BLAKE2B 07318d918a264d62023d7058e718b2a30ec3e8f937a2f7b278ca1c0200485b843249ea0a26eed8f785a544bed5a021e3c5fbaa72030dc65dadcd0cd5b9bc2de6 SHA512 dc7183cfda0fbad5e3d9ddd5a1535e261f8137b313e8485badac4c5a3b1a4af20b7b6b468f0d5864045bc753b171f899a8c70c2b20dad25655dee6c19c34a785
 DIST kio-extras-20.12.3.tar.xz 636012 BLAKE2B c5145871443ab7bfb562ac935462eb5dfdeb7caab63c123c53a929af9d41f3780bf03ac9f16153434854f785122455e1767573ce84b88bef196a01c62fc2e609 SHA512 a419f7fa92ff876802e8b53eef9b5756108dd3f30fee4f1e1d25f4c8f4468181b9565a92ec07c832aa175368763adcd512f7732666f09a4e534e8d1af6abd13e
-DIST kio-extras-21.04.1.tar.xz 646820 BLAKE2B 9c66e42fc1f1212fcdfd3d03b1d68fcd11b46afc9b854006c95dbe96dce22fb33b297c9cc3d660fcacd460b0b91e44233abb973baa54397636657fcc8ca9791a SHA512 59f13650d906024e3ccf088022fafc49d3b958f9fe5043e627e051aed19a0ffc48f0f728bd5e3cd1959524511dd8ae7a9c8a68ea3fd09fa16f2ccb88395316bd
-EBUILD kio-extras-20.12.3-r1.ebuild 2704 BLAKE2B 23bd7caef421b9ad042c6ac8a8743a38fb3ab59b1b74dbd87afc254cc16f4360df0ed24f4e48a9bbbc90546174940fd591842c09aa4e758f725907d8c8b9a462 SHA512 90c9252479757f329bb9035f61560c0b2f8231c92231a581f06eb29d39c12c4229f348677b1ba0fbdd3438cffd8bb2f3e2426dd488adb50e7febf21a27441bac
-EBUILD kio-extras-20.12.3.ebuild 2621 BLAKE2B 5244624842b9b083e2a5b874f705bb4712a91f2247f8511986a9877bb2646b499aaf609d77ce1b8c08701276d1ce9d6f3d0ced1004631ba54b7b714739636377 SHA512 f5bcb699e5c7700115d9363177dcd4e3314d545ea6b41f5f3c04e7bf92bf9d57c30a792d9ea85470e181e3840cc9d8a6a699a33929e00a9e4a5817993630b9c7
-EBUILD kio-extras-21.04.1-r1.ebuild 2718 BLAKE2B f6ff0758a42a063f56ced6be5ded87c15b41ecf88c4652261288561371a5cc8be6c70e42e7dc7d1e5d4c8046f93a5cca2ab029d5c7636b0ef48952d507171d67 SHA512 ed274b4a3b796e5b1be6a2b6dfca30c35298d2a4f6fbbdf332ceb0eb0b88910922566a3c6e088ca38a71881bbf8679abf24b2cee04833dc22f0b5ff1a5ec14fb
+DIST kio-extras-21.04.2.tar.xz 663336 BLAKE2B 5e3ed81498f13218bc8b266d8f6c42a6d44e063ea5f5e2d36cc2506932ae7382e3ce9cb07715e327c397a8b2302bcd4583d316e41057f48a74255c883c462c8b SHA512 ae7b62881e3d3948eb798660f0f922b28a4f9642c9a94883704f8cec0657e64c03f61e2b26d795dfebdac505a0be0921fd308801fd8ca7a7bdf12d2b51f603e5
+EBUILD kio-extras-20.12.3-r1.ebuild 2701 BLAKE2B f9e5ac55c51b8d9e8c098efdd379c3f9501ccbe7b752be1ed3b152d7c31c7dec239374e43747a20b8662ae3523ff5d75e24cbe859bb9c4fee9f46712843258b1 SHA512 c13f91a704042b8c81a749793667a0317986a6412d04135d7aa4a29845169cd92f407c72d06305f67341d7ed1c6dd609ae9b7b37b6a2ead23b18338b5deae349
+EBUILD kio-extras-21.04.2.ebuild 2629 BLAKE2B 9599d3e762359009391473fd1cb0efbe79bd24d6d27ec806bbff22b694ea596e4759d7806ec1af89a0f0f0fbdcde8782f2b99571775060548fa808498dccf47c SHA512 829a956e00bc311eed29ac9471ed4f15350f44806af9d5d724d21d3206825aa94bac2e3353d5092cbe169875c9d448e21c5439f396b6b0f0bc597922ad2d3f22
 MISC metadata.xml 840 BLAKE2B cba33bb5b6c15b2cd116fdf241f91adf13b96d7402bb863cbfa6a8fbb8a5c7524c5704c4ccc3eb1350262eb55ce5d3130e5f0fda078c66ef597bbed0425b8b7e SHA512 678501971728b966bcc286242477f6bab4be9244a9cdad765be5d50c43c1c5fd08102c03bc4b5e9a2d46c5e92d594b95609da26d47b2a923339fa7e1d500f7c2
diff --git a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
index 1ca9d48fb3ae..34c6ad6aeba4 100644
--- a/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/network/kio-extras"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="activities +man mtp nfs openexr phonon samba +sftp taglib X"
 
 # requires running Plasma environment
diff --git a/kde-apps/kio-extras/kio-extras-20.12.3.ebuild b/kde-apps/kio-extras/kio-extras-20.12.3.ebuild
deleted file mode 100644
index bbe8f9614b8f..000000000000
--- a/kde-apps/kio-extras/kio-extras-20.12.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.75.0
-QTMIN=5.15.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
-	>=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/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:=
-		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-21.04.1-r1.ebuild b/kde-apps/kio-extras/kio-extras-21.04.2.ebuild
index 16b5e1d74f43..7a33fe927ad5 100644
--- a/kde-apps/kio-extras/kio-extras-21.04.1-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-21.04.2.ebuild
@@ -70,8 +70,6 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="man? ( dev-util/gperf )"
 
-PATCHES=( "${FILESDIR}"/${PN}-20.12.3-thumbnail-check-shm-size.patch ) # KDE-bug 430862
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)