3 files changed, 8 insertions, 91 deletions
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 3ffda919e523..bfdc72dc2142 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -2,7 +2,6 @@ AUX desktop-files.patch 1727 BLAKE2B df568ed9a5b9b70448864e113fb031e90c0d40deb59
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02
 DIST lumina-1.6.2_p1.tar.gz 20946587 BLAKE2B 2cd9b75342d5bd18b96beebcaed531f84c187c2c3bd13aa392b35efac0d45014ad86e393c18f2a5079b71cf7a21aca39e47068a5e7dda11a68feaa2a6c0f1d11 SHA512 47809465bd8c7cff39441d1dc20903b8de887e7309f4de43f57575eb0c63b68d00ee712bb3beaa7f229d9364c53cd51178ee0c9fdd66a01d6165155605b4aaf4
-EBUILD lumina-1.6.2-r1.ebuild 1988 BLAKE2B 4ddb06b378759d9ca060d9d420c0ebfc761647a1ac79c63b92b85adbe39563cd8c719aadf144686fe13bc191e1d368689401ab2e4c197835a8a8531bba653ce5 SHA512 77f62ca44c7a25c411b45b6bcb15fc3cb2254ae5a91b12e3ce16f34737bc44cc4642a80f7674725f7afbefd75e5d9763ef83830d29cdb9e7cc61b3527aa598a9
-EBUILD lumina-1.6.2-r3.ebuild 2094 BLAKE2B 61532aba1c137fb03203aaa5bd40612982e881b20bd342dc3087d9b5be702742c8fdcce9da80bbb852f69d1946dd72daab28eb22d2431bc0b833622fec9f4625 SHA512 69ba40e362f7a2f80ab5d0a51252f95473d3a10a2453e9d778845b184f488a575f6ff69656c732b12775968681142a5092601a060d8867a10ac444926d162274
+EBUILD lumina-1.6.2-r4.ebuild 2207 BLAKE2B d16f4473b8f217817b73eb5601a1c071888c5f3efaafc49c8e84eeaa093c5e06c0dd425a693551c5dabd5294d5743201b2bae51a5fb115bf89ed6047885975ad SHA512 39606bfb86446e95ed1411c8b14d05c76bdbd5f4f34b41c6f5f06809ddb4db90fea76ad0d7194cba9cb78e03b2ba73d34517ea7d1ff244c4285b796b9b121c6d
 EBUILD lumina-1.6.2_p1.ebuild 2013 BLAKE2B f1eb07a72879fe8a49595bf5ae91360b083b3fc9893ae1dba7166eb56034acad4300641dc08dabc4ddd4f1c126f9822742233a63f591ef8b3972bc0c04ecfd7e SHA512 3c7d834e80ed705293ce52fdf4c3371a812a5a56252aeb676e0a8fbf44834836a01bfc67bdac8131fbc6fd8e2fbe5405f80c4bba6fdd0dc5fb23e93742fcd390
 MISC metadata.xml 1993 BLAKE2B 3aecadf1e1e139a45ffd6f68941ac6f6609679ea34092e091daea5d736ed75178c3680e2dff87c98e0e5f77fa9336f8fde04c7279af67cdbf85bd537af230e0c SHA512 0e51fd432836ee7e4450baa1cf8d1aa80e6fc7bcf30f0c6bf75e564d8e882a170d538ac64b4479047b9dda15b1fa4ceabdabe393caa50a08a0daee5787c5556c
diff --git a/x11-wm/lumina/lumina-1.6.2-r1.ebuild b/x11-wm/lumina/lumina-1.6.2-r1.ebuild
deleted file mode 100644
index 552669231790..000000000000
--- a/x11-wm/lumina/lumina-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
-inherit plocale qmake-utils xdg
-
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="desktop-utils"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm
-	desktop-utils? ( app-text/poppler[qt5] )"
-
-RDEPEND="${DEPEND}
-	app-admin/sysstat
-	media-sound/alsa-utils
-	sys-fs/inotify-tools
-	sys-power/acpi
-	|| (
-		x11-apps/xbacklight
-		sys-power/acpilight
-	)
-	x11-misc/numlockx
-	x11-wm/fluxbox"
-
-BDEPEND="
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/1.6.1-desktop-files.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
-	default
-
-	if ! use desktop-utils ; then
-		rm -rf src-qt5/desktop-utils || die
-		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
-	fi
-
-	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}/lumina-session" lumina ||die
-
-	remove_locale() {
-		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
-
-	}
-	plocale_for_each_disabled_locale remove_locale
-}
diff --git a/x11-wm/lumina/lumina-1.6.2-r3.ebuild b/x11-wm/lumina/lumina-1.6.2-r4.ebuild
index a8ab64929fe7..cfcb76c6e824 100644
--- a/x11-wm/lumina/lumina-1.6.2-r3.ebuild
+++ b/x11-wm/lumina/lumina-1.6.2-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
-inherit plocale qmake-utils xdg
+inherit plocale qmake-utils xdg optfeature
 
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="desktop-utils"
 
 DEPEND="
@@ -50,7 +50,6 @@ RDEPEND="${DEPEND}
 	x11-apps/xrandr
 	x11-misc/numlockx
 	x11-misc/xcompmgr
-	x11-misc/xscreensaver
 	x11-wm/fluxbox"
 
 BDEPEND="
@@ -90,3 +89,8 @@ src_install() {
 	}
 	plocale_for_each_disabled_locale remove_locale
 }
+
+pkg_postinst() {
+	optfeature_header "Additional runtime features:"
+	optfeature "screensaver support" x11-misc/xscreensaver
+}