gentoo resync : 30.09.2020

3 files changed, 48 insertions, 40 deletions

diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index 1e62d9a004c5..caf7083ab85d 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -3,6 +3,6 @@ AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d34
 DIST lumina-1.5.0.tar.gz 20657364 BLAKE2B 62b064e1be3ce69c078e68524e011a8ce4d61c680a4732da7992a7b72833363fceb0a0895a228ec9de7921d989253c70c518810b91c23226aded1f54b23b1aea SHA512 37106d71a9ba7188c4ded0614d2d4424f732519e11288ae312dfcd9a0b5b26dd31dfa812e74a96c0e3e0fb99fae4dc00806fd7a24183746688c72d997054af7d
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
 EBUILD lumina-1.5.0-r1.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-1.6.0.ebuild 2416 BLAKE2B 3ac8557090047e11dc95cb497549767d2bd9d8b222faa4ee8ee1ca978d6fefd259070347f1194f8dbea6b619fdacb14d2e4d261d2c59acf8b1f95d25db56c956 SHA512 6ffdee6ef07be2f20b50e63bf8b49ad99b0a38ec28897fafd98c0be4029c35d2187ef1f52b7e97ce45a120041742cbab65e1871e86ea825f167b93cf37d502fd
-EBUILD lumina-9999.ebuild 1389 BLAKE2B f38168a489101f25833660e2de3ff1666d69b47b620469376cde8825ca4d0a6f6ded5739be7f791df80d94a950e86cd3d8bbd1bb018712e94956df80ac8dfc81 SHA512 30168658fccea7521658148c795202513fbe07e089d1207b895270b0e28002a7a77f450c1af27e5c0e0f3e707f81cd6a46f966010239d457cedf43ee14b58ac1
+EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
+EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1981 BLAKE2B 260d71ea029aa07a26cc0af9d937c51253029b0bc4c70f11d4330da3a10d371be15959c93f4b1af1436b7a3c5a8a1ecb2a8f3cdea2078133384bcec3015f9940 SHA512 a55aba75dcdfc78363be5a59ebbcb7760fb1370685d7a893b976aba9497094f9674e7493ed0df3899ad917165967c3a58984bc04f3651b46416fa91fcb29de6c
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index a55056735a3b..1c86507bdd95 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 6881413499cb..8e1fb965a9a2 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
 }