gentoo resync : 03.03.2021

4 files changed, 4 insertions, 168 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 6472a15c6863..71323f7537a0 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,8 @@
 AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
 AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
-DIST plasma-desktop-5.21.0.tar.xz 15897396 BLAKE2B 0f7e312bf94ef54f4d6e38bf8ad2777588c6b4b69a277e9621356ccf588bafe6b02ca14502a8b4cdf447642d9b9b4b6cf27693a42097aad9df58c470dd41f815 SHA512 fea2e4626538fede72c75e995d73f82d4ec95914737e0e2ac1e90e71f8752d06bcbedb0b515fb3a47ea1c315d986f8f836efa39899d9f923c526b30aa244ada4
+DIST plasma-desktop-5.21.2.tar.xz 15909952 BLAKE2B 410a7d811eb293ec03e857ac2bf5761606e580168b3347046914423e66eb22b65945db7fa1c3455c38ef3a8564a28db114ca6ce943737e98301eb8f9e8b59aa1 SHA512 43f4288b4361f4a8ba14a39856ce33a7e92a1a3c559d6e27d664cdf62ae94b59d4e66e08a93a05784bbea2136c7ddf325ed9d348c269f3039d31382599d46e20
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.20.5-r1.ebuild 4880 BLAKE2B 3c4e0f2b83cbd72f3eeeac99bdcae15ea35418bf335aff621ae354fb3c0ebb9ca7a65b59a7cb0de26517afe04616c89dda27d0289a63ba33d8591667b69765a4 SHA512 50a9c2343ea0bca8ea8b4930a01d91c0c7e134aedff32cba5077f15b4332cf6257a9550f92ad832d3572caf1342071a919d0e9fdf58bce58fbfe3312b1eb8570
-EBUILD plasma-desktop-5.20.5.ebuild 4758 BLAKE2B 1fdcf427ebf602b6340e0617da18bec58456ee1661a8e3b351d0279d0a91593edcf06588f58bd05a4620bf8b3b0b8ee37d7806063c0aa1793b1867ad7170663d SHA512 70133d7de94057e62b25d52f327bd699a689898695f99a2787cd84793d83f6ddbd4216566e64de73289ebb142f5034a834a9db71283fd95fb9a516b705cdecc7
-EBUILD plasma-desktop-5.21.0.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
+EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
+EBUILD plasma-desktop-5.21.2.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
index b37887892f76..e4402b805d6d 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
deleted file mode 100644
index 025fd6bdfccb..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5.ebuild
+++ /dev/null
@@ -1,163 +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="true"
-KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.15.80
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	kaccounts? ( net-libs/signon-oauth2 )
-	policykit? ( sys-apps/accountsservice )
-"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.2.ebuild
index 9c62103b0a89..9c62103b0a89 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.0.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.2.ebuild