Removing Gnome 2.14 and some other old versions that are security vulnerable

(Portage version: 2.1.3.4)

11 files changed, 6 insertions, 936 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 6cffc9573f01..b6fb69a93796 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.230 2007/08/11 15:31:08 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.231 2007/08/11 20:03:04 leio Exp $
+
+  11 Aug 2007; Mart Raudsepp <leio@gentoo.org> -gdm-2.14.9-r1.ebuild,
+  -gdm-2.14.11.ebuild, -gdm-2.16.6.ebuild, -gdm-2.18.2.ebuild,
+  -gdm-2.18.3.ebuild:
+  Removing Gnome 2.14 and some other old versions that are security vulnerable
 
   11 Aug 2007; Andrej Kacian <ticho@gentoo.org> gdm-2.18.4.ebuild:
   Stable on x86.
diff --git a/gnome-base/gdm/files/digest-gdm-2.14.11 b/gnome-base/gdm/files/digest-gdm-2.14.11
deleted file mode 100644
index d92788f56ffe..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.14.11
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 fe821639889fecf6e8bf4faa5c03ecb4 gdm-2.14.11.tar.bz2 3045508
-RMD160 7f5ef00aeb3226ff614b6f8ec6944d50ddeb199f gdm-2.14.11.tar.bz2 3045508
-SHA256 2b20e1ca43f4359aee319a9b9af7c41d2f8b9559601843378aee1f94d83dc9a2 gdm-2.14.11.tar.bz2 3045508
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
-RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
-SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/files/digest-gdm-2.14.9-r1 b/gnome-base/gdm/files/digest-gdm-2.14.9-r1
deleted file mode 100644
index a4f7e106abb4..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.14.9-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7e46bc3b0a5b08e79f1f2f1b869caf40 gdm-2.14.9.tar.bz2 3046665
-RMD160 f043ed11a8b174556b114e52dc50daa5432e68bb gdm-2.14.9.tar.bz2 3046665
-SHA256 0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2 gdm-2.14.9.tar.bz2 3046665
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
-RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
-SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.6 b/gnome-base/gdm/files/digest-gdm-2.16.6
deleted file mode 100644
index 1a893c3a7267..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.16.6
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d05f703691d690525f282cf6752bb675 gdm-2.16.6.tar.bz2 3147211
-RMD160 2f7de457f91d55f6e8334e7de30e7444f9a9b614 gdm-2.16.6.tar.bz2 3147211
-SHA256 e5db0cfdbebe860a9fcb68897aebc95d0bda3dc77ef8150a68f58a247d0fca5c gdm-2.16.6.tar.bz2 3147211
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
-RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
-SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/files/digest-gdm-2.18.2 b/gnome-base/gdm/files/digest-gdm-2.18.2
deleted file mode 100644
index 5b843d78bd00..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.18.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 40c8e0cef366ac225a7bf47178c2a7d0 gdm-2.18.2.tar.bz2 3565382
-RMD160 6c93d113a93885362c37bbe8f5cd58481dd395f4 gdm-2.18.2.tar.bz2 3565382
-SHA256 f8ea840888e1d76937579e20ed43ee9e3bbade3b73a4a341da0baa2cb3c6b6e9 gdm-2.18.2.tar.bz2 3565382
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
-RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
-SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/files/digest-gdm-2.18.3 b/gnome-base/gdm/files/digest-gdm-2.18.3
deleted file mode 100644
index 43985eaf1123..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.18.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 08555fce34d247062625c1a451a4d5a6 gdm-2.18.3.tar.bz2 3461043
-RMD160 4c55bb00a7c62cfa23e1edf3211a198222e89c07 gdm-2.18.3.tar.bz2 3461043
-SHA256 35f74e99b3e75c5fa0857e646b1f15d6178b978fa5951b46b09077ff4081e1b1 gdm-2.18.3.tar.bz2 3461043
-MD5 a23df5fecb624744c016ad2fe8ebe5e8 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 gdm-2.8-gentoo-files-r2.tar.bz2 3101
-SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e gdm-2.8-gentoo-files-r2.tar.bz2 3101
-MD5 146b311aea6ca3b6b9bdbe551cb7c0ae gentoo-gdm-theme-r3.tar.bz2 411703
-RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 gentoo-gdm-theme-r3.tar.bz2 411703
-SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 gentoo-gdm-theme-r3.tar.bz2 411703
diff --git a/gnome-base/gdm/gdm-2.14.11.ebuild b/gnome-base/gdm/gdm-2.14.11.ebuild
deleted file mode 100644
index 9dd7dc44f0ba..000000000000
--- a/gnome-base/gdm/gdm-2.14.11.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.14.11.ebuild,v 1.8 2007/07/22 10:26:16 graaff Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
-IUSE="accessibility ipv6 pam selinux tcpd xinerama"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-RDEPEND="pam? ( virtual/pam )
-	!pam? ( sys-apps/shadow )
-	>=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-1.99.2
-	>=gnome-base/libgnomecanvas-1.109
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg
-	accessibility? ( x11-libs/libXevie )"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README README.install TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--sysconfdir=/etc/X11             \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(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 \
-			--enable-authentication-scheme=shadow"
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}"/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch "${FILESDIR}"/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
-
-	gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in
-}
-
-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
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf ${D}/etc/pam.d
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	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
-
-	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."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	elog "To remove GDM from startup please execute"
-	elog "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.14.9-r1.ebuild b/gnome-base/gdm/gdm-2.14.9-r1.ebuild
deleted file mode 100644
index f48995d59e80..000000000000
--- a/gnome-base/gdm/gdm-2.14.9-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.14.9-r1.ebuild,v 1.14 2007/07/22 10:26:16 graaff Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="accessibility ipv6 pam selinux tcpd xinerama"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-RDEPEND="pam? ( virtual/pam )
-	!pam? ( sys-apps/shadow )
-	>=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-1.99.2
-	>=gnome-base/libgnomecanvas-1.109
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg
-	accessibility? ( x11-libs/libXevie )"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README README.install TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		--sysconfdir=/etc/X11             \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(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 \
-			--enable-authentication-scheme=shadow"
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}"/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch "${FILESDIR}"/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
-
-	gnome2_omf_fix docs/*/Makefile.in docs/Makefile.in
-}
-
-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
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf ${D}/etc/pam.d
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	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
-
-	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."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	elog "To remove GDM from startup please execute"
-	elog "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.16.6.ebuild b/gnome-base/gdm/gdm-2.16.6.ebuild
deleted file mode 100644
index 73f04b128585..000000000000
--- a/gnome-base/gdm/gdm-2.16.6.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.16.6.ebuild,v 1.3 2007/07/15 05:15:41 mr_bones_ Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility ipv6 pam selinux tcpd xinerama"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-RDEPEND="pam? ( virtual/pam )
-	!pam? ( kernel_linux? ( sys-apps/shadow ) )
-	>=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg
-	accessibility? ( x11-libs/libXevie )"
-
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	x11-libs/gksu
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--sysconfdir=/etc/X11         \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(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 \
-			--enable-authentication-scheme=shadow"
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch ${FILESDIR}/${PN}-2.13.0.7-gdm-dmx-intllibs.patch
-
-	# Add gksu to gdmsetup menu entry
-	epatch ${FILESDIR}/${PN}-2.16.2-gksu.patch
-}
-
-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
-
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf ${D}/etc/pam.d
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-}
-
-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 [ -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
-
-	elog "To remove GDM from startup please execute"
-	elog "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.18.2.ebuild b/gnome-base/gdm/gdm-2.18.2.ebuild
deleted file mode 100644
index b62c2a4431e6..000000000000
--- a/gnome-base/gdm/gdm-2.18.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.2.ebuild,v 1.6 2007/08/11 15:06:00 ticho Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
-IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="pam?	(
-					virtual/pam
-					sys-auth/consolekit
-				)
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	>=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/dbus-glib-0.71
-	accessibility? ( x11-libs/libXevie )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	sys-devel/gettext
-	app-admin/eselect
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--sysconfdir=/etc/X11         \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(use_with selinux)               \
-		$(use_with tcpd tcp-wrappers)     \
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam \
-						  --with-console-kit=yes"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no \
-						  --with-console-kit=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_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch ${FILESDIR}/${PN}-2.18.0-gdm-dmx-intllibs.patch
-}
-
-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
-
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf ${D}/etc/pam.d
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# 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/rc.conf"
-	elog "and then execute 'rc-update add xdm default'."
-	elog
-	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
-	elog "See README.install for more information about the change."
-	elog
-
-	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/gdm-2.18.3.ebuild b/gnome-base/gdm/gdm-2.18.3.ebuild
deleted file mode 100644
index 80d1e3334a79..000000000000
--- a/gnome-base/gdm/gdm-2.18.3.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.18.3.ebuild,v 1.3 2007/08/06 06:09:23 kumba Exp $
-
-inherit eutils pam gnome2
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility branding ipv6 pam selinux tcpd xinerama elibc_glibc"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.8-gentoo-files-r2"
-
-SRC_URI="${SRC_URI}
-		 mirror://gentoo/${GDM_EXTRA}.tar.bz2
-		 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="pam?	(
-					virtual/pam
-					sys-auth/consolekit
-				)
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	>=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1
-	>=dev-libs/libxml2-2.4.12
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/dbus-glib-0.71
-	accessibility? ( x11-libs/libXevie )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXi
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libdmx
-	x11-libs/libXau
-	x11-apps/sessreg"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/dmxproto
-	sys-devel/gettext
-	app-admin/eselect
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.1.4"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--sysconfdir=/etc/X11         \
-		--localstatedir=/var              \
-		--with-xdmcp                      \
-		--with-pam-prefix=/etc            \
-		$(use_enable accessibility xevie) \
-		$(use_enable ipv6)                \
-		$(use_with selinux)               \
-		$(use_with tcpd tcp-wrappers)     \
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam \
-						  --with-console-kit=yes"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no \
-						  --with-console-kit=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_unpack() {
-	gnome2_src_unpack
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch
-
-	# Fix missing intllib
-	epatch ${FILESDIR}/${PN}-2.18.0-gdm-dmx-intllibs.patch
-}
-
-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
-
-	chown root:gdm ${D}/var/gdm
-	chmod 1770 ${D}/var/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${gentoodir}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${gentoodir}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -rf ${D}/etc/pam.d
-
-	dopamd ${gentoodir}/pam.d/*
-	dopamsecurity console.apps ${gentoodir}/security/console.apps/gdmsetup
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# 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/rc.conf"
-	elog "and then execute 'rc-update add xdm default'."
-	elog
-	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
-	elog "See README.install for more information about the change."
-	elog
-
-	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
-}