Bump 2.16 series to 2.16.6

Package-Manager: portage-2.1.2.7

4 files changed, 212 insertions, 9 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 471ae01fe336..5e2c56b611f0 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.207 2007/04/30 20:55:21 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.208 2007/05/24 11:49:13 leio Exp $
+
+*gdm-2.16.6 (24 May 2007)
+
+  24 May 2007; Mart Raudsepp <leio@gentoo.org> +gdm-2.16.6.ebuild:
+  Bump 2.16 series to 2.16.6
 
   30 Apr 2007; Marius Mauch <genone@gentoo.org> gdm-2.14.9-r1.ebuild,
   gdm-2.14.11.ebuild, gdm-2.16.1.ebuild, gdm-2.16.4.ebuild,
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 2aad865c9206..137fd97fd78c 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -21,6 +21,7 @@ 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.1.tar.bz2 3130299 RMD160 2aa56bf08be354778b9f0c55cbd441b2a354ac2f SHA1 2a684d194cea825a6fc14be551d7d33e373ef55c SHA256 9733a12aacf6995dc630daf108c357c5d906fdda30de05cd9b5c26a83cf3d5f6
 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.18.0.tar.bz2 3461709 RMD160 6f23c30cdd51e4c71e9464808844156938b37316 SHA1 62d059c101b127c13f8e6fa8d9b117ab40fd4534 SHA256 6619ef1ba04f4408f181b1a6c1d8a86f791706e22e0e2803153dbd5554a18053
 DIST gdm-2.18.1.tar.bz2 3460665 RMD160 cb2296bc61eccd6dfa8df8ad071a14e58f8dd80d SHA1 70b902ff810a69109746c135dd095db34982a9d0 SHA256 347a555305f9f19089d032685dfec1cb5a8ebae970b1c2d0e0929cd83c2c5ffd
 DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 RMD160 b1776e987bf87e7db34d73bdf7a8eebfdcd51e54 SHA1 0b41c955ec8980c011b856aa653102da485dd20c SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e
@@ -41,6 +42,10 @@ EBUILD gdm-2.16.4.ebuild 4826 RMD160 aee4663b736c2db6179f66911377d3b229d95372 SH
 MD5 d21e2c54a00237ceeca9adcacd800984 gdm-2.16.4.ebuild 4826
 RMD160 aee4663b736c2db6179f66911377d3b229d95372 gdm-2.16.4.ebuild 4826
 SHA256 989bdc283d23916a541000e1a0d87954037baa032d42aafa6004d6bde647304b gdm-2.16.4.ebuild 4826
+EBUILD gdm-2.16.6.ebuild 4833 RMD160 0954d951fe057b11f3cfeccbc90215c34ea8667d SHA1 ac52c07bc5a7bac05915471c89f5be8ec89aaf19 SHA256 8152a1ee44bb31a600161a1b433284d7fd7e66d385dee3fbca7e80a333d87f55
+MD5 2c79aa9fc6d9667f54f4f4455c181837 gdm-2.16.6.ebuild 4833
+RMD160 0954d951fe057b11f3cfeccbc90215c34ea8667d gdm-2.16.6.ebuild 4833
+SHA256 8152a1ee44bb31a600161a1b433284d7fd7e66d385dee3fbca7e80a333d87f55 gdm-2.16.6.ebuild 4833
 EBUILD gdm-2.18.0.ebuild 5014 RMD160 0a4f75bf095047cc90028487308a15e5bea31f8b SHA1 24a2ce2139a648b0dff6a529dc9bd633fe48f2b9 SHA256 d1187320838ef6cdfc8e769bcbb539a8540d93cc9f44443cfddc22c650c8f2b3
 MD5 e609e81bc7ffe6bbdd6bcd61f0afc2c3 gdm-2.18.0.ebuild 5014
 RMD160 0a4f75bf095047cc90028487308a15e5bea31f8b gdm-2.18.0.ebuild 5014
@@ -49,10 +54,10 @@ EBUILD gdm-2.18.1.ebuild 5153 RMD160 bb3403ae7d752eaf976b6beaca3cc9398b49a03c SH
 MD5 bb36db0093f4179f8cc7178752039fed gdm-2.18.1.ebuild 5153
 RMD160 bb3403ae7d752eaf976b6beaca3cc9398b49a03c gdm-2.18.1.ebuild 5153
 SHA256 5b0effce043b6309469905ddb72f0659e8985b5be8d4be14e104bb81363b9ac5 gdm-2.18.1.ebuild 5153
-MISC ChangeLog 27927 RMD160 1b8338005c47efd62badf04a7cd82a283faa4f50 SHA1 78a00d1b7ee2ebc8853e15756ce7f9d7b423dc2b SHA256 e317a446f9a47f6f240ff8a8bf9012bb5821b464c8b85ab9cb9927d409ae9d96
-MD5 9ee76c3ef61e1f9dcc7226fd01f0a594 ChangeLog 27927
-RMD160 1b8338005c47efd62badf04a7cd82a283faa4f50 ChangeLog 27927
-SHA256 e317a446f9a47f6f240ff8a8bf9012bb5821b464c8b85ab9cb9927d409ae9d96 ChangeLog 27927
+MISC ChangeLog 28049 RMD160 0b3b5480a936e542d88b8bd5a757a6bb9713b54f SHA1 56965a614e82ac43325c45227119b1911661e609 SHA256 00ac8b93f75250b66cad7bc11ae719f2bd2e4edb77f41780888c8dfaf0e9afc6
+MD5 27ab4a98d35a7f3df05dd4fe93363a80 ChangeLog 28049
+RMD160 0b3b5480a936e542d88b8bd5a757a6bb9713b54f ChangeLog 28049
+SHA256 00ac8b93f75250b66cad7bc11ae719f2bd2e4edb77f41780888c8dfaf0e9afc6 ChangeLog 28049
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -69,6 +74,9 @@ SHA256 768f0a7dd22736e72dca348867e873b873b08116e26edc97cee245321985fb52 files/di
 MD5 f600fd7877534b9dd2a129ab46cf84ad files/digest-gdm-2.16.4 768
 RMD160 0c0478761fa5dad64e3f2d5cdccef5b817261cf3 files/digest-gdm-2.16.4 768
 SHA256 478e805bb9947c6bac808c2c14f07c5432ec8d5c10457182a9907437e8965207 files/digest-gdm-2.16.4 768
+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 5add51bccd3ea2203e0648e2832f54a0 files/digest-gdm-2.18.0 768
 RMD160 08b97b7b212d660796e6123338b6c1c0f6eaf93f files/digest-gdm-2.18.0 768
 SHA256 b0d5917269c8b1d484d6e2becc7ada5aeb968a29db6b2f56aa83e77d802915ea files/digest-gdm-2.18.0 768
@@ -76,9 +84,9 @@ MD5 f47639a8f0e28c9e24bca062f2f08f5c files/digest-gdm-2.18.1 768
 RMD160 a275011b375b73781d52f5e4728ef67a0c92374c files/digest-gdm-2.18.1 768
 SHA256 13e3acbec47fc19c4da29c5e3c9c3549bffa89029527d3962264420905a783d1 files/digest-gdm-2.18.1 768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGNlgI6J2i8a8J4okRArORAJ0UF51CIe8pdcd4AE5pK97bUFvy+wCfbNft
-SheBlXuazpqVcqYDz/4bsf4=
-=YH3A
+iD8DBQFGVXuwkeYb6olFHJcRAsrGAJ0agAdKSqn5jBRm8MOCzgLytZBdNwCgxCdf
+nDwyNTvORfV6Wq+lCop81AU=
+=Ib5E
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/digest-gdm-2.16.6 b/gnome-base/gdm/files/digest-gdm-2.16.6
new file mode 100644
index 000000000000..1a893c3a7267
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.16.6
@@ -0,0 +1,9 @@
+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/gdm-2.16.6.ebuild b/gnome-base/gdm/gdm-2.16.6.ebuild
new file mode 100644
index 000000000000..dc05ebe44925
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.16.6.ebuild
@@ -0,0 +1,181 @@
+# 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.1 2007/05/24 11:49:13 leio 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 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'"
+}