fix ipv6 switch

(Portage version: 2.0.51.19)

13 files changed, 27 insertions, 606 deletions

diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index b45830f58722..76b53a06b0d2 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,19 +1,23 @@
 MD5 8640b004d31ecaa1c02da4253df9d144 gdm-2.6.0.9-r1.ebuild 3240
 MD5 a7405d9c839482fff8b76a3312842a59 gdm-2.6.0.3.ebuild 3371
+MD5 a43caba5e85144e62a6d36e2df366fa6 gdm-2.6.0.9-r3.ebuild 3320
 MD5 ea62033494a3e02a75bd72d3dbd6c986 gdm-2.4.4.7-r1.ebuild 3410
 MD5 c4d34959dd6c05056e5852277f76d250 gdm-2.2.5.4-r5.ebuild 4413
 MD5 d53dd7b184e898d50c7e5cc31bfd7036 gdm-2.6.0.4-r1.ebuild 3268
 MD5 dc176d15d4147fc47f76ed34c97db7d2 gdm-2.6.0.7.ebuild 3271
 MD5 d979d4d7e5b2ec03f8384d1d8db37f1d gdm-2.4.1.7-r1.ebuild 5270
-MD5 eeac0e502b80000e26f08caeaf2e07c1 gdm-2.6.0.9.ebuild 3478
+MD5 fc3fa0cf87d098d25444624605c81347 gdm-2.6.0.9-r2.ebuild 3565
 MD5 e25b6879a55352ea087886750910eb2a ChangeLog 12361
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5c125bf4007ea485ca626cab96d4f6a7 gdm-2.6.0.6.ebuild 3243
+MD5 222144a2577237cab4e4cd9b929a1654 files/gdm-2.6.0.9-ipv6_config.patch 649
 MD5 80ecdc9dea675084c39d7d30876acf5b files/digest-gdm-2.2.5.4-r5 65
 MD5 6392095707ae98912a626cb035796255 files/digest-gdm-2.4.1.7-r1 134
 MD5 25720fd12f8eee788fc5169824a0fe7e files/digest-gdm-2.4.4.7-r1 205
 MD5 5f1a2155fb7d9ac84b228d439df56777 files/digest-gdm-2.6.0.4-r1 137
 MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r1 137
+MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r2 137
+MD5 a76a5b19c8a2d00733b6be59384612e4 files/digest-gdm-2.6.0.9-r3 137
 MD5 6d2d226ffb2ab29992376b5e2e4abe9f files/digest-gdm-2.6.0.3 205
 MD5 2f7f1a2f8ba0b8808f27f0a1f6abdcee files/digest-gdm-2.6.0.6 137
 MD5 c343d16819b3e271f74187954492a212 files/digest-gdm-2.6.0.7 137
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1 b/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1
deleted file mode 100644
index e979694dda52..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.1.7-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd45b8d069355f019c08b3964a71f342 gdm-2.4.1.7.tar.bz2 2088490
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
diff --git a/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1 b/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1
deleted file mode 100644
index 7ef6c2e96fc1..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.4.4.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a3d2f243c4f42e2542bda8cb5fb9a7c5 gdm-2.4.4.7.tar.bz2 2430455
-MD5 0ee7c7fe66dc2767d44b414e2dfc828b gentoo-gdm-theme.tar.bz2 772423
-MD5 e0dcf60fc342ed1862f0fff26da984b2 gentoo-gdm-theme-r1.tar.bz2 54186
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1 b/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1
deleted file mode 100644
index 8b9418368516..000000000000
--- a/gnome-base/gdm/files/digest-gdm-2.6.0.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3a6986217d4db2afd24fcdbf3b9af722 gdm-2.6.0.4.tar.bz2 3217512
-MD5 02d70f412218f8da910ae6f317aae4b9 gentoo-gdm-theme-r2.tar.bz2 418934
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.9 b/gnome-base/gdm/files/digest-gdm-2.6.0.9-r2
index 6e010d17c51f..6e010d17c51f 100644
--- a/gnome-base/gdm/files/digest-gdm-2.6.0.9
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.9-r2
diff --git a/gnome-base/gdm/files/digest-gdm-2.6.0.9-r1 b/gnome-base/gdm/files/digest-gdm-2.6.0.9-r3
index 6e010d17c51f..6e010d17c51f 100644
--- a/gnome-base/gdm/files/digest-gdm-2.6.0.9-r1
+++ b/gnome-base/gdm/files/digest-gdm-2.6.0.9-r3
diff --git a/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch b/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch
deleted file mode 100644
index fec686df9405..000000000000
--- a/gnome-base/gdm/files/gdm-2.4.1.7-gtk-2.4.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -uNr gdm-2.4.1.7.orig/daemon/Makefile.am gdm-2.4.1.7/daemon/Makefile.am
---- gdm-2.4.1.7.orig/daemon/Makefile.am	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/daemon/Makefile.am	2004-04-28 01:26:11.000000000 +0000
-@@ -4,11 +4,6 @@
- INCLUDES = \
- 	-I.						\
- 	-I..						\
--	-DG_DISABLE_DEPRECATED				\
--	-DGDK_DISABLE_DEPRECATED			\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DGNOME_DISABLE_DEPRECATED			\
- 	-I$(top_srcdir)/vicious-extensions		\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
- 	-DLOCALEDIR=\"$(datadir)/locale\"		\
-diff -uNr gdm-2.4.1.7.orig/daemon/Makefile.in gdm-2.4.1.7/daemon/Makefile.in
---- gdm-2.4.1.7.orig/daemon/Makefile.in	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/daemon/Makefile.in	2004-04-28 01:26:03.000000000 +0000
-@@ -151,7 +151,7 @@
- 
- DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\"
- 
--INCLUDES =  	-I.							-I..							-DG_DISABLE_DEPRECATED					-DGDK_DISABLE_DEPRECATED				-DGDK_PIXBUF_DISABLE_DEPRECATED				-DGTK_DISABLE_DEPRECATED				-DGNOME_DISABLE_DEPRECATED				-I$(top_srcdir)/vicious-extensions			-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-DLOCALEDIR=\"$(datadir)/locale\"			$(DAEMON_CFLAGS)					-DPAM_PREFIX=\"$(PAM_PREFIX)\"				$(GNOME_INCLUDEDIR)
-+INCLUDES = -I. -I.. -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\"$(datadir)/locale\" $(DAEMON_CFLAGS) -DPAM_PREFIX=\"$(PAM_PREFIX)\" $(GNOME_INCLUDEDIR)
- 
- 
- bin_PROGRAMS = gdm-binary
-diff -uNr gdm-2.4.1.7.orig/gui/Makefile.am gdm-2.4.1.7/gui/Makefile.am
---- gdm-2.4.1.7.orig/gui/Makefile.am	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/gui/Makefile.am	2004-04-28 01:27:19.000000000 +0000
-@@ -9,11 +9,6 @@
- INCLUDES = \
- 	-I.						\
- 	-I..						\
--	-DG_DISABLE_DEPRECATED				\
--	-DGDK_DISABLE_DEPRECATED			\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DGNOME_DISABLE_DEPRECATED			\
- 	-I$(top_srcdir)/daemon				\
- 	-I$(top_srcdir)/vicious-extensions		\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-diff -uNr gdm-2.4.1.7.orig/gui/Makefile.in gdm-2.4.1.7/gui/Makefile.in
---- gdm-2.4.1.7.orig/gui/Makefile.in	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/gui/Makefile.in	2004-04-28 01:27:11.000000000 +0000
-@@ -154,7 +154,7 @@
- DEFS = @DEFS@ -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" 	-DGDM_FACTORY_CONFIG_FILE=\"@sysconfdir@/gdm/factory-gdm.conf\" 	-DGDM_GLADE_DIR=\"@datadir@/gdm\"
- 
- 
--INCLUDES =  	-I.							-I..							-DG_DISABLE_DEPRECATED					-DGDK_DISABLE_DEPRECATED				-DGDK_PIXBUF_DISABLE_DEPRECATED				-DGTK_DISABLE_DEPRECATED				-DGNOME_DISABLE_DEPRECATED				-I$(top_srcdir)/daemon					-I$(top_srcdir)/vicious-extensions			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		$(GUI_CFLAGS)
-+INCLUDES = -I. -I.. -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS)
- 
- 
- noinst_LIBRARIES = libgdmwm.a libgdmlang.a
-diff -uNr gdm-2.4.1.7.orig/gui/greeter/Makefile.am gdm-2.4.1.7/gui/greeter/Makefile.am
---- gdm-2.4.1.7.orig/gui/greeter/Makefile.am	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/gui/greeter/Makefile.am	2004-04-28 01:29:06.000000000 +0000
-@@ -3,11 +3,6 @@
- ## Process this file with automake to produce makefile.in
- INCLUDES = \
- 	-I.						\
--	-DG_DISABLE_DEPRECATED				\
--	-DGDK_DISABLE_DEPRECATED			\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
--	-DGTK_DISABLE_DEPRECATED			\
--	-DGNOME_DISABLE_DEPRECATED			\
- 	-I$(top_srcdir)/gui				\
- 	-I$(top_srcdir)/daemon				\
- 	-I$(top_srcdir)/vicious-extensions		\
-diff -uNr gdm-2.4.1.7.orig/gui/greeter/Makefile.in gdm-2.4.1.7/gui/greeter/Makefile.in
---- gdm-2.4.1.7.orig/gui/greeter/Makefile.in	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/gui/greeter/Makefile.in	2004-04-28 01:28:55.000000000 +0000
-@@ -151,7 +151,7 @@
- 
- SUBDIRS = . themes
- 
--INCLUDES =  	-I.							-DG_DISABLE_DEPRECATED					-DGDK_DISABLE_DEPRECATED				-DGDK_PIXBUF_DISABLE_DEPRECATED				-DGTK_DISABLE_DEPRECATED				-DGNOME_DISABLE_DEPRECATED				-I$(top_srcdir)/gui					-I$(top_srcdir)/daemon					-I$(top_srcdir)/vicious-extensions			-DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		-DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" 		$(GREETER_CFLAGS)
-+INCLUDES = -I. -I$(top_srcdir)/gui -I$(top_srcdir)/daemon -I$(top_srcdir)/vicious-extensions -DGDM_CONFIG_FILE=\"@sysconfdir@/gdm/gdm.conf\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGREETERTHEMEDIR=\""$(datadir)/gdm/themes"\" $(GREETER_CFLAGS)
- 
- 
- bin_PROGRAMS =  	gdmgreeter
-diff -uNr gdm-2.4.1.7.orig/vicious-extensions/Makefile.am gdm-2.4.1.7/vicious-extensions/Makefile.am
---- gdm-2.4.1.7.orig/vicious-extensions/Makefile.am	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/vicious-extensions/Makefile.am	2004-04-28 01:29:52.000000000 +0000
-@@ -4,11 +4,6 @@
- INCLUDES = \
-  	-I.					\
- 	-I..					\
--	-DG_DISABLE_DEPRECATED			\
--	-DGDK_DISABLE_DEPRECATED		\
--	-DGDK_PIXBUF_DISABLE_DEPRECATED		\
--	-DGTK_DISABLE_DEPRECATED		\
--	-DGNOME_DISABLE_DEPRECATED		\
- 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- 	$(GUI_CFLAGS)
- 
-diff -uNr gdm-2.4.1.7.orig/vicious-extensions/Makefile.in gdm-2.4.1.7/vicious-extensions/Makefile.in
---- gdm-2.4.1.7.orig/vicious-extensions/Makefile.in	2004-04-28 01:24:37.000000000 +0000
-+++ gdm-2.4.1.7/vicious-extensions/Makefile.in	2004-04-28 01:29:46.000000000 +0000
-@@ -151,7 +151,7 @@
- 
- SUBDIRS = .
- 
--INCLUDES =   	-I.						-I..						-DG_DISABLE_DEPRECATED				-DGDK_DISABLE_DEPRECATED			-DGDK_PIXBUF_DISABLE_DEPRECATED			-DGTK_DISABLE_DEPRECATED			-DGNOME_DISABLE_DEPRECATED			-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	$(GUI_CFLAGS)
-+INCLUDES = -I. -I.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GUI_CFLAGS)
- 
- 
- noinst_LIBRARIES = libvicious.a libviciousui.a
diff --git a/gnome-base/gdm/files/gdm-2.6.0.9-ipv6_config.patch b/gnome-base/gdm/files/gdm-2.6.0.9-ipv6_config.patch
new file mode 100644
index 000000000000..d11adcb7bec9
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-2.6.0.9-ipv6_config.patch
@@ -0,0 +1,12 @@
+diff -uNr gdm-2.6.0.9/configure.in gdm-2.6.0.9.patched/configure.in
+--- gdm-2.6.0.9/configure.in	2005-04-12 06:35:47.000000000 +0200
++++ gdm-2.6.0.9.patched/configure.in	2005-06-05 16:35:44.000000000 +0200
+@@ -190,7 +190,7 @@
+ dnl     IPv6 specific checks
+ dnl *****************************
+ AC_MSG_CHECKING([whether to enable IPv6])
+-AC_ARG_ENABLE(enable-ipv6, [  --enable-ipv6=[yes/no] Enables compilation of IPv6 code default=[no]],, enable_ipv6=no)
++AC_ARG_ENABLE(ipv6, [  --enable-ipv6=[yes/no] Enables compilation of IPv6 code default=[no]],, enable_ipv6=no)
+ if test x$enable_ipv6 = xyes; then
+   AC_TRY_COMPILE([
+     #include <sys/types.h>
diff --git a/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild b/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild
deleted file mode 100644
index 1077dfa84892..000000000000
--- a/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.1.7-r1.ebuild,v 1.15 2005/01/08 23:57:29 slarti Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-LICENSE="GPL-2"
-IUSE="tcpd X xinerama"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2"
-MY_V="${PV%.*}"
-
-RDEPEND=">=sys-libs/pam-0.72
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	virtual/x11"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	X? ( virtual/x11
-		xinerama? ( virtual/x11 ) )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/daemon
-	cp gdm.h gdm.h.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		gdm.h.orig > gdm.h
-	rm -f gdm.h.orig
-
-	# Make Gentoo theme default
-	cd ${S}/config
-	cp gdm.conf.in gdm.conf.in.orig
-	sed -e "s:/usr/bin/X11:/usr/X11R6/bin:g" \
-		-e "s:=circles:=gentoo-emergence:" \
-		-e "s:command=/usr/X11R6/bin/X:command=/usr/X11R6/bin/X -nolisten tcp:" \
-		gdm.conf.in.orig > gdm.conf.in
-
-	rm -f gdm.conf.in.orig
-
-	cd ${S}
-	# fix gtk-2.4 build (#49185)
-	epatch ${FILESDIR}/${P}-gtk-2.4.patch
-
-}
-
-src_compile() {
-	myconf=""
-	if use X; then
-		myconf="${myconf} --with-xdmcp=yes"
-		use xinerama \
-			&& myconf="${myconf} --with-xinerama=yes" \
-			|| myconf="${myconf} --with-xinerama=no"
-	else
-		myconf="${myconf} --with-xdmcp=no --with-xinerama=no"
-	fi
-
-	use tcpd \
-		&& myconf="${myconf} --with-tcp-wrappers=yes" \
-		|| myconf="${myconf} --with-tcp-wrappers=no"
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc/X11 \
-		--localstatedir=/var/lib \
-		--with-pam-prefix=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var/lib \
-		PAM_PREFIX=${D}/etc \
-		install || die
-
-	# We need to move gdm-binary to gdm, else our xdm script
-	# have problems stopping gdm (bug #5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-
-	rm -f ${D}/etc/pam.d/gdm
-
-	# log
-	dodir /var/lib/gdm
-	chown gdm:gdm ${D}/var/lib/gdm
-	chmod 0750 ${D}/var/lib/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# gnomerc
-	dodir /etc/X11/gdm
-	exeinto /etc/X11/gdm
-	doexe ${FILESDIR}/${MY_V}/gnomerc
-
-	cd ${D}/etc/X11/gdm
-	for i in Init/Default PostSession/Default PreSession/Default gdm.conf
-	do
-		cp ${i} ${i}.orig
-		sed -e s:/usr/bin/X11:/usr/X11R6/bin:g \
-			${i}.orig > ${i}
-		rm ${i}.orig
-	done
-
-	cd ${D}/etc/X11/gdm
-	cp gdm.conf gdm.conf.orig
-
-	sed -e "s:0=/usr/X11R6/bin/X:0=/usr/X11R6/bin/X -dpi 100 -nolisten tcp dpms vt7:g" \
-	    -e "s:GtkRC=/opt/gnome/share/themes/Default/gtk/gtkrc:GtkRC=/usr/share/themes/Default/gtk/gtkrc:g" \
-	    -e "s:BackgroundColor=#007777:BackgroundColor=#2a3f5b:g" \
-	    -e "s:TitleBar=true:TitleBar=false:g" \
-		-e "s:Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:g" \
-		gdm.conf.orig > gdm.conf
-
-	rm gdm.conf.orig
-
-	keepdir /var/lib/gdm/
-
-	cd ${S}
-
-	# Support for new session stuff
-	rm -rf ${D}/etc/X11/gdm/Sessions
-	dosym ../Sessions /etc/X11/gdm/Sessions
-
-	# Make sure the users environment are set properly
-	# (bash users only though :( )
-	dosed "s:#!/bin/sh:#!/bin/bash --login:g" /etc/X11/gdm/PreSession/Default
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-}
-
-pkg_preinst() {
-	#support for new session stuff
-	if [ -d ${ROOT}/etc/X11/gdm/Sessions -a ! -L ${ROOT}/etc/X11/gdm/Sessions ]
-	then
-		mv -f ${ROOT}/etc/X11/gdm/Sessions ${ROOT}/etc/X11/gdm/Sessions.old
-	fi
-}
-
-pkg_postinst() {
-	gnome2_scrollkeeper_update
-
-	# Attempt to restart GDM softly by use of the fifo.  Wont work on older
-	# then 2.2.3.1 versions but should work nicely on later upgrades.
-	# FIXME: this is just way too complex
-	FIFOFILE="${ROOT}`grep '^ServAuthDir=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'`"
-	if [ -z "${FIFOFILE}" ]
-	then
-		FIFOFILE=${ROOT}/var/lib/gdm/.gdmfifo
-	else
-		FIFOFILE=${FIFOFILE}/.gdmfifo
-	fi
-	PIDFILE="${ROOT}`grep '^PidFile=' ${ROOT}/etc/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'`"
-	if [ -z "${PIDFILE}" ]
-	then
-		PIDFILE=${ROOT}/var/run/gdm.pid
-	fi
-	if [ -w ${FIFOFILE} ]
-	then
-		if [ -f ${PIDFILE} ]
-		then
-			if kill -0 `cat ${PIDFILE}`
-			then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-
-	# Unmerge nukes sometimes
-	if [ ! -d ${ROOT}/var/lib/gdm ]
-	then
-		mkdir -p ${ROOT}/var/lib/gdm
-		chown gdm:gdm ${ROOT}/var/lib/gdm
-		chmod 0750 ${ROOT}/var/lib/gdm
-	fi
-
-	echo ""
-	einfo "To make GDM start at boot, edit /etc/rc.conf (or /etc/conf.d/basic)"
-	einfo "and then execute 'rc-update add xdm default'."
-}
-
-pkg_postrm() {
-	gnome2_scrollkeeper_update
-
-	echo ""
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-}
diff --git a/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild b/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild
deleted file mode 100644
index 00fd00d53e06..000000000000
--- a/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.4.4.7-r1.ebuild,v 1.13 2005/01/08 23:57:29 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.jirka.org/gdm.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64 mips ~ppc64"
-IUSE="tcpd xinerama selinux"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme.tar.bz2
-	mirror://gentoo/gentoo-gdm-theme-r1.tar.bz2"
-MY_V="${PV%.*}"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=x11-libs/gtk+-2
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-G2CONF="${G2CONF} \
-	--sysconfdir=/etc/X11 \
-	--with-pam-prefix=/etc \
-	--with-xdmcp \
-	`use_with tcpd tcp-wrappers` \
-	`use_with xinerama` \
-	`use_with selinux`"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-${MY_V}-selinux_remove_attr.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install PAM_PREFIX=${D}/etc sysconfdir=${D}/etc/X11
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-	dosym /usr/bin/gdm /usr/bin/gdm-binary
-
-	# log, etc.
-	dodir /var/lib/gdm
-	chown gdm:gdm ${D}/var/lib/gdm
-	chmod 750 ${D}/var/lib/gdm
-
-	# use our own session script
-	rm -f ${D}/etc/X11/gdm/Xsession
-	exeinto /etc/X11/gdm
-	doexe ${FILESDIR}/${MY_V}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${FILESDIR}/${MY_V}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -f ${D}/etc/pam.d/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
-	# use Gentoo theme
-	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
-
-	# kn_IN segfaults when using the language selector on sparc
-	use sparc && dosed "s:Kannada:#Kannada:" /etc/X11/gdm/locale.alias
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-cow  ${D}/usr/share/gdm/themes
-	mv ${WORKDIR}/gentoo-emergence  ${D}/usr/share/gdm/themes
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	FIFOFILE=/var/lib/gdm/.gdminfo
-	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
-
-	einfo "To make GDM start at boot, edit /etc/rc.conf"
-	einfo "and then execute 'rc-update add xdm default'."
-
-}
-
-pkg_postrm() {
-
-	gnome2_pkg_postrm
-
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-
-}
diff --git a/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild b/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild
deleted file mode 100644
index affd911b0df6..000000000000
--- a/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.4-r1.ebuild,v 1.7 2005/01/08 23:57:29 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME2 Display Manager"
-HOMEPAGE="http://www.jirka.org/gdm.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE="tcpd xinerama selinux"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-gdm-theme-r2.tar.bz2"
-MY_V="${PV%.*}"
-
-RDEPEND=">=sys-libs/pam-0.72
-	>=x11-libs/pango-1.4.1
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/libglade-2
-	>=gnome-base/librsvg-2
-	>=media-libs/libart_lgpl-2.3.11
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	selinux? ( sys-libs/libselinux )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	>=app-text/scrollkeeper-0.3.11
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-G2CONF="${G2CONF} \
-	--sysconfdir=/etc/X11 \
-	--localstatedir=/var \
-	--with-pam-prefix=/etc \
-	--with-xdmcp \
-	`use_with tcpd tcp-wrappers` \
-	`use_with xinerama` \
-	`use_with selinux`"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# remove unneeded linker directive for selinux (#41022)
-	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install \
-		PAM_PREFIX=${D}/etc \
-		sysconfdir=${D}/etc/X11 \
-		localstatedir=${D}/var
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f ${D}/usr/bin/gdm
-	mv ${D}/usr/bin/gdm-binary ${D}/usr/bin/gdm
-	dosym /usr/bin/gdm /usr/bin/gdm-binary
-
-	# 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 ${FILESDIR}/${MY_V}/Xsession
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe ${FILESDIR}/${MY_V}/custom.desktop
-
-	# We replace the pam stuff by our own
-	rm -f ${D}/etc/pam.d/gdm
-
-	# pam startup
-	dodir /etc/pam.d
-	insinto /etc/pam.d
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm
-	doins ${FILESDIR}/${MY_V}/pam.d/gdmconfig
-	doins ${FILESDIR}/${MY_V}/pam.d/gdm-autologin
-
-	# pam security
-	dodir /etc/security/console.apps
-	insinto /etc/security/console.apps
-	doins ${FILESDIR}/${MY_V}/security/console.apps/gdmconfig
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/bin/gdmlogin:Greeter=/usr/bin/gdmgreeter:" /etc/X11/gdm/gdm.conf
-	# use Gentoo theme
-	dosed "s:#GraphicalTheme=circles:GraphicalTheme=gentoo-cow:" /etc/X11/gdm/gdm.conf
-
-	# Move Gentoo theme in
-	mv ${WORKDIR}/gentoo-*  ${D}/usr/share/gdm/themes
-
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
-
-}
-
-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
-
-	einfo "To make GDM start at boot, edit /etc/rc.conf"
-	einfo "and then execute 'rc-update add xdm default'."
-
-}
-
-pkg_postrm() {
-
-	gnome2_pkg_postrm
-
-	einfo "To remove GDM from startup please execute"
-	einfo "'rc-update del xdm default'"
-
-}
diff --git a/gnome-base/gdm/gdm-2.6.0.9.ebuild b/gnome-base/gdm/gdm-2.6.0.9-r2.ebuild
index fa7082bcee73..c522aa405e06 100644
--- a/gnome-base/gdm/gdm-2.6.0.9.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9.ebuild,v 1.1 2005/04/25 22:27:42 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9-r2.ebuild,v 1.1 2005/06/05 15:05:46 foser Exp $
 
 inherit gnome2 eutils
 
@@ -55,6 +55,10 @@ src_unpack() {
 	cd ${S}
 	# remove unneeded linker directive for selinux (#41022)
 	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+	# fix ipv6 flag (#90991)
+	epatch ${FILESDIR}/${P}-ipv6_config.patch
+
+	autoconf || die
 
 }
 
diff --git a/gnome-base/gdm/gdm-2.6.0.9-r1.ebuild b/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild
index 7398b15f7665..f84c136e44bf 100644
--- a/gnome-base/gdm/gdm-2.6.0.9-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9-r1.ebuild,v 1.1 2005/06/03 22:14:47 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.6.0.9-r3.ebuild,v 1.1 2005/06/05 15:05:46 foser Exp $
 
 inherit gnome2 eutils pam
 
@@ -55,6 +55,10 @@ src_unpack() {
 	cd ${S}
 	# remove unneeded linker directive for selinux (#41022)
 	epatch ${FILESDIR}/${PN}-2.4.4-selinux_remove_attr.patch
+	# fix ipv6 config
+	epatch ${FILESDIR}/${P}-ipv6_config.patch
+
+	autoconf || die
 
 }