From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2D5F15812D for ; Mon, 06 Jan 2025 09:34:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25884E03EC; Mon, 06 Jan 2025 09:34:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5EBBE03EC for ; Mon, 06 Jan 2025 09:34:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B62C7335D77 for ; Mon, 06 Jan 2025 09:34:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52A881B5A for ; Mon, 06 Jan 2025 09:34:02 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1736156017.80a0f3eca9f524e741a54703e13f794330f47690.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/lumina/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/lumina/lumina-1.6.2-r1.ebuild x11-wm/lumina/lumina-1.6.2.ebuild X-VCS-Directories: x11-wm/lumina/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 80a0f3eca9f524e741a54703e13f794330f47690 X-VCS-Branch: master Date: Mon, 06 Jan 2025 09:34:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6651c8d5-9404-4ef5-9b16-d5c7949d1001 X-Archives-Hash: 97b171b936a7ec8d32ede27905625d60 commit: 80a0f3eca9f524e741a54703e13f794330f47690 Author: Andrey Grozin gentoo org> AuthorDate: Mon Jan 6 09:33:16 2025 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Mon Jan 6 09:33:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a0f3ec x11-wm/lumina: minor ebuild improvement Signed-off-by: Andrey Grozin gentoo.org> x11-wm/lumina/lumina-1.6.2-r1.ebuild | 5 +-- x11-wm/lumina/lumina-1.6.2.ebuild | 86 ------------------------------------ 2 files changed, 2 insertions(+), 89 deletions(-) diff --git a/x11-wm/lumina/lumina-1.6.2-r1.ebuild b/x11-wm/lumina/lumina-1.6.2-r1.ebuild index 565a7424dea0..552669231790 100644 --- a/x11-wm/lumina/lumina-1.6.2-r1.ebuild +++ b/x11-wm/lumina/lumina-1.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,6 +9,7 @@ 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" @@ -49,8 +50,6 @@ RDEPEND="${DEPEND} BDEPEND=" dev-qt/linguist-tools:5" -S="${WORKDIR}/${P/_/-}" - PATCHES=( "${FILESDIR}/1.6.1-desktop-files.patch" ) diff --git a/x11-wm/lumina/lumina-1.6.2.ebuild b/x11-wm/lumina/lumina-1.6.2.ebuild deleted file mode 100644 index 59b5abb352d1..000000000000 --- a/x11-wm/lumina/lumina-1.6.2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 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" -) - -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 -}