gentoo resync : 22.12.2021

4 files changed, 140 insertions, 0 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index fbca58d2dccf..8c73b03bd5e4 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,6 +1,10 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
+AUX 1.6.1-chmod.patch 647 BLAKE2B 55983e761e3cc85c092c2ee79a9c724ca48b4b0a5e32bc475fa382b24c56bcb8c6c7463a94d88044a5ecac0ee128fae0fbea7e9e90ea0c8ea7d7c32e60a85834 SHA512 0f7d5f0ab6179f48b7a2367434a370de95ed82811f8816a791a01054fcbbc1ff037333461ca50915307d2b99b265b7b6678a16897359d17ecb75b5e3774ec3f9
+AUX 1.6.1-desktop-files.patch 1671 BLAKE2B 4eec89c64a1fdb4dc05cc5ccb7b92daa5cae4485ba8eaf03c980336ebf23b871b1a59b48fa207bb6c7d560e23ea31482d2cda20bbc81ed94e71f303e8f3a62d8 SHA512 251ca933d840889a52f3464274338b04782d7965401bfd684408e4b9b264136d5871ef0aa6ad857cdd97099d5d7d7d6f9713684a69f450813ca6d58807fef8d2
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
+DIST lumina-1.6.1.tar.gz 20614263 BLAKE2B c0ad6a48d06ec9b2c0856a673319cb6a022416465e5f15fce47aac62d7e1817dc8b01acc7c55eaf3664217f2f27ef1b4d7a603a355cd9e22b707b481b322783a SHA512 ff4a77812e8d91478cbfd123ddc545e5a4aaabf3d9f96e6dedc769eb9490e4ac372c4243dca9444cdf986886c08e2eaa587470c9bc8a5a00bbe10ff80ad64c96
 EBUILD lumina-1.6.0.ebuild 2393 BLAKE2B 81ec58a7db69858efba8551c036f11190af573b21ae85c18c97ae6759ab35e169b63d5cc6d6c93146ba9af12823e70007a740eb2fe3d0c42fc2452d9cc94fd0e SHA512 fdd5aca5842e6b7cbe3e815c0ba65d869d8a5f934ad06421cc83b7e16b6f840c5668e14bd7c449db799d9d2a7e246e784f8de8979a0508e9122b399f9684a05f
+EBUILD lumina-1.6.1.ebuild 2265 BLAKE2B 7c2bcfd2b91165cd2399735b91dd00c0dd71e5c80aa673d5450b52fdd1168aff3e754a1ba878ad42cd26ce0c6d10ccc3b2528b7291761760cbf79c9214e8cfe8 SHA512 ec14e919d4834fc54fe407520e66357586859a3d25c9397113d87a9adb9fff2501af8a88a422314ac21097b05c3e5fc8274b5897e4bec4bc3e8114843240faba
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1982 BLAKE2B f2ea25f4e1118e58d78802ba7a047ec2cf1a963127d650625d2e18d2dd4378fdd255d513dcfbd7c24dacd7635839f3edde09cf778846ac7c98f302000e79b14a SHA512 54ffea2bd7d41a773888fe09dd4c70ef2db0898347249806cde19476f8a8a5b925ba5c953c4718786dd763a1664e5e247151cde69328525615cf9b0412dce909
diff --git a/x11-wm/lumina/files/1.6.1-chmod.patch b/x11-wm/lumina/files/1.6.1-chmod.patch
new file mode 100644
index 000000000000..ca6460eb2dda
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-chmod.patch
@@ -0,0 +1,13 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro
+--- lumina-1.6.1.orig/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-checkpass/lumina-checkpass.pro	2021-12-05 12:55:00.656682056 +0700
+@@ -12,7 +12,7 @@
+ 
+ SOURCES += main.c
+ 
+-perms.path = $$DESTDIR$${PREFIX}/sbin
+-perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
++#perms.path = $$DESTDIR$${PREFIX}/sbin
++#perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
+ 
+ INSTALLS += target perms
diff --git a/x11-wm/lumina/files/1.6.1-desktop-files.patch b/x11-wm/lumina/files/1.6.1-desktop-files.patch
new file mode 100644
index 000000000000..33a7165b5901
--- /dev/null
+++ b/x11-wm/lumina/files/1.6.1-desktop-files.patch
@@ -0,0 +1,33 @@
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-info.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-info.desktop	2021-12-05 11:42:18.142573885 +0700
+@@ -5,7 +5,7 @@
+ Type=Application
+ StartupNotify=true
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Desktop Information
+ Name[pt]=Informações do ambiente de trabalho
+ GenericName=Version and Legal Information
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop
+--- lumina-1.6.1.orig/src-qt5/core/lumina-info/lumina-support.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core/lumina-info/lumina-support.desktop	2021-12-05 11:41:50.668573204 +0700
+@@ -3,7 +3,7 @@
+ URL=https://t.me/luminadesktop
+ Icon=Lumina-DE
+ Categories=System;
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
+ Name=Community Support
+ Name[pt]=Suporte da comunidade
+ GenericName=Get Desktop Help
+diff -r -U3 lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop
+--- lumina-1.6.1.orig/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-10-03 02:05:49.000000000 +0700
++++ lumina-1.6.1/src-qt5/core-utils/lumina-config/lumina-config.desktop	2021-12-05 11:42:58.002574873 +0700
+@@ -9,4 +9,4 @@
+ Name[pt]=Configurar ambiente de trabalho
+ Comment=Modify the desktop
+ Comment[pt]=Modificar ambiente de trabalho
+-OnlyShowIn=Lumina;
++OnlyShowIn=X-Lumina;
diff --git a/x11-wm/lumina/lumina-1.6.1.ebuild b/x11-wm/lumina/lumina-1.6.1.ebuild
new file mode 100644
index 000000000000..3992057d88a8
--- /dev/null
+++ b/x11-wm/lumina/lumina-1.6.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 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:0
+	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"
+	"${FILESDIR}/1.6.1-chmod.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
+	chmod 4555 "${D}"/usr/sbin/lumina-checkpass
+	mkdir -p "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot create the icons dir"
+	mv "${D}"/usr/share/icons/hicolor/scalable/apps/*.png "${D}"/usr/share/icons/hicolor/64x64/apps || die "cannot mv png icons"
+	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
+}