gentoo resync : 16.09.2021

4 files changed, 4 insertions, 112 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 9e25f443c240..8d3fb8ad9646 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.21.5.ebuild 4040 BLAKE2B 614877bb903d223fadc2c19963ccada9a350d65e705eba59f29b753e5bd7448f4fe66bd42e94432867403293cfd84062fce597721c4e7b16bb96c6ea6ef83dab SHA512 ec273d84d957bdbd8d641dac1594cb068bac1fa7600d41ed91bb726aa838ce41646e5ef770447258a2b7ff1c20116894f8394223152e859353fc2e2371259d15
-EBUILD plasma-meta-5.22.5.ebuild 4096 BLAKE2B 3157908a91e43d54808f0e5ae397aaf405c5b3e49cb2e2aa1fa0a5a1254d8c29362b0e05203aba46333d949ea0814d52f7f2ad79cd8aae52a473c05d01185271 SHA512 de937c877713f92e5000b45554eaf09685daa82bc87e88686bc4dd88b87f49fe4c553c6db7959e48877d3f2e19dbc8be59aa42db9f8bc9af9daef914653c22bf
-MISC metadata.xml 2379 BLAKE2B 5fbc8f0a3435246cd7a39a20c003e65e602106d7874c915dbda0da4bf1b5fac3cc48dddd63ac5cac7278e991cc93d6245787541f07b2b623bc4ee09453d872d1 SHA512 90e3111e7927086214a0bc738cccd638be74cac630e5b1e09129335fc7f8a1b15da6b6ce08f3b5258990f6d77ff899325241bb35629f9a4d2f6a4088c3138e8b
+EBUILD plasma-meta-5.22.5.ebuild 4093 BLAKE2B c709c6cce5fa4daa52a7f9d765e697ddb68d787f96e06e205405b3254622f89e2a1d2cb8c227d5ea2a87fcdf3f3748e7e665acba3de851e6897a276aa6c93152 SHA512 16e8a96e4afd3978cb262d020c451b30fd2e299a316a313b28f294b3045dfe6f60d925fd472cf80b2986eca6359229aa8a0b9f49d25ecf1f5f423fa5673a4b87
+MISC metadata.xml 2380 BLAKE2B a0326237bd12897117b80c6e173b8e5772d349bf370a383fca531bcfba0e25d29ea4444dca0ddb53b2348834209e4d5838e0f2a5a8f583beba8c7e2cb90226c2 SHA512 0a89ba5be15bf07ab83c6b59d4c277c00e0641227b60e490a0854598b1d2451b2a8f7733e9eff97709193d281995fe130adcdf6e75714eaee7195695a76834af
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 960a7f182533..de1664738aac 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
deleted file mode 100644
index a3729a5e3d62..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk
-+smart systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwayland-server-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		x11-misc/appmenu-gtk-module
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-		qrcode? ( kde-frameworks/prison[qml] )
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild
index eef3ed03861c..d5457918b249 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.22.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
 +kwallet +legacy-systray +networkmanager plymouth pulseaudio qrcode +sddm sdk