commit: 518d94844deed8e77f6365724d73a3f76f7256ad Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 28 17:24:43 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 29 20:45:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518d9484
x11-wm/lumina: EAPI-7 bump, sort deps 9999 ebuild looks to be out of sync, but is not for me to fix. Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-wm/lumina/lumina-1.6.0.ebuild | 44 +++++++++++++++++++++------------------ x11-wm/lumina/lumina-9999.ebuild | 40 +++++++++++++++++++---------------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild index a55056735a3..1c86507bdd9 100644 --- a/x11-wm/lumina/lumina-1.6.0.ebuild +++ b/x11-wm/lumina/lumina-1.6.0.ebuild @@ -1,10 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -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" +EAPI=7 +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 qmake-utils l10n xdg-utils + DESCRIPTION="Lumina desktop environment" HOMEPAGE="https://lumina-desktop.org/"; SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" @@ -14,35 +15,38 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="desktop-utils" -COMMON_DEPEND="dev-qt/qtcore:5 +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/qtsvg:5 dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - dev-qt/qtgui:5 - dev-qt/qtdeclarative:5 - dev-qt/qtprintsupport:5 - dev-qt/qtdbus: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] )" -DEPEND="$COMMON_DEPEND - dev-qt/linguist-tools:5" - -RDEPEND="$COMMON_DEPEND - sys-fs/inotify-tools - x11-misc/numlockx - x11-wm/fluxbox - || ( x11-apps/xbacklight - sys-power/acpilight ) +RDEPEND="${DEPEND} + app-admin/sysstat media-sound/alsa-utils + sys-fs/inotify-tools sys-power/acpi - app-admin/sysstat" + || ( + x11-apps/xbacklight + sys-power/acpilight + ) + x11-misc/numlockx + x11-wm/fluxbox" + +BDEPEND=" + dev-qt/linguist-tools:5" S="${WORKDIR}/${P/_/-}" @@ -55,7 +59,7 @@ DOCS=( README.md ) src_prepare() { default - if use !desktop-utils ; then + 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 @@ -77,7 +81,7 @@ src_install() { newexe "${FILESDIR}/lumina-session" lumina ||die remove_locale() { - rm -f "${ED%/}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm + rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm } l10n_for_each_disabled_locale_do remove_locale diff --git a/x11-wm/lumina/lumina-9999.ebuild b/x11-wm/lumina/lumina-9999.ebuild index 6881413499c..8e1fb965a9a 100644 --- a/x11-wm/lumina/lumina-9999.ebuild +++ b/x11-wm/lumina/lumina-9999.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 qmake-utils + DESCRIPTION="Lumina desktop environment" HOMEPAGE="https://lumina-desktop.org/"; EGIT_REPO_URI="https://github.com/trueos/lumina"; @@ -13,32 +14,35 @@ SLOT="0" KEYWORDS="" IUSE="desktop-utils" -COMMON_DEPEND="dev-qt/qtcore:5 +DEPEND=" dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] - dev-qt/qtsvg:5 dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 - dev-qt/qtgui:5 - dev-qt/qtdeclarative:5 x11-libs/libxcb:0 x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-wm" -DEPEND="$COMMON_DEPEND - dev-qt/linguist-tools:5" - -RDEPEND="$COMMON_DEPEND - sys-fs/inotify-tools - x11-misc/numlockx - x11-wm/fluxbox - || ( x11-apps/xbacklight - sys-power/acpilight ) +RDEPEND="${DEPEND} + app-admin/sysstat media-sound/alsa-utils + sys-fs/inotify-tools sys-power/acpi - app-admin/sysstat" + || ( + x11-apps/xbacklight + sys-power/acpilight + ) + x11-misc/numlockx + x11-wm/fluxbox" + +BDEPEND=" + dev-qt/linguist-tools:5" S="${WORKDIR}/${P/_/-}" @@ -49,7 +53,7 @@ PATCHES=( src_prepare() { default - if use !desktop-utils ; then + 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 @@ -62,6 +66,6 @@ src_configure() { src_install() { default - mv "${ED%/}"/etc/luminaDesktop.conf{.dist,} || die - rm "${ED%/}"/${PN}-* "${ED%/}"/start-${PN}-desktop || die + mv "${ED}"/etc/luminaDesktop.conf{.dist,} || die + rm "${ED}"/${PN}-* "${ED}"/start-${PN}-desktop || die }
