[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm-gtk-greeter/

[Lars Wendler]

commit:     51385ddb27365c8ae0d59a511bf6c5ddc6c307ab
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 16:56:25 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 16:56:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51385ddb

x11-misc/lightdm-gtk-greeter: Revbump to re-add reboot/shutdown buttons.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...er-2.0.4.ebuild => lightdm-gtk-greeter-2.0.4-r1.ebuild} | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
similarity index 78%
rename from x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4.ebuild
rename to x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
index bc0dac2f8c0..08d490d3243 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
@@ -37,10 +37,17 @@ src_prepare() {
 	# background
 	# Bug #404467
 	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
+		sed \
+			-e "/xft-hintstyle/s:slight:hintslight:" \
+			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			-i "${WORKDIR}"/${PN}.conf || die
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
 	fi
 	default
+	# Add back the reboot/shutdown buttons
+	echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+		>> lightdm-gtk-greeter.conf || die
 }
 
 src_configure() {
@@ -60,9 +67,6 @@ src_install() {
 		doins "${WORKDIR}"/${PN}.conf
 		insinto /usr/share/lightdm/backgrounds/
 		doins "${WORKDIR}"/${GENTOO_BG}
-		sed -i -e \
-			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
 		newdoc "${WORKDIR}"/README.txt README-background.txt
 	fi
 }