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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0AF491382C5 for ; Thu, 1 Mar 2018 16:56:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3585EE08F1; Thu, 1 Mar 2018 16:56:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10367E08F1 for ; Thu, 1 Mar 2018 16:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 99921335C30 for ; Thu, 1 Mar 2018 16:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4F411EB for ; Thu, 1 Mar 2018 16:56:43 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1519923399.51385ddb27365c8ae0d59a511bf6c5ddc6c307ab.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm-gtk-greeter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4.ebuild X-VCS-Directories: x11-misc/lightdm-gtk-greeter/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 51385ddb27365c8ae0d59a511bf6c5ddc6c307ab X-VCS-Branch: master Date: Thu, 1 Mar 2018 16:56:43 +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-Archives-Salt: ab851051-097a-4f72-8421-1ab3d53a2810 X-Archives-Hash: 8a9d1f4516fa593c9674800447e507e7 commit: 51385ddb27365c8ae0d59a511bf6c5ddc6c307ab Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 1 16:56:25 2018 +0000 Commit: Lars Wendler gentoo 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 }