gentoo resync : 14.04.2018

14 files changed, 2 insertions, 425 deletions

diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index a9fb7afc3955..820c3c025a23 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index a2f0ab9a5ae2..8a92850919e4 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,19 +1,7 @@
 AUX Xsession 1974 BLAKE2B 229ba66250e025cb207d9e22a50aab356bfa185cbc65ea87d62a2ebe02c3d3b156c3d414674ca6ed2ab9e466f058ee91e9d3feabe17f9494b397b219ecd0c688 SHA512 497c420601e171ae3e753f2277119bd39eb0cb4e6968b5294c54ec1673d96553787f4e02c3a0bb1d0270048e721ee96aa4b3df0caed8ae40b12d726c6abf90da
-AUX lxdm-0.4.1-configure-add-pam.patch 1410 BLAKE2B b5be3c050d7da601ad597f038a7642c966d5faf5df498e11714f01baff041c1a09189ea893e0f4596ddff5d6170f86ae480d22adf2c4d17a6f851edf3f2373ad SHA512 4a5f2f4a282739e74e63d583036e0cc84f3613983d3fac2795827d9065ade3e2cfc353472345be1948444ac4c2f037f5bc97c62a79a9b170e8fd6e0fc23ab6dd
-AUX lxdm-0.4.1-event-check.patch 704 BLAKE2B aa5e60ed608f3361c72b9f786f941dae09d44d1754e719e8a40bdf6a7f383e956b0990220d77d8b0766e7045d4725591597e855a7d905915b65816951fa8e034 SHA512 459dc8106a836f6b6cdb6eb64a4d818a5af17318e800f5d6194a6ec7fcc9ce1bc2957516670dc191d5ae8bb325144997958dc2e7062f59cb38b98abf6ec60cd1
-AUX lxdm-0.4.1-fix-optional-pam.patch 669 BLAKE2B ab44cafd2d20e6758c43b5fb6c98bd38c4157978980f9924f4e1f3608ac3dbbcef407bb8a6b5207e90d8edf47b3f8fdd1110153b0bb602fd816c2342357f4816 SHA512 817b96d59e73daadab1165df90ff6de76c06bb9fbfec57299dca4a590e2d7284e6ede4a5cffeb53d5d12a5eaaa7ad5a0f0d3d04bb35ea005a4be6f81d1b09dbf
-AUX lxdm-0.4.1-fix-pam-100-cpu.patch 444 BLAKE2B 0acd22fd835489c88447006e3fecc217dcf4cdf95788ad9b6c6cf551f6a42182292f72d834e3267254ccbf275cf3c58a02280ff580f8e25c07b651dfc550683b SHA512 2aef14d7dc9e2f10fda1d22b5837225f61af9a8fb46267ad98eb65149e72c165c6588c4816dc8c20ec90f49a2db5289b519f9b1c0b4b5b9ec430bea73fbac9a6
-AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 BLAKE2B 7b67ebe38e1cb8ebc8d6654056dd3caff947606b9aed716cf92733aae295a448e8099d0b69e204cee38f55cf715aeda07df867b1323181fdbdf7f4ce8a5ba316 SHA512 204124b2558280183e71799c2e006c9efb97b17bc5ef5f9cbf68afd0a4da2568d6e3d7a8d7dc3e12283b8d2febea541793fd72861ca7d692f1595be209d47f62
-AUX lxdm-0.4.1-missing-pam-defines.patch 583 BLAKE2B 6cb8d0cfe4274f4c593e020a87678766183a355ce44fd82ff90dcd15ff255ddc2c53227574718af4f0e1103e53316610ff113432a2b3ee7759ddd25171a49f19 SHA512 e7ebb98cae18874152ed5ae528db452428db5f0311cf92eeec93dc9bffaefb101fb587466e9f7c015199cf25c1fbc45ac1c20e3f41d7dd087622ac2e53b812e9
-AUX lxdm-0.4.1-optional-consolekit.patch 1467 BLAKE2B 7bcd27f3da225c3dc8140077c91fe64f0c3fd69b04504d8a3c9bb1bc5cc4f54d89167e0ea6c9856de2f3e497c4dac90c88b50992650b1a44fb7a76d24db12f33 SHA512 56d41d8115dbb7d83f1ae54958c3a7982175d59ae06680f092ab005ecd490e06f4209ad296abed3d562f717f23bf45413ef899e79ea2e498b4d4980b50a5f99d
-AUX lxdm-0.4.1-pam_console-disable.patch 344 BLAKE2B 365916ee458da3959dabedea2fe5f111dd4a5c974135cb9868747d059c1ee5b9b46702d6a3b54a18306074f17cb18fbe604e0124e4e1064216e127af450a5c75 SHA512 15ebae762ca266da2986c6dc29b866068e7120457da253cc0513fb285c386869f35c074c2cd1cc1ff05045f533e565400cf39ae2f484eafb29fb2faeb2d260e4
-AUX lxdm-0.4.1-selinux-support.patch 281 BLAKE2B da85531a78f19c9e59ce270ea998f83dd61ed9036e75de380724a4300bec3d6da8e3acc2f6a3e82c1f1c0ae5dfc0185b4bf316883513de586a8872ae261f6d83 SHA512 8875c92a2159b0390c00a1460c294c8ebdfa8920c38d7edeaf0108813cfc59eb6aebacb28e7d5d8012177809f29962035afe6c4a9ea439f6bcdb630fd31b626c
 AUX lxdm-0.5.3-pam_console-disable.patch 307 BLAKE2B 4bf6b05b5b803b582e441cd5b17c43fcde6da2ddafef92898d6bcb92897b274d6c5e76bf716fd1c8435f73094cc2ab3493b30b5c7ff32cb197207c4b2df09170 SHA512 a86c2f706ce0af21e33248cd488eb726033682fdedaa559cce23bb01fda51330d4293927145233c0b6cef3bb547042654ddcb00745d13f1cba2755f53a71a072
 AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
 AUX lxdm.service 277 BLAKE2B ec9204c869c2189fad0978e38de5d48ca7409d7ade3e3ca10a7812f8cf283c36554c751908eede107ce0730b78899f1c87b1cbfdd8bce3aabda2c596814c4832 SHA512 123e48527423d542fc838e3171e9130df7d87f054fc66be87b1a539a6c31b64edbf467cfc07901716845ba5c8250b39ac0a2ac2e7f3e0e563639867815ff0514
-DIST lxdm-0.4.1.tar.gz 296714 BLAKE2B bcc2122a5a9bd59e3d29b8e7932ebc5f399cf3bb6ae2bda02329f7b82ff54dfd4c2b7cf5675d917e9db1df354cfad43a39febefe3ef29284fa09c33a76bbb2d6 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27
 DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
-EBUILD lxdm-0.4.1-r9.ebuild 2132 BLAKE2B b24ffdae5d1168b06487aad0eff5f8e26b002cca200d37dcf2eaeabee343616626aeeeb376f329cd59e42d164541b2f3c9ea1e9ae62ee129b7d1ad3d89888cc6 SHA512 191a2ffaba92f911dd02b8746c9f525b216682e697f941825557a6cbc08ce5d85bc3b873b797f349d3fe695f1edb7aa08ef1603aed501282cedf41ffad993f35
-EBUILD lxdm-0.5.3-r1.ebuild 1602 BLAKE2B 42ddcc76c924d2c0ffd57f0d9770617b1ec0e957050926f71ef4e4c82d152d97c1bb9e1163d5c4f60699b7137ad02ba8f3ed644f415cdfd5d5d3f6de1dce9440 SHA512 5de8cebc40c7f7412501cefd5ee6c361ab3fe3e0d4f0ab84299bc4cf2792a4cee7212b58b42d2e0df781158540e813cb7de48e5a30211e213358c44e91ca6250
-EBUILD lxdm-0.5.3.ebuild 1466 BLAKE2B 7988f767e4c1d7e35f726a4f4c81674f7ceb36e2f85ff31add14c4b47e01c6c870805769d9f0f3471d4f9eff61b5561098e861134a5a1d7dc937add4886934fc SHA512 875c67fd77a77c5f5b2db9a6662dd475cb1318c6c242c21bb46f1f0bbc5af1205b60a66fe3504bcdbb46accc09f66f5087a347822ef4581e743fc25ab08c95ec
+EBUILD lxdm-0.5.3-r1.ebuild 1601 BLAKE2B 9462ffa28e673e6d33bc8998ac5d87422af87e1ae659a6a749153f13e00f16028c6338036e4db30f17326b298d10dcba1f26150e3ecca0231e8b053166fa0657 SHA512 cfe4f814cea30c4ca305ec88266cfc3e4ec7048a13d62297f4dfa477a35aac73dcd57b108b09a5190f499e4ef12126ccb3c3c8e52c81f45a853ad4cdd16f4cd6
 MISC metadata.xml 581 BLAKE2B 1fa67dfa056b08a3797120c83b23a11014a0b15a0c9ca6f6323c77ed80654c67cf1ffa7f4877af66286bf739f77ccbd7a997459abc85d7db7d240519bd60d496 SHA512 bfb1509cb2c43f2711a38c284a1a4152192b91c5a9f681fe063848cbeb39e8a2185d2bff084d08b0d9583cb2482101e23ce955aa9b81606a2bc270a657d7a2d1
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
deleted file mode 100644
index d91bf75a67bd..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001
-From: Mitch Harder <mitch.harder@sabayonlinux.org>
-Date: Thu, 8 Dec 2011 11:02:28 -0600
-Subject: Fix configure.ac test for pam libs.
-
-A bug report on Gentoo noted that the configure test for pam
-wasn't working correctly.
-https://bugs.gentoo.org/show_bug.cgi?id=384615
-
-This corrections borrows the configure.ac pam testing method used in xdm.
----
- configure.ac |   13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e952473..eaa883a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -14,12 +14,21 @@ AC_PROG_INSTALL
- AM_PROG_CC_C_O
- 
- # Checks for libraries.
- AC_CHECK_LIB([crypt], [crypt])
- 
--AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]),
--[],[AC_CHECK_LIB([pam], [pam_open_session])])
-+# Check for PAM support
-+AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
-+	[USE_PAM=$withval], [USE_PAM=$use_pam_default])
-+if test "x$USE_PAM" != "xno" ; then
-+	AC_SEARCH_LIBS(pam_open_session,[pam])
-+	AC_CHECK_FUNC(pam_open_session, 
-+		[AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
-+		[if test "x$USE_PAM" != "xtry" ; then
-+			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
-+		 fi])
-+fi
- 
- AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
- 
- # Checks for header files.
- AC_PATH_X
--- 
-1.7.3.4
-
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
deleted file mode 100644
index 4c2d5b35235f..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 15:23:19 +0800
-Subject: [PATCH 1/1] fix event check bug caused cpu 100%
-
----
- src/lxcom.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
--- 
-1.7.4.1
-
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
deleted file mode 100644
index 0aecc08593dc..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index bfac56b..40710fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,10 +2,13 @@ NULL =
- SUBDIRS= \
- 	src \
- 	po \
--	pam \
- 	data \
- 	$(NULL)
- 
-+if HAVE_PAM
-+SUBDIRS += pam
-+endif
-+
- rpm: dist @PACKAGE_NAME@.spec
- 	rpmbuild -bb \
- 	--define "_sourcedir `pwd`" \
-diff --git a/configure.ac b/configure.ac
-index ae5177f..aaa1bad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then
- 			AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
- 		 fi])
- fi
-+AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ])
- 
- # Checks for header files.
- AC_PATH_X
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
deleted file mode 100644
index 103268efec40..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- lxdm-0.4.1.orig/src/lxdm.c
-+++ lxdm-0.4.1/src/lxdm.c
-@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch
- 		setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
- 	}
- #endif
-+	int i;
-+	for(i=2;i<256;i++)
-+		g_source_remove(i);
-+
- 	char** env, *path;
--	int n_env,i;
-+	int n_env;
- 	n_env  = g_strv_length(environ);
- 	/* copy all environment variables and override some of them */
- 	env = g_new(char*, n_env + 1 + 13);
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
deleted file mode 100644
index 7abdbd470523..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001
-From: Andrea Florio <andrea@opensuse.org>
-Date: Fri, 29 Jul 2011 23:59:32 +0200
-Subject: [PATCH] fix null pointer dereference
-
----
- src/config.c |   25 ++++++++++---------------
- 1 files changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/config.c b/src/config.c
-index 3f92f7b..4603ab4 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
- static void update_face_image(GtkWidget *w)
- {
- 	GdkPixbuf *pixbuf;
--	char *path;
--	path=g_build_filename(user->pw_dir,".face",NULL);
--	if(access(path,R_OK))
--	{
--		g_free(path);
--		if(ui_nobody)
--			pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
--		if(!pixbuf)
--			pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-+	char *path=g_build_filename(user->pw_dir,".face",NULL);
-+	pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
-+	g_free(path);
-+	if(!pixbuf && ui_nobody)
-+		pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
-+	if(!pixbuf)
-+		pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
- 						"avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
--	}
--	else
-+	if(pixbuf)
- 	{
--		pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
--		g_free(path);
-+		gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
-+		g_object_unref(pixbuf);
- 	}
--	gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
--	g_object_unref(pixbuf);
- }
- 
- static void set_face_file(const char *filename)
--- 
-1.7.0.1
-
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
deleted file mode 100644
index a59273ccf40d..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 1 Jan 2012 17:05:22 +0800
-Subject: [PATCH] fix bug introduced from pam detect
-
----
- src/lxdm.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxdm.c b/src/lxdm.c
-index b5a90be..07be1e0 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -25,8 +25,12 @@
- #include <config.h>
- #endif
- #ifndef HAVE_LIBPAM
-+#ifdef USE_PAM
-+#define HAVE_LIBPAM 1
-+#else
- #define HAVE_LIBPAM 0
- #endif
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
--- 
-1.7.4.1
-
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
deleted file mode 100644
index 621a9d62e45b..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=443666
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=902438eb83b4ae97d774e4e5f38b46f2d826df2f
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=371b018474217bdff1d5108b384fbf0f45aa873d
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-Index: lxdm-0.4.1/configure.ac
-===================================================================
---- lxdm-0.4.1.orig/configure.ac
-+++ lxdm-0.4.1/configure.ac
-@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
- 		 fi])
- fi
- 
--AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
--
- # Checks for header files.
- AC_PATH_X
- AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
-@@ -89,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
-+
-+AC_ARG_ENABLE(consolekit,
-+	AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]),
-+	[enable_consolekit=$enableval],
-+	[enable_consolekit=yes]
-+)
-+
-+if test "x$enable_consolekit" = "xyes" ; then
-+  AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
-+  PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
- 	AC_SUBST(CONSOLEKIT_CFLAGS)
- 	AC_SUBST(CONSOLEKIT_LIBS)],[
- 	echo "ConsoleKit devel package not found"
- 	])
-+fi
-+
- 
- AC_ARG_ENABLE(password,
- AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]),
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
deleted file mode 100644
index 628e9a511102..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- lxdm-0.4.0.orig/pam/lxdm
-+++ lxdm-0.4.0/pam/lxdm
-@@ -5,5 +5,5 @@ account    include	system-auth
- session    optional	pam_keyinit.so force revoke
- session    include	system-auth
- session    required	pam_loginuid.so
--session    optional	pam_console.so
-+#session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
deleted file mode 100644
index c7df391b1040..000000000000
--- a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/pam/lxdm	2011-12-05 17:30:39.749064359 -0600
-+++ b/pam/lxdm	2011-12-05 17:31:19.355569211 -0600
-@@ -7,3 +7,4 @@
- session    required	pam_loginuid.so
- #session    optional	pam_console.so
- session    optional	pam_gnome_keyring.so auto_start
-+session	   optional	pam_selinux.so
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
deleted file mode 100644
index dee61e5e169a..000000000000
--- a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-WANT_AUTOMAKE="1.12" #493996
-inherit eutils autotools systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-
-IUSE="consolekit debug gtk3 nls pam"
-
-RDEPEND="consolekit? ( sys-auth/consolekit )
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# There is consolekit
-	epatch "${FILESDIR}/${P}-pam_console-disable.patch"
-	# Fix null pointer dereference, backported from git
-	epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
-
-	epatch "${FILESDIR}"/${P}-configure-add-pam.patch
-
-	# 403999
-	epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
-
-	# 412025
-	epatch "${FILESDIR}"/${P}-event-check.patch
-
-	# 393329 Selinux support
-	epatch "${FILESDIR}"/${P}-selinux-support.patch
-
-	# See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
-	epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch"
-
-	# Optional Consolekit support. bug #443666
-	epatch "${FILESDIR}"/${P}-optional-consolekit.patch
-
-	# 469512
-	epatch "${FILESDIR}"/${P}-fix-optional-pam.patch
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		$(use_enable consolekit) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README TODO || die
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	echo
-	elog "Take into consideration that LXDM is in the early stages of development!"
-	echo
-}
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
index 84313549ca12..02ca951d5afd 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 
 IUSE="consolekit debug gtk3 nls pam"
 
diff --git a/lxde-base/lxdm/lxdm-0.5.3.ebuild b/lxde-base/lxdm/lxdm-0.5.3.ebuild
deleted file mode 100644
index 8e94e8c3fe9e..000000000000
--- a/lxde-base/lxdm/lxdm-0.5.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools systemd
-
-DESCRIPTION="LXDE Display Manager"
-HOMEPAGE="https://wiki.lxde.org/en/LXDM"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-IUSE="consolekit debug gtk3 nls pam"
-
-RDEPEND="consolekit? ( sys-auth/consolekit )
-	x11-libs/libxcb
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig"
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	# Upstream bug, tarball contains pre-made lxdm.conf
-	rm "${S}"/data/lxdm.conf || die
-
-	# Fix consolekit and selinux
-	eapply "${FILESDIR}/${P}-pam_console-disable.patch"
-
-	eapply_user
-
-	# this replaces the bootstrap/autogen script in most packages
-	eautoreconf
-
-	# process LINGUAS
-	if use nls; then
-		einfo "Running intltoolize ..."
-		intltoolize --force --copy --automake || die
-		strip-linguas -i "${S}/po" || die
-	fi
-}
-src_configure() {
-	econf	--enable-password \
-		--with-x \
-		--with-xconn=xcb \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
-		$(use_enable consolekit) \
-		$(use_enable gtk3) \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_with pam)
-}
-
-src_install() {
-	default_src_install
-
-	#Use Gentoo specific Xsession startup file
-	exeinto /etc/${PN}
-	doexe "${FILESDIR}"/Xsession
-}