gentoo resync : 15.09.2018

3 files changed, 10 insertions, 6 deletions

diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index c65f18d421ac..c3c9dc71adff 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,9 +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.4.tar.gz 566819 BLAKE2B 21b11a12e2af82e5548a72617da5b592a067a5fb883aa68e8076f3ec3793691a0e957da22ff49664334f67b3d7b20dda90bd02dce4bc4feadc18248e48125efc SHA512 d4dbcb7117ffd288b8a3a516423362ead837dfe83ea48cdf24056926d440900fefd22522868c39da2831dca861731b1a53f33a9db0d86c5e334e673a5dac3254
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
+DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1759 BLAKE2B 73e02d31e97346a014eb288309af245764e490fe37c51e274392435bd36e1c4ac1c56c3ca6ff2c53cae1a2ee1a540c3e8ab9dc6e9c9fb048ddb1bd9b14cd6e28 SHA512 b5c7c28333f7d09b9984e4bc26692919662e5a2e4b66bfc5683c1d8c5ff2e4f7733e9b544e6091f0f903eff993394665df6babdbaa18caea758fd782453e0f33
-EBUILD lightdm-gtk-greeter-2.0.4-r1.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2092 BLAKE2B 0e8ec3cbf51a55d14bff6b2a2b5a86745ea3c1906c73fe856429b8fbfb03a7e9af1b508edf0411955487f54579a5324b77662cf2f44f11daea44c479c4340135 SHA512 5b7bbe6a61ad4b689397d1cbbeca0fec6dc4ba5b9092b0863b83df0b7c48d12274fc3f7a302d0a2beeb9d51935d0b0878791e7874775674d4064dc585b11639c
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2091 BLAKE2B b7abbab562413fe8abae0997a4dd9c411979d410c5e17bd483aa31fa38aea62a7dc1f47b3a9f4bcdc4128f10cc131271f7744adf67042114cf1d93e79281cde2 SHA512 a9ed2e280e9607e027bc6525845fda50b7402db29beeb8ab7d2a371df0a3370f4f49d5928a87912a8a5d7275938c71e1216698099ccabfbf8ccfcf2389e829a0
+EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2070 BLAKE2B b02fa7a18a45fe31a7e94ddef55b037dd0ebaa40513d38b132ce4312a150e797b43fcdc348cddc578628cdc96655916697287166a55568d920b4c9462623da04 SHA512 0a2d0a5dd3af18c833b0e948690d1382828f8178f19df5db36b5b2bad53c6ef35b89d2dc39e0847a31913ea854750037f52c206ecb20ac388aca46864f0ae03f
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 58691be1904c..86afc4768141 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
index 248aa5ef01e4..b842a5130ef2 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-inherit versionator gnome2-utils
+inherit autotools gnome2-utils eapi7-ver
 
 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
+SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 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
@@ -46,6 +46,10 @@ src_prepare() {
 			>> "${WORKDIR}"/${PN}.conf || die
 	fi
 	default
+
+	# Fix docdir
+	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {