kde-plasma: Drop obsolete 5.18.4.1 revbumps w/ gui-wm/kwinft support

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

9 files changed, 0 insertions, 617 deletions

diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 21eedb89b3..64b46a1886 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,4 +1,3 @@
-DIST libkscreen-5.18.4.1.tar.xz 85504 BLAKE2B 569295f9e9fb65388b3e8f4824fac2f5e8d34dcb371831601da6eaa7d971069752f370e1fbf750ba29263de7e8281b5574ab34959d37633fde7da386009ead8d SHA512 73e5d105701d11f1bbe403034614d89a6aab3e4f47d949633e2104c590c62a4e89e7643558056d45d16e43d326c52a950024b84f184dd86fff9cfd57f37efa43
 DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
 DIST libkscreen-wrapland-support-5.18.4.tar.xz 14028 BLAKE2B 16680224505b96302c4a71a83adc5788340df31254dd620442f1c9e4214c9511529529c2e51e687f78562effe597af35d65820cd527e9183b6af354e334db865 SHA512 2951de43c3be8a8a72c9b31e12148815b0f676783afb03d11b63dc6a9a6d441aab90b3acbf51f0d712809f2bf66b03d19756edf3469bb7948470af6f9b2781c2
 DIST libkscreen-wrapland-support-5.18.80.tar.xz 13980 BLAKE2B 793f4af29dd9550ddfade9dbef5b872201c997d7da4e81b3f47f9dd5a0b4ec2e13bb373515f8fe5a27e296c013231a73ec41585eea9e60687cd1d9f79eda83c0 SHA512 70ea69b3ad20c8e3efb2afe96538a0a21dec2a53ce02216aca32d7dc6d0999effddd900e33281abdc6e6677189ee9e6570fdb0765aac9c97e2624a498ad6da01
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.4.1-r1.ebuild b/kde-plasma/libkscreen/libkscreen-5.18.4.1-r1.ebuild
deleted file mode 100644
index 7f73751346..0000000000
--- a/kde-plasma/libkscreen/libkscreen-5.18.4.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-wrapland-support-5.18.4.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="~amd64"
-IUSE="kwinft"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-	kwinft? ( gui-libs/wrapland:5 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${WORKDIR}/${PN}-wrapland-support.patch" )
-
-# requires running session
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kwinft Wrapland)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 25758ed3a0..8859ce0795 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.4.1-r1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.4.1-r1.ebuild
deleted file mode 100644
index 8d0693d563..0000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.18.4.1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	|| (
-		>=kde-plasma/kwin-${PVCUT}:5
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index bb1db80e51..441e312793 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,5 @@
 DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
 DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
-DIST plasma-desktop-5.18.4.1.tar.xz 9411912 BLAKE2B b34792e3418230fc7a6beabfe595c6873e61e884f7ac8204444ce5785d7e048f2eb145949240ff20a2d8821a3cee4afe4a4200e7b88b015e5906a6f9bbb8f1ef SHA512 4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
 DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
deleted file mode 100644
index 55899f045b..0000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1-r3.ebuild
+++ /dev/null
@@ -1,189 +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="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
-	${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
-	${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
-	${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
-	${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="emoji +fontconfig ibus scim +semantic-desktop"
-
-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/kemoticons-${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/kwallet-${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
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	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
-	)
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus[emoji?]
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-synaptics-header.patch" # in Plasma/5.19
-)
-
-src_unpack() {
-	kde.org_src_unpack
-	mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
-	cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
-		"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
-	cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
-		"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
-	cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
-		"${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
-	cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
-		"${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	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=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
-		$(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
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.ebuild
deleted file mode 100644
index 937736073b..0000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.4.1-r1.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
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook kwallet kwinft +legacy-systray
-networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${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}
-	!kwinft? ( >=kde-plasma/kwin-${PV}:${SLOT} )
-	kwinft? ( >=gui-wm/kwinft-$(ver_cut 1-2):${SLOT} )
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}[kwinft?]
-	>=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-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${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} )
-	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 )
-	)
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-	)
-	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} )
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	use elogind || use systemd && 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-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 25758ed3a0..8859ce0795 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1 @@
-DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1-r1.ebuild
deleted file mode 100644
index 6307a79aa2..0000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1-r1.ebuild
+++ /dev/null
@@ -1,222 +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="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${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/kidletime-${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/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${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-plasma/kscreenlocker-${PVCUT}:5
-	|| (
-		>=kde-plasma/kwin-${PVCUT}:5
-		>=gui-wm/kwinft-$(ver_cut 1-2):5
-	)
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
-	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-frameworks/kdesu-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/ksysguard-${PVCUT}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local md5
-	local srcfile=/etc/plasma/XX/10-agent-XX.sh
-	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
-	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
-		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
-			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
-			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
-		fi
-	fi
-
-	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
-		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
-			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
-			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-
-	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
-		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
-	fi
-	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
-		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
-	fi
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package qalculate Qalculate)
-		$(cmake_use_find_package qrcode KF5Prison)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${T}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${T}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	# Clean up pre-5.17.4 scripts
-	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
-	fi
-	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
-		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	fi
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}