gentoo resync : 22.12.2021

4 files changed, 3 insertions, 113 deletions

diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 55d27b78de04..0dda96e0f4fa 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.22.5-r1.ebuild 4084 BLAKE2B b55305c70f54abd9721e1c4e22eb76d4a1fde99bc2c3cdee125163141f2e233a289d6cf0e7222cffd9b21eebad81d7877634b0c0279a53640871164e454c8b88 SHA512 b1a2f6939940663dc3ceb44fb1e3daafd58b350d5aafcee5ed9793490d5e817232a37abc01247bc9eba2c1d202f40e3a4e39accdc6d9c4c0ef899441b189d8f8
-EBUILD plasma-meta-5.23.4.ebuild 4039 BLAKE2B 3ef27b09de658732959776aad1263fa432bcc82ebf76196cbd528966eb5c888b84716f0c3cc6d1d3dc57a7084a58b3c19d945926a63ac2760f0a50836197d2d5 SHA512 49437dd2fb541d0d378ae013c54a9f0ccba09955babb97cda53e703d756c2990b2b3824dd647546696ca25bf1aa970dcfea7fe1a0f1192dd543944541f04c720
-MISC metadata.xml 2380 BLAKE2B a0326237bd12897117b80c6e173b8e5772d349bf370a383fca531bcfba0e25d29ea4444dca0ddb53b2348834209e4d5838e0f2a5a8f583beba8c7e2cb90226c2 SHA512 0a89ba5be15bf07ab83c6b59d4c277c00e0641227b60e490a0854598b1d2451b2a8f7733e9eff97709193d281995fe130adcdf6e75714eaee7195695a76834af
+EBUILD plasma-meta-5.23.4.ebuild 4036 BLAKE2B 7dff00ce40e74712f9018a368bc2e2bd363c80cd522c2c26a2597cd44a11b84f2a6594feead04c83dbd8ab8b2090f448487781955d9e7f399a690bf1c24dd1c4 SHA512 536b818bc3aecca9ac62e595d3752f9a6be4c7d0eb2d9870b8ab6b18635a63efe7af9e46ee5ab39b2df39e4c21853f1642f429acb2e9cdf94d0b7d20ee68c915
+MISC metadata.xml 2254 BLAKE2B 77d3bf75c22304a0b40847f1e7057d800ad92ddbfd5950f3c1fa5354b803d23c108333f07e2e5ffe552a951ae598d6d750e5060b0a05d9245b8518c7a0179f8d SHA512 fdcb3f598bd4cec4d67b9be27ae6cca4fb49ac9292eb3e74a0990654ec74f1aa180f83ae0682049bda231c1ffd4d62e8390f15cf33e78b24116e84237bce8932
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index de1664738aac..929b376cb8ad 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -23,7 +23,6 @@
 		<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
 		<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
-		<flag name="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag>
 		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
 		<flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild
deleted file mode 100644
index cfccabc1777e..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.22.5-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~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
-+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/ksystemstats-${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/layer-shell-qt-${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[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.23.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild
index 86e058e3aa82..48918ec47f20 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.23.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.23.4.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 +sddm sdk +smart