gentoo resync : 22.10.2018

5 files changed, 2 insertions, 162 deletions

diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 42d6dabc038c..4380a3fd9331 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,10 +1,6 @@
-AUX lightdm-gtk-greeter-2.0.1-gcc6.patch 512 BLAKE2B d694ae119437b12ad13f94fcdbe6b18ea14f84de507ddcb602b081af6f22b3406e7e3c1cd67059cfb6bcba942c943133aed660fa84bb53eea492044b6553d67a SHA512 50ad27370f0ea355c27bc91d3a1c2df234dd7bb39e2763d37b93ed5ebdb69bf79be65b07a22fbe94cd3f2945cd4672ef4f97a2862ef15d245a7d0b2d2f7ff009
-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.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.5-r1.ebuild 2085 BLAKE2B 5b74f1788e563c1b32615df7d1cb37f54cabe2d2e1420df73805e52ce32b31cf228334f7188bc6a0bcd586a47f8d50c1ae49577fa1dc34eb48ff29dc0202a1f0 SHA512 88497f45067513784612497866e0029927116f1fed2c9eb4de09f68e9244411742d45ea0b7b8bc757805d45c2a22b21fee054ad248ad7651b459a55c9afc2628
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2084 BLAKE2B ff426d325619f5c5cfa3743489f1fec4d1aafbe069aab8b1161e3fd725fd952b2964c4e359cfaa5f84634670c61121be2b136c8ed14d55ecf377cbdbdd0fdfc9 SHA512 d4b4f3abc92be4cd211603a976ace4aafb6442c837e3b2d6edb03849cf4da860c47abaffcd342843915cac26d147930b3a5e6ab72bedc218b89519ad14dac405
 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/files/lightdm-gtk-greeter-2.0.1-gcc6.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
deleted file mode 100644
index f72a93abfc1c..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -677,6 +677,9 @@
- 
- /* Clock */
- 
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-+
- static gboolean
- clock_timeout_thread (void)
- {
-@@ -697,6 +700,8 @@
-     return TRUE;
- }
- 
-+#pragma GCC diagnostic pop
-+
- /* Message label */
- 
- static gboolean
-
diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
deleted file mode 100644
index 81f158b2176f..000000000000
--- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=627208
-Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350
-
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -1937,11 +1937,11 @@
-     {
-         gtk_widget_show (GTK_WIDGET (username_entry));
-         gtk_widget_show (GTK_WIDGET (cancel_button));
--        lightdm_greeter_authenticate (greeter, NULL);
-+        lightdm_greeter_authenticate (greeter, NULL, NULL);
-     }
-     else if (g_strcmp0 (username, "*guest") == 0)
-     {
--        lightdm_greeter_authenticate_as_guest (greeter);
-+        lightdm_greeter_authenticate_as_guest (greeter, NULL);
-     }
-     else
-     {
-@@ -1961,7 +1961,7 @@
-             set_language (NULL);
-         }
- 
--        lightdm_greeter_authenticate (greeter, username);
-+        lightdm_greeter_authenticate (greeter, username, NULL);
-     }
- }
- 
-@@ -1983,7 +1983,7 @@
-     if (lightdm_greeter_get_in_authentication (greeter))
-     {
-         cancelling = TRUE;
--        lightdm_greeter_cancel_authentication (greeter);
-+        lightdm_greeter_cancel_authentication (greeter, NULL);
-         set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
-     }
- 
-@@ -2017,7 +2017,7 @@
- 
-     language = get_language ();
-     if (language)
--        lightdm_greeter_set_language (greeter, language);
-+        lightdm_greeter_set_language (greeter, language, NULL);
-     g_free (language);
- 
-     session = get_session ();
-@@ -2238,7 +2238,7 @@
-         start_session ();
-     else if (lightdm_greeter_get_in_authentication (greeter))
-     {
--        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
-+        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), NULL);
-         /* If we have questions pending, then we continue processing
-          * those, until we are done. (Otherwise, authentication will
-          * not complete.) */
-@@ -2331,7 +2331,7 @@
-             }
-         }
-         else
--            lightdm_greeter_authenticate_autologin (greeter);
-+            lightdm_greeter_authenticate_autologin (greeter, NULL);
-     }
- }
- 
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
deleted file mode 100644
index 0a245234b38b..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator eutils
-
-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"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-	if has_version '>=x11-misc/lightdm-1.19.2'; then
-		epatch "${FILESDIR}"/${P}-lightdm-1.19.2.patch
-	fi
-
-	# 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
-}
-
-src_configure() {
-	econf --enable-kill-on-sigterm \
-		$(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.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index d0278ccc4699..199f3d937304 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 )