security bumps for 2.16 and 2.18 series, see bug #187919

Package-Manager: portage-2.1.3.3

6 files changed, 418 insertions, 5 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index d1f241b4130f..282f94c06510 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,16 @@
 # 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.217 2007/08/06 06:09:23 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.218 2007/08/06 16:19:42 eva Exp $
+
+*gdm-2.18.4 (06 Aug 2007)
+
+  06 Aug 2007; Gilles Dartiguelongue <eva@gentoo.org> +gdm-2.18.4.ebuild:
+  Version bump for the 2.18 series, security bug 187919
+
+*gdm-2.16.7 (06 Aug 2007)
+
+  06 Aug 2007; Gilles Dartiguelongue <eva@gentoo.org> +gdm-2.16.7.ebuild:
+  Version bump for the 2.16 series, security bug 187919
 
   06 Aug 2007; Joshua Kinard <kumba@gentoo.org> gdm-2.18.3.ebuild:
   Marked unstable on mips.
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index e782252e1ae4..e854f584b09c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -18,8 +18,10 @@ DIST gdm-2.14.11.tar.bz2 3045508 RMD160 7f5ef00aeb3226ff614b6f8ec6944d50ddeb199f
 DIST gdm-2.14.9.tar.bz2 3046665 RMD160 f043ed11a8b174556b114e52dc50daa5432e68bb SHA1 264eaa09874a930c4080f903f43631dbf621e111 SHA256 0483dac71c88ca0da5ee85729c0c1dd6793d928109ac79ad56583aa1a5ff43d2
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.16.6.tar.bz2 3147211 RMD160 2f7de457f91d55f6e8334e7de30e7444f9a9b614 SHA1 54ae97955d5b84d764d8ce5e183888481ff78c8d SHA256 e5db0cfdbebe860a9fcb68897aebc95d0bda3dc77ef8150a68f58a247d0fca5c
+DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.18.2.tar.bz2 3565382 RMD160 6c93d113a93885362c37bbe8f5cd58481dd395f4 SHA1 eec572827fd8356d6d231f28e20d4b8e2a6c1048 SHA256 f8ea840888e1d76937579e20ed43ee9e3bbade3b73a4a341da0baa2cb3c6b6e9
 DIST gdm-2.18.3.tar.bz2 3461043 RMD160 4c55bb00a7c62cfa23e1edf3211a198222e89c07 SHA1 e3285fafe563a1ca1708d067478cfcd6e63acef2 SHA256 35f74e99b3e75c5fa0857e646b1f15d6178b978fa5951b46b09077ff4081e1b1
+DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.14.11.ebuild 4481 RMD160 915ebea21266adb57c9ece2b0ced77a6eebdea2a SHA1 a4eb5efd729488aaaf843e838409dfc0e88f5eed SHA256 e2a57fb6eabc514c7b750e394a32e38f2a5d81c496cc14a8fb698d860a176339
@@ -38,6 +40,10 @@ EBUILD gdm-2.16.6.ebuild 4843 RMD160 0924925da3b66f31ef7381882a8b526677b03ad1 SH
 MD5 d075d9d5fa5479aac32fcef4c98608d3 gdm-2.16.6.ebuild 4843
 RMD160 0924925da3b66f31ef7381882a8b526677b03ad1 gdm-2.16.6.ebuild 4843
 SHA256 8c5168c607ef46ee8d5b40397e0ae54885e1250c4714b61ae50050daa1f13c5a gdm-2.16.6.ebuild 4843
+EBUILD gdm-2.16.7.ebuild 4837 RMD160 f4b193f0d178769e6628f102e929ec66b1264f69 SHA1 cfb73c9756ec12a29ca77ffb2e98ed5ab2742197 SHA256 20f7cbb035dd649cab184d4e23c81511471fb7f67239f9257bbe75132e98912e
+MD5 40104c5f76b7d5ff77c1e3e132ee4fe7 gdm-2.16.7.ebuild 4837
+RMD160 f4b193f0d178769e6628f102e929ec66b1264f69 gdm-2.16.7.ebuild 4837
+SHA256 20f7cbb035dd649cab184d4e23c81511471fb7f67239f9257bbe75132e98912e gdm-2.16.7.ebuild 4837
 EBUILD gdm-2.18.2.ebuild 5109 RMD160 5d47013f4215611ce55a8b0ff1a175a8034842a5 SHA1 558094bcebc4ed265d7e26b4de54ef5d24f2f703 SHA256 deac11861fa18894cd3b3d4e554b344a6038db35524ed146b6865f473786b91e
 MD5 c858f77c8a6a1a1fbb89269190427b6c gdm-2.18.2.ebuild 5109
 RMD160 5d47013f4215611ce55a8b0ff1a175a8034842a5 gdm-2.18.2.ebuild 5109
@@ -46,10 +52,14 @@ EBUILD gdm-2.18.3.ebuild 5111 RMD160 d987f539dfda1613822938d23e3a6b7acf584b01 SH
 MD5 2c86fc58700318c5868f4a17c8b5afd7 gdm-2.18.3.ebuild 5111
 RMD160 d987f539dfda1613822938d23e3a6b7acf584b01 gdm-2.18.3.ebuild 5111
 SHA256 f0894ee12d75ca0219980becec0b867bdd9035187edb31208a3fce80a525ee8a gdm-2.18.3.ebuild 5111
-MISC ChangeLog 29197 RMD160 9c710ff5334550088e19b4de7acd48f3d60738c9 SHA1 3aaf19e517bf7b64f644f53f0abc04ad210ab5ef SHA256 63af5ac081b7d7a232df6dccdd48e65b848d6971805148e498ee073bc6d82d91
-MD5 86c1d0733c54c3cce6cfa6eb33f6b0cb ChangeLog 29197
-RMD160 9c710ff5334550088e19b4de7acd48f3d60738c9 ChangeLog 29197
-SHA256 63af5ac081b7d7a232df6dccdd48e65b848d6971805148e498ee073bc6d82d91 ChangeLog 29197
+EBUILD gdm-2.18.4.ebuild 5109 RMD160 17304cd8a0cb1854a42ae55c2e8f6badff8f8da1 SHA1 d62e8e349326a39e0a65f7883393cbac02486bac SHA256 25d70ccd1feda2e30d8206becd62df5a6a37d5101a813b46684147bb8fe28e18
+MD5 e6f92701020de11c35f8e96be4bb8f2c gdm-2.18.4.ebuild 5109
+RMD160 17304cd8a0cb1854a42ae55c2e8f6badff8f8da1 gdm-2.18.4.ebuild 5109
+SHA256 25d70ccd1feda2e30d8206becd62df5a6a37d5101a813b46684147bb8fe28e18 gdm-2.18.4.ebuild 5109
+MISC ChangeLog 29511 RMD160 8beea34ab7db18c39c853fe384fcde964747243d SHA1 8a68a8e39e29f3ec8f271ad5ac856d258260be31 SHA256 bb35cbb9eae493dcde75529948ae91572c4fceb70814521de10d39852eb26815
+MD5 a777fa8bde4b9cf4a39a0368fa81f6e9 ChangeLog 29511
+RMD160 8beea34ab7db18c39c853fe384fcde964747243d ChangeLog 29511
+SHA256 bb35cbb9eae493dcde75529948ae91572c4fceb70814521de10d39852eb26815 ChangeLog 29511
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -66,9 +76,15 @@ SHA256 478e805bb9947c6bac808c2c14f07c5432ec8d5c10457182a9907437e8965207 files/di
 MD5 ec013cc1d072c58db8287fc18969cf57 files/digest-gdm-2.16.6 768
 RMD160 f26a6d3a2683d1058036c7e6948ce85d18c972fb files/digest-gdm-2.16.6 768
 SHA256 557359be10280f3586bca3ca9448a992ea8f0e6b7fc0e27bd3e2361964602960 files/digest-gdm-2.16.6 768
+MD5 fd4e9b38373f89e0b184a0d5a3f6fb06 files/digest-gdm-2.16.7 768
+RMD160 fae6c3d2d91fddd3c572330a4cd5bc47ab2f7c06 files/digest-gdm-2.16.7 768
+SHA256 ce9e9e188f04b6e2057146e034b6777c85c58675ea9375c7ec849c2e72347f10 files/digest-gdm-2.16.7 768
 MD5 e96d0e0e705a4cc286a96470b4e1ac60 files/digest-gdm-2.18.2 768
 RMD160 3a6a7e8a0f0d59bab7dfbeaf342e36cffee5baf7 files/digest-gdm-2.18.2 768
 SHA256 3a1b31c1c09a1e863a4fe83fd48a321802a0b945c3a8e4f5710bfab61fcb61cd files/digest-gdm-2.18.2 768
 MD5 421d0c3e30c009dd7303271e7e46f2e7 files/digest-gdm-2.18.3 768
 RMD160 79fb9c2a958572bdb842030cad8ff8dba07188f9 files/digest-gdm-2.18.3 768
 SHA256 b07db158e51bb6a0ad6a16d4d1bb389457335d02d59689f903da4f40f919d6d2 files/digest-gdm-2.18.3 768
+MD5 3e6bf5ebdcc90e0393b3faf0e5266b82 files/digest-gdm-2.18.4 768
+RMD160 6b04302e4e48ce4082c1f95736fb33eed85aaaa4 files/digest-gdm-2.18.4 768
+SHA256 7b96b8ecaed329a7d641ef04c3abbe23fcfa956a4bb665307725ab9f7364c752 files/digest-gdm-2.18.4 768
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.7 b/gnome-base/gdm/files/digest-gdm-2.16.7
new file mode 100644
index 000000000000..f9183147a8b8
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.16.7
@@ -0,0 +1,9 @@
+MD5 5d3634071a117113b27b28446d7a285a gdm-2.16.7.tar.bz2 3152229
+RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 gdm-2.16.7.tar.bz2 3152229
+SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881 gdm-2.16.7.tar.bz2 3152229
+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.4 b/gnome-base/gdm/files/digest-gdm-2.18.4
new file mode 100644
index 000000000000..fe223f8fee5a
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.18.4
@@ -0,0 +1,9 @@
+MD5 53e5f5820fa67abf55c37ea7570807b7 gdm-2.18.4.tar.bz2 3459899
+RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e gdm-2.18.4.tar.bz2 3459899
+SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3 gdm-2.18.4.tar.bz2 3459899
+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.16.7.ebuild b/gnome-base/gdm/gdm-2.16.7.ebuild
new file mode 100644
index 000000000000..5f5ff349598c
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.16.7.ebuild
@@ -0,0 +1,180 @@
+# 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.7.ebuild,v 1.1 2007/08/06 16:19:42 eva 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.4.ebuild b/gnome-base/gdm/gdm-2.18.4.ebuild
new file mode 100644
index 000000000000..d6dc307d6497
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.18.4.ebuild
@@ -0,0 +1,189 @@
+# 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.4.ebuild,v 1.1 2007/08/06 16:19:42 eva 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
+}