gentoo resync : 02.03.2018

3 files changed, 19 insertions, 75 deletions

diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 4f1a8c4f71ba..5646ae54d89f 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,10 +2,9 @@ AUX lightdm-gtk-greeter-2.0.1-gcc6.patch 512 BLAKE2B d694ae119437b12ad13f94fcdbe
 AUX lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch 2129 BLAKE2B 5f6d70a42a986c7da34c563487583a2b520bf6f56208a4fac9e5aa0122a89135a5eb007f160464a6e0f7f94ab33e308e16e3004d95f34e0b07d88d06269336ee SHA512 70bbed98680f6cb6746b4d4cb2ce113d6900373fe701c72a95e70e890e700b337b2ef6f7283bceeb22cecc3098f2cd94cd917bc0c21d034bf2e19be0688f62a4
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe55dac627445b609619b7965566e964f1584bb75ed3ff7d45567dbdded5fb777578043990b9f8ba6f17d27951adf222740cee8 SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08
-DIST lightdm-gtk-greeter-2.0.2.tar.gz 487825 BLAKE2B e17b7528365154d9d5b80664c93deac3d6af2ed5c4be6829fff0f9500ad0e0dd8d57504052d34dbfcee8db2a1b14887d8002d42f185573f8fac01a43e618c4d3 SHA512 6a9b62d3eb94a223df30c0e7ef577645482e63f9ac9cce6466518bb7eabfca3915dba8dbe66dee7456a1f11f81869dc8685b98828b11ae0dd67aa021a9a1d6db
 DIST lightdm-gtk-greeter-2.0.3.tar.gz 490512 BLAKE2B 93aa086d520ed04bef5eda8f5c8afdf8f4d15f2b2b130fb889adc0a4270916d9a0151e20963f7dc8ec1f09c9f00a5966b49c3bd03ead048c63291a42486ede8e SHA512 bd5b18890cf0190faab0e6a2bffab67be359e99f45fda0be7eecded146d2518a4efc0fd4fd29970076246bb989f626dd750cb14b22ddf6188b2be5f113bff3b0
+DIST lightdm-gtk-greeter-2.0.4.tar.gz 566819 BLAKE2B 21b11a12e2af82e5548a72617da5b592a067a5fb883aa68e8076f3ec3793691a0e957da22ff49664334f67b3d7b20dda90bd02dce4bc4feadc18248e48125efc SHA512 d4dbcb7117ffd288b8a3a516423362ead837dfe83ea48cdf24056926d440900fefd22522868c39da2831dca861731b1a53f33a9db0d86c5e334e673a5dac3254
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1794 BLAKE2B b2d0c60a37398e03020c45919f8f0d759500226b048ef9d95832e61ec6623ed6dccec7a5debbe735ae36d60a7ede626b82d6db3c8890e59752d223457a9525c8 SHA512 00b4731815c52b6051ccdaf9246bd618747f33ba7c6f648596c0c53d61c5dfdabb84fdc4b0ad11782f7423965de9fa4a04ad543c45cf7c8e2c9d14faf35c7d01
-EBUILD lightdm-gtk-greeter-2.0.2-r1.ebuild 1734 BLAKE2B 98b9a8151f75a7c935a2167a0892f0de4319bf68e7033288facab9a62580e5f935df51257ea961bce0ebe0640a5ad545389228ae62e9dd702c1b337718c88705 SHA512 4230a5da75b6fa37e3334c78408aba7b8523a25db699f1e45984d2ba560f61c47a271a98ecc1f21453f539782e3bd98640c85c0b1df924ea09881640bde27499
 EBUILD lightdm-gtk-greeter-2.0.3-r1.ebuild 1879 BLAKE2B 12cd32f3d79a41ae0380bb34ac56a267861cef2784a78f5f54cd9b637993d5701ac812387a441e976b75df730ecc65050f9284c34219685046e59f995f51fd31 SHA512 30773b18eb0bdd788a9a6e4047f0d8c143a0b0143a9ae245c88b54b46908367bd7d6905439fb5b9568126981a843327b99a6debaabfe57774e26273c10cce884
-EBUILD lightdm-gtk-greeter-2.0.3.ebuild 1776 BLAKE2B 5344d2c7ac1339f09367f44eecd96b96146e88e04740d0bdd4a03effa4fe82d53fe4022511dac6c80f7511f9e080f451f209a06f47ef3dcee3b94a7ee09c9a22 SHA512 cb37c0f282e59e11cfc9adeaaf9c44b2be622f558341515de6b1b678c5b9960cc385968d636d92fbda0d7b3715362fcafd315077c5eb96b293c65e7852e38bce
+EBUILD lightdm-gtk-greeter-2.0.4-r1.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
 MISC metadata.xml 337 BLAKE2B 3c65fc50a54a761aacd4a8fa45fac5867cfc1831f596d6cacb9b84f649ef3b4827647c8f57590a16a5075ebfccad378b552fc2dbb07190ad8fb7c23ae8c84e34 SHA512 7819a26eb1d16acc0eaeb89c43ae27520ed527e4bc3166e3f5e582cb3c693cba07270e0864e2c57dfc005b4f27cae2b9bfad3f83be24990b6ecb1d0049c5efe6
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild
deleted file mode 100644
index cbde50c7fa49..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana branding"
-
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	xfce-base/exo"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
-	fi
-	default
-}
-
-src_configure() {
-	econf --enable-kill-on-sigterm \
-		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" \
-		$(use_enable ayatana libindicator)
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		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
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
index 913dc8689930..248aa5ef01e4 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit versionator
+inherit versionator gnome2-utils
 
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
@@ -37,8 +37,13 @@ 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
+		# Add back the reboot/shutdown buttons
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
 	fi
 	default
 }
@@ -60,9 +65,14 @@ 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
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}