version bump for GNOME 2.20

Package-Manager: portage-2.1.3.11

4 files changed, 225 insertions, 15 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 5546ee7349ec..da18da1a9718 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.236 2007/10/02 14:40:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.237 2007/10/04 05:25:58 compnerd Exp $
+
+*gdm-2.20.0 (04 Oct 2007)
+
+  04 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org> +gdm-2.20.0.ebuild:
+  Version bump for GNOME 2.20
 
 *gdm-2.18.4-r1 (02 Oct 2007)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index a0e0ec84ac8d..d05c65cd81dc 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 MD5 4fd1e85595162e54a954871024b2858f files/gdm-2.13.0.1-selinux-remove-attr.patch 908
 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 files/gdm-2.13.0.1-selinux-remove-attr.patch 908
@@ -24,6 +21,7 @@ SHA256 887e827900049eea610952099e8d50ebf07a493534dfda4662cb14ecc6ca68b6 files/gd
 DIST gdm-2.16.4.tar.bz2 3139838 RMD160 afccb19cb0e56af9a464fa538de4f59191705142 SHA1 61c9c2f5a29c99aaa85d2b76164540b949b2656b SHA256 0aa32e3b145ce5c6c8d42c7a8bcaa09582737e89de252fa6bda0c55f3af10616
 DIST gdm-2.16.7.tar.bz2 3152229 RMD160 13f3fb2b2b99f9715c06ece437412516af865f56 SHA1 493ed37bfd7ee1619d814401bc1ec73c4be7a802 SHA256 720292a9954f0c95633fa464fd1838c822bd0b2f43f98a8ab37155d57ea4c881
 DIST gdm-2.18.4.tar.bz2 3459899 RMD160 4922af1321f707279c1eb6354d1c56cc39bce20e SHA1 8bf2c8745d7c38f5f08641abed4ca103cad0ecb8 SHA256 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
+DIST gdm-2.20.0.tar.bz2 3728770 RMD160 972edab6f09b2a0fa1440d42f09a1e688abce280 SHA1 73f7840180645b6a3da0f3c3ac0518c2b4aef1d6 SHA256 8ae2393685d965b3aa48a06a92cb8c19c1df605f3bb0ee12373c2fba49aba2f7
 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.16.4.ebuild 4833 RMD160 62fa6039852a3beeca134ed12b95d5c2576f77bf SHA1 6c84a17f9cded6b0f18e24265b82410da15a4d7b SHA256 f994e719b872e7b5753791f62ec64c35a206ec06ab50b0f7aaa39ecdc96ad407
@@ -42,10 +40,14 @@ EBUILD gdm-2.18.4.ebuild 5140 RMD160 df97d8a3c426ac30382d459dedfe81a4e7932585 SH
 MD5 618d088f61c62fa08295488517f29eb9 gdm-2.18.4.ebuild 5140
 RMD160 df97d8a3c426ac30382d459dedfe81a4e7932585 gdm-2.18.4.ebuild 5140
 SHA256 c603663f255f8a893136bcefd3e4949f672d88366a3184b6ff6c3bba64b80912 gdm-2.18.4.ebuild 5140
-MISC ChangeLog 31587 RMD160 a8464d9b74faa57b49f2622bf89392db2cbe0aea SHA1 5d03883d14cfa54509af081086f55aace4e4814d SHA256 a1e3f5197e37ebf9a72d74b2ecccccf1a8f1b6fbc5493301cbd872f3deafedb2
-MD5 7bb7c1439e3917432878f2f0d514c479 ChangeLog 31587
-RMD160 a8464d9b74faa57b49f2622bf89392db2cbe0aea ChangeLog 31587
-SHA256 a1e3f5197e37ebf9a72d74b2ecccccf1a8f1b6fbc5493301cbd872f3deafedb2 ChangeLog 31587
+EBUILD gdm-2.20.0.ebuild 5466 RMD160 1f846825dfd9b56b0dd3938642db3f00733f1db7 SHA1 c7f3f532c2dab455a6d137509147d32446ebd61f SHA256 697ff36ac430584bf55ac4ea8b9572e25f0144ae9ab53333414e6cb32fb22d15
+MD5 c35f68e0c22ee2ee8bccf669a69af4d6 gdm-2.20.0.ebuild 5466
+RMD160 1f846825dfd9b56b0dd3938642db3f00733f1db7 gdm-2.20.0.ebuild 5466
+SHA256 697ff36ac430584bf55ac4ea8b9572e25f0144ae9ab53333414e6cb32fb22d15 gdm-2.20.0.ebuild 5466
+MISC ChangeLog 31725 RMD160 676c2c1b6c66568e6b2d7c01821df3e78db8b329 SHA1 a83bbee4e0c60f42255c67babf22fece5547726e SHA256 9bb72e27b2455de3763317748e595c928b2ea066d4abcbff84debe7e7fbc16aa
+MD5 df9e055e7bceb414a10f00719311cf39 ChangeLog 31725
+RMD160 676c2c1b6c66568e6b2d7c01821df3e78db8b329 ChangeLog 31725
+SHA256 9bb72e27b2455de3763317748e595c928b2ea066d4abcbff84debe7e7fbc16aa ChangeLog 31725
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -62,10 +64,6 @@ SHA256 7b96b8ecaed329a7d641ef04c3abbe23fcfa956a4bb665307725ab9f7364c752 files/di
 MD5 3e6bf5ebdcc90e0393b3faf0e5266b82 files/digest-gdm-2.18.4-r1 768
 RMD160 6b04302e4e48ce4082c1f95736fb33eed85aaaa4 files/digest-gdm-2.18.4-r1 768
 SHA256 7b96b8ecaed329a7d641ef04c3abbe23fcfa956a4bb665307725ab9f7364c752 files/digest-gdm-2.18.4-r1 768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHAlhgomPajV0RnrERAm4oAJ0aHMa6NUB8NwCEBKg0pQb9FnJkrQCeOsVe
-sStczKVSclFYToVURqcfoDo=
-=fWZM
------END PGP SIGNATURE-----
+MD5 fe6a1575cab6eefa2542ea00ee3dfe83 files/digest-gdm-2.20.0 768
+RMD160 73e90dbc3ca566a7ee5a4934caeceb4d68927cbd files/digest-gdm-2.20.0 768
+SHA256 8e3bba7482e4f947fde3af4372737cb4000b2c468826a55d909d7584643a2d5a files/digest-gdm-2.20.0 768
diff --git a/gnome-base/gdm/files/digest-gdm-2.20.0 b/gnome-base/gdm/files/digest-gdm-2.20.0
new file mode 100644
index 000000000000..d55065148739
--- /dev/null
+++ b/gnome-base/gdm/files/digest-gdm-2.20.0
@@ -0,0 +1,9 @@
+MD5 cf374113a1f837b0df916572625b5078 gdm-2.20.0.tar.bz2 3728770
+RMD160 972edab6f09b2a0fa1440d42f09a1e688abce280 gdm-2.20.0.tar.bz2 3728770
+SHA256 8ae2393685d965b3aa48a06a92cb8c19c1df605f3bb0ee12373c2fba49aba2f7 gdm-2.20.0.tar.bz2 3728770
+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.20.0.ebuild b/gnome-base/gdm/gdm-2.20.0.ebuild
new file mode 100644
index 000000000000..47d22dd08b32
--- /dev/null
+++ b/gnome-base/gdm/gdm-2.20.0.ebuild
@@ -0,0 +1,198 @@
+# 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.20.0.ebuild,v 1.1 2007/10/04 05:25:58 compnerd Exp $
+
+inherit autotools eutils pam gnome2
+
+DESCRIPTION="GNOME Display Manager"
+HOMEPAGE="http://www.gnome.org/projects/gdm/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_LIBC="elibc_glibc"
+IUSE="accessibility afs branding dmx ipv6 pam remote selinux tcpd xinerama $IUSE_LIBC"
+
+# 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 )"
+
+# glib dep is because of bug #193061
+RDEPEND="dev-libs/dbus-glib
+		 >=dev-libs/glib-2.12
+		 >=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
+		 x11-libs/libXi
+		 x11-libs/libXau
+		 x11-libs/libX11
+		 x11-libs/libXext
+		 x11-apps/sessreg
+		 x11-libs/libXdmcp
+		 x11-libs/libXinerama
+		 sys-auth/consolekit
+		 accessibility? ( x11-libs/libXevie )
+		 afs? ( net-fs/openafs sys-libs/lwp )
+		 dmx? ( x11-libs/libdmx )
+		 pam? ( virtual/pam )
+		 !pam? ( elibc_glibc? ( sys-apps/shadow ) )
+		 remote? ( gnome-extra/zenity )
+		 selinux? ( sys-libs/libselinux )
+		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+		dmx? ( x11-proto/dmxproto )
+		sys-devel/gettext
+		x11-proto/inputproto
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19
+		>=app-text/scrollkeeper-0.1.4
+		>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="--with-prefetch=yes               \
+			--sysconfdir=/etc/X11             \
+			--localstatedir=/var              \
+			--with-xdmcp=yes                  \
+			--with-pam-prefix=/etc            \
+			--with-console-kit=yes            \
+			$(use_enable accessibility xevie) \
+			$(use_enable ipv6)                \
+			$(use_enable remote secureremote) \
+			$(use_with selinux)               \
+			$(use_with tcpd tcp-wrappers)     \
+			$(use_with xinerama)"
+
+	if use dmx ; then
+		G2CONF="${G2CONF} --with-dmx=yes"
+	else
+		G2CONF="${G2CONF} --with-dmx=no"
+	fi
+
+	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_unpack() {
+	gnome2_src_unpack
+
+	# 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.0-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"
+
+	if use pam ; then
+		dopamd "${gentoodir}"/pam.d/*
+		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
+	fi
+
+	# 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 "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
+
+	if [[ "$(rc-config list default | grep xdm)" != "" ]] ; then
+		elog "To remove GDM from startup please execute"
+		elog "'rc-update del xdm default'"
+	fi
+}