gentoo auto-resync : 08:01:2024 - 18:59:30

4 files changed, 88 insertions, 106 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index cde6ead8a52c..5fd5fb8cf87b 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,7 +1,6 @@
-AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
 AUX 1.6.1-desktop-files.patch 1671 BLAKE2B 4eec89c64a1fdb4dc05cc5ccb7b92daa5cae4485ba8eaf03c980336ebf23b871b1a59b48fa207bb6c7d560e23ea31482d2cda20bbc81ed94e71f303e8f3a62d8 SHA512 251ca933d840889a52f3464274338b04782d7965401bfd684408e4b9b264136d5871ef0aa6ad857cdd97099d5d7d7d6f9713684a69f450813ca6d58807fef8d2
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02
+EBUILD lumina-1.6.2-r1.ebuild 1991 BLAKE2B 0ec3f0462b3bfa8b11f36430032c1c56bcda33aa741b5c6dd9376d73ed30d16655bf0a981e12069ddfd25abf800595e087754f5ebb053312e7708bf3da069723 SHA512 fc09eefd95971dc99bf7d5b0fc0467953cb6f8d3b1c7b0f01437a70edbfbe3c78daa73e298c12d2c17173fe1c9bb948bfb02b7a977bfb59de22da15263d2deec
 EBUILD lumina-1.6.2.ebuild 1970 BLAKE2B 9f0f8afe35c4ddea8ae22974d2486ae5eda986abaf88b9604d5f75aa0457cc2f4d1f1275d90012b201ebe6af16838159891f0fbc524f5295b2b45144f928e9e4 SHA512 8d556759bb2ae066bd8b177bb53907c011e81b982c8c0ccab2237160f25cf7cb17992bcdd80daff0429b63127614b4aafe243f782ed7234dbbadf308e137b89b
-EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1993 BLAKE2B 3aecadf1e1e139a45ffd6f68941ac6f6609679ea34092e091daea5d736ed75178c3680e2dff87c98e0e5f77fa9336f8fde04c7279af67cdbf85bd537af230e0c SHA512 0e51fd432836ee7e4450baa1cf8d1aa80e6fc7bcf30f0c6bf75e564d8e882a170d538ac64b4479047b9dda15b1fa4ceabdabe393caa50a08a0daee5787c5556c
diff --git a/x11-wm/lumina/files/1.2.0-desktop-files.patch b/x11-wm/lumina/files/1.2.0-desktop-files.patch
deleted file mode 100644
index f86c1c49c38f..000000000000
--- a/x11-wm/lumina/files/1.2.0-desktop-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ./src-qt5/core/lumina-info/lumina-support.desktop
-+++ ./src-qt5/core/lumina-info/lumina-support.desktop
-@@ -2,8 +2,7 @@
- Type=Link
- URL=https://webchat.freenode.net/?channels=%23lumina-desktop
- Icon=Lumina-DE
--Categories=System;
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
- Name=Community Support
- GenericName=Get Desktop Help
- Comment=Ask for desktop support on the community IRC channel
-
---- ./src-qt5/core-utils/lumina-config/lumina-config.desktop
-+++ ./src-qt5/core-utils/lumina-config/lumina-config.desktop
-@@ -7,4 +7,4 @@
- Categories=Settings;
- Name=Desktop Configuration
- Comment=Modify the desktop
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
-
---- ./src-qt5/core/lumina-info/lumina-info.desktop
-+++ ./src-qt5/core/lumina-info/lumina-info.desktop
-@@ -5,7 +5,7 @@
- Type=Application
- StartupNotify=true
- Categories=System;
--OnlyShowIn=Lumina;
-+OnlyShowIn=X-Lumina;
- Name=Desktop Information
- GenericName=Version and Legal Information
- Comment=View information about the Lumina Desktop Environment
diff --git a/x11-wm/lumina/lumina-1.6.2-r1.ebuild b/x11-wm/lumina/lumina-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..872926704b7a
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.2-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 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"
+
+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"
+
+S="${WORKDIR}/${P/_/-}"
+
+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-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild
deleted file mode 100644
index 8e1fb965a9a2..000000000000
--- a/x11-wm/lumina/lumina-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 qmake-utils
-
-DESCRIPTION="Lumina desktop environment"
-HOMEPAGE="https://lumina-desktop.org/"
-EGIT_REPO_URI="https://github.com/trueos/lumina"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="desktop-utils"
-
-DEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[widgets]
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb:0
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-wm"
-
-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"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}/1.2.0-desktop-files.patch"
-)
-
-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
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM=
-}
-
-src_install() {
-	default
-	mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die
-	rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die
-}