Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

13 files changed, 11 insertions, 539 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 30bc38e81206..3505bd76d8a2 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.410 2014/09/29 15:05:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.411 2014/11/13 11:16:52 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/49-keychain,
+  -files/50-ssh-agent, -files/gdm-2.13.0.1-selinux-remove-attr.patch,
+  -files/gdm-2.20.10-custom-session.patch,
+  -files/gdm-2.20.10-desktop-session-dmrc-autologin.patch,
+  -files/gdm-2.20.10-gdmsetup-24hr-combo.patch,
+  -files/gdm-2.20.10-xinitrc-ssh-agent.patch,
+  -files/gdm-2.20.11-underlinking.patch, -files/gdm-2.20.2-gksu.patch,
+  -files/gdm-2.20.9-parallel-make.patch, -gdm-2.20.11-r1.ebuild, metadata.xml:
+  Drop old (#508854)
 
   29 Sep 2014; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.12.2.ebuild,
   gdm-3.12.2-r1.ebuild:
diff --git a/gnome-base/gdm/files/49-keychain b/gnome-base/gdm/files/49-keychain
deleted file mode 100644
index 77310b2a7461..000000000000
--- a/gnome-base/gdm/files/49-keychain
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# source keychain variables
-
-keychain="`which keychain`"
-if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ]
-then
-	. "${HOME}/.bash_profile"
-fi
diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent
deleted file mode 100644
index 28af2672c794..000000000000
--- a/gnome-base/gdm/files/50-ssh-agent
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# add ssh-agent if found
-
-sshagent="`which ssh-agent`"
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-	command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
-	echo "$0: ssh-agent not found!"
-fi
diff --git a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch b/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
deleted file mode 100644
index 7af2f9a18ffc..000000000000
--- a/gnome-base/gdm/files/gdm-2.13.0.1-selinux-remove-attr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure gdm-2.13.0.1/configure
---- gdm-2.13.0.1.orig/configure	2005-11-14 17:34:33.000000000 -0500
-+++ gdm-2.13.0.1/configure	2005-11-18 14:59:31.000000000 -0500
-@@ -31700,7 +31700,7 @@
- #define HAVE_SELINUX 1
- _ACEOF
- 
--	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
- fi
- 
- #
-diff --exclude-from=/home/dang/.diffrc -u -ruN gdm-2.13.0.1.orig/configure.ac gdm-2.13.0.1/configure.ac
---- gdm-2.13.0.1.orig/configure.ac	2005-11-14 17:13:40.000000000 -0500
-+++ gdm-2.13.0.1/configure.ac	2005-11-18 14:59:23.000000000 -0500
-@@ -750,7 +750,7 @@
- 	AC_CHECK_LIB(selinux,setexeccon,/bin/true)
- 	AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
- 	AC_DEFINE(HAVE_SELINUX)
--	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
-+	EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
- fi
- 
- #
diff --git a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch b/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch
deleted file mode 100644
index b1f70c00cb54..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-custom-session.patch
+++ /dev/null
@@ -1,42 +0,0 @@
----
- fix custom sessions (see bug #216984, work done by Gilles, I'm just committing)
-
- config/Xsession.in |   18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-Index: b/config/Xsession.in
-===================================================================
---- a/config/Xsession.in
-+++ b/config/Xsession.in
-@@ -177,15 +177,6 @@ if [ -n "$GDM_LANG" ]; then
-   fi
- fi
- 
--# run all system xinitrc shell scripts.
--if [ -d /etc/X11/xinit/xinitrc.d ]; then
--    for i in /etc/X11/xinit/xinitrc.d/* ; do
--        if [ -x "$i" ]; then
--	    . "$i"
--        fi
--    done
--fi
--
- if [ "x$command" = "xcustom" ] ; then
-   if [ -x "$HOME/.xsession" ]; then
-     command="$HOME/.xsession"
-@@ -213,6 +204,15 @@ if [ "x$command" = "xdefault" ] ; then
-   fi
- fi
- 
-+# run all system xinitrc shell scripts.
-+if [ -d /etc/X11/xinit/xinitrc.d ]; then
-+    for i in /etc/X11/xinit/xinitrc.d/* ; do
-+        if [ -x "$i" ]; then
-+	    . "$i"
-+        fi
-+    done
-+fi
-+
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
diff --git a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch b/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
deleted file mode 100644
index 1c7b674382f5..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-desktop-session-dmrc-autologin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Fabio Erculiani <lxnay@sabayonlinux.org>
-Date: Fri, 08 Aug 2009 09:19 +0000
-Subject: Fix DESTOP_SESSION when dmrc is empty and autologin enabled.
-
----
- daemon/slave.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/daemon/slave.c b/daemon/slave.c
-index b52774d..ced9567 100644
---- a/daemon/slave.c
-+++ b/daemon/slave.c
-@@ -4638,10 +4638,6 @@ gdm_slave_session_start (void)
- 		language = g_strdup (usrlang);
- 	}
- 
--	tmp = gdm_strip_extension (session, ".desktop");
--	g_free (session);
--	session = tmp;
--
- 	if (ve_string_empty (session)) {
- 		g_free (session);
- 		session = find_a_session ();
-@@ -4651,6 +4647,10 @@ gdm_slave_session_start (void)
- 		}
- 	}
- 
-+	tmp = gdm_strip_extension (session, ".desktop");
-+	g_free (session);
-+	session = tmp;
-+
- 	if G_LIKELY (ve_string_empty (language)) {
- 		g_free (language);
- 		language = NULL;
diff --git a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch b/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch
deleted file mode 100644
index 327d8e6fec90..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-gdmsetup-24hr-combo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gdm/+bug/256283
-# Description: Fix 24 hour combo box in gdmsetup
-#
-Index: gdm-2.20.10/gui/gdmsetup.c
-===================================================================
---- gdm-2.20.10.orig/gui/gdmsetup.c	2009-04-03 14:17:35.000000000 +1100
-+++ gdm-2.20.10/gui/gdmsetup.c	2009-04-03 14:17:45.000000000 +1100
-@@ -1529,11 +1529,11 @@
- 		val     = gdm_config_get_string ((gchar *)key);
- 
- 		if (new_val) {
--                    if (strcmp (_(new_val), _("auto"))) {
-+                    if (strcmp (_(new_val), _("auto")) == 0) {
-                        if (strcasecmp (ve_sure_string (val), "auto") != 0)
-                           gdm_setup_config_set_string (key, "auto");
-                     }
--                    else if (strcmp (_(new_val), _("yes"))) {
-+                    else if (strcmp (_(new_val), _("yes")) == 0) {
-                        if (strcasecmp (ve_sure_string (val), "true") != 0 &&
-                            strcasecmp (ve_sure_string (val), "yes") != 0)
-                           gdm_setup_config_set_string (key, "true");
diff --git a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch
deleted file mode 100644
index 8d20d1c1c671..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.10-xinitrc-ssh-agent.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- ssh-agent really needs to be handled by xinitrc like other agents.
- Gentoo bug: 220603
-
- config/Xsession.in |    8 --------
- 1 file changed, 8 deletions(-)
-
-Index: b/config/Xsession.in
-===================================================================
---- a/config/Xsession.in
-+++ b/config/Xsession.in
-@@ -213,14 +213,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-     done
- fi
- 
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--    command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
--    echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
- 
- eval exec $command
diff --git a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch b/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
deleted file mode 100644
index f7accccf3a46..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.11-underlinking.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=496914
-
-diff --git a/configure.ac b/configure.ac
-index 3da7f33..8a0eedf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,6 +160,9 @@ AC_CHECK_TYPE(socklen_t,,
- 
- AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout])
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- dnl checks needed for Darwin compatibility to linux **environ.
- AC_CHECK_HEADERS(crt_externs.h)
- AC_CHECK_FUNCS(_NSGetEnviron)
-diff --git a/gui/Makefile.am b/gui/Makefile.am
-index 577dc9f..3334381 100644
---- a/gui/Makefile.am
-+++ b/gui/Makefile.am
-@@ -123,6 +123,7 @@ gdmchooser_LDADD = \
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
- 	$(XDMCP_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
- 	$(NULL)
-@@ -143,8 +144,10 @@ gdmlogin_LDADD = \
- 	$(X_EXTRA_LIBS)		\
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
-+	$(LIBM)			\
- 	$(NULL)
- 
- # LIBGNOMEUI should be removed from gdmsetup at some point.
-@@ -183,6 +186,7 @@ gdmphotosetup_LDADD = \
- 	$(INTLLIBS)		\
- 	$(EXTRA_SOCKET_LIB)	\
- 	$(EXTRA_NSL_LIB)	\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig		\
- 	$(top_builddir)/common/libgdmcommon.a \
-diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
-index fd0f500..7b9840d 100644
---- a/gui/greeter/Makefile.am
-+++ b/gui/greeter/Makefile.am
-@@ -91,6 +91,7 @@ gdmgreeter_LDADD = \
- 	$(X_EXTRA_LIBS)		\
- 	$(XINERAMA_LIBS)	\
- 	$(X_LIBS)		\
-+	-lXau			\
- 	-lX11			\
- 	-lfontconfig
- 
diff --git a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch b/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
deleted file mode 100644
index 388917708047..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.2-gksu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in gdm-2.20.2/gui/gdmsetup.desktop.in.in
---- gdm-2.20.2.orig/gui/gdmsetup.desktop.in.in	2007-11-26 18:11:04.000000000 -0500
-+++ gdm-2.20.2/gui/gdmsetup.desktop.in.in	2007-11-29 11:40:38.000000000 -0500
-@@ -3,7 +3,7 @@ Encoding=UTF-8
- _Name=Login Window
- _Comment=Configure GDM login window appearance and behavior
- TryExec=@sbindir@/gdmsetup
--Exec=@sbindir@/gdmsetup
-+Exec=gksu @sbindir@/gdmsetup
- Icon=gdmsetup
- StartupNotify=true
- Terminal=false
diff --git a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch b/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
deleted file mode 100644
index 3327e967d51f..000000000000
--- a/gnome-base/gdm/files/gdm-2.20.9-parallel-make.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/gui/Makefile.am	2009-01-04 16:51:19.000000000 +0100
-+++ b/gui/Makefile.am	2009-01-04 16:52:10.000000000 +0100
-@@ -263,7 +263,7 @@
- Gladedir = $(datadir)/gdm
- Glade_DATA = gdmsetup.glade gdmchooser.glade gdmphotosetup.glade
- 
--install-data-local:
-+install-data-hook:
- 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
- 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
- 
---- a/gui/Makefile.in	2009-01-04 16:51:39.000000000 +0100
-+++ b/gui/Makefile.in	2009-01-04 16:52:52.000000000 +0100
-@@ -1222,7 +1225,9 @@
- info-am:
- 
- install-data-am: install-GladeDATA install-SettingsDATA \
--	install-SystemDATA install-data-local
-+	install-SystemDATA
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-dvi: install-dvi-recursive
- 
-@@ -1275,7 +1280,7 @@
- 	html-am info info-am install install-GladeDATA \
- 	install-SettingsDATA install-SystemDATA install-am \
- 	install-binPROGRAMS install-data install-data-am \
--	install-data-local install-dvi install-dvi-am install-exec \
-+	install-data-hook install-dvi install-dvi-am install-exec \
- 	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-libexecPROGRAMS install-man \
- 	install-pdf install-pdf-am install-ps install-ps-am \
-@@ -1295,7 +1300,7 @@
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--install-data-local:
-+install-data-hook:
- 	-test -z "$(DESTDIR)$(bindir)/gdmXnest" || rm -f $(DESTDIR)$(bindir)/gdmXnest
- 	$(LN_S) -f gdmXnestchooser $(DESTDIR)$(bindir)/gdmXnest
- 
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
deleted file mode 100644
index 4e8bb36ef129..000000000000
--- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.12 2014/01/03 20:13:17 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils pam gnome2 user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=x11-libs/gtk+-2.6:2
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2:2.0
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1:2
-	>=dev-libs/libxml2-2.4.12:2
-	>=media-libs/libart_lgpl-2.3.11
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3"
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		--disable-static
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with accessibility xevie)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
-
-	# Make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
-
-	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
-	# does not contain any relevant data and autologin enabled, bug #281442
-	epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch"
-
-	# Fix 24 hour combo box in gdmsetup, bug #301151
-	# patch imported from ubuntu mirrors
-	epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Underlinking for libXau, libm; bug #496914
-	epatch "${FILESDIR}/${P}-underlinking.patch"
-	rm missing || die # old version in tarball
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain"
-	doexe "${FILESDIR}/50-ssh-agent"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	sed -i -e "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		"${D}"/usr/share/gdm/defaults.conf || die
-
-	# list available users
-	sed -i -e "s:^#MinimalUID=.*:MinimalUID=1000:" "${D}"/usr/share/gdm/defaults.conf || die
-	sed -i -e "s:^#IncludeAll=.*:IncludeAll=true:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Fix old X11R6 paths
-	sed -i -e "s:/usr/X11R6/bin:/usr/bin:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Use Clearlooks as default theme, bug #268496
-	sed -i -e "s:#GtkTheme=Default:GtkTheme=Clearlooks:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Wait more before assuming Xserver is defunct, bug #378765
-	sed -i -e "s:GdmXserverTimeout=10:GdmXserverTimeout=25:" "${D}"/usr/share/gdm/defaults.conf || die
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [ "$(rc-config list default | grep xdm)" != "" ] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index ded957cd0f30..78fb7ea43f02 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -4,13 +4,9 @@
 <herd>gnome</herd>
 <use>
 	<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
-	<flag name="consolekit">Allow proper handling of removable media according
-		to who is actually present on the machine.</flag>
-	<flag name="dmx">Enables Distributed Multihead X (DMX) support</flag>
 	<flag name="fprint">Enables experimental fingerprint authentication using
 		<pkg>sys-auth/fprintd</pkg></flag>
 	<flag name="plymouth">Enable support for smooth transition from
 		<pkg>sys-boot/plymouth</pkg></flag>
-	<flag name="remote">Enables support for secure remote connections</flag>
 </use>
 </pkgmetadata>