Clean up old revision. Fix a typo in ssh-agent script.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 11 insertions, 249 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 84b88d6570fd..0582b5428f98 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.300 2009/07/20 23:10:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.301 2009/07/26 22:10:50 eva Exp $
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> files/50-ssh-agent,
+  -gdm-2.20.10.ebuild:
+  Clean up old revision. Fix a typo in ssh-agent script.
 
   20 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.26.1.ebuild,
   +files/gdm-2.26.1-libxklavier4.patch:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 9524189d1eaa..d34974d7bd0f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
-AUX 50-ssh-agent 246 RMD160 0a1d9955b82a5b54af9ef7e61a5fe2f52b8aa217 SHA1 5a418c885a6b4a280d60c501ec9dc3230e9d7b6c SHA256 b8abb694982613258dcf8b327ef878d6ee9738fa53bbd23edfef1de618ff435f
+AUX 50-ssh-agent 243 RMD160 14327252dc1da75bdb49380960434a613b28cfa6 SHA1 e808be7a34324b269d493585990f134e82cc722a SHA256 f0790148b975ef1e7a37ffe8f5d90f943746f0a3bcf9d7fad8500219e2114042
 AUX gdm-2.13.0.1-selinux-remove-attr.patch 908 RMD160 5d766a45d7c5db2453f9bdfaa7cdf02232bc66e5 SHA1 b8c6bda65c8f3f28a601167d8e8b50d4aa1db221 SHA256 40074297200e3424a1baeb483d7fc50d9846a0c74ce46d72845090647d28d14b
 AUX gdm-2.20.10-custom-session.patch 1105 RMD160 2d300e076dea63a08935ef6c8f3cac6f4909f6c2 SHA1 fdf3b5f24626ebe52502d0d0b31d9bccfff6689b SHA256 58d09e131375f993e46088078993953ea2fedc87ed9deafbfa35eb7f4e731e67
 AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 RMD160 cc84a57a53e0f8ab8688173f96869c6563054b98 SHA1 d15d3187df74570831b6b4a9c125ff9ee218fd72 SHA256 59b0150159776a200c6041290f672f367b4a56f8adc5218d74a271a376c7cfe1
@@ -19,16 +19,15 @@ DIST gdm-2.26.1.tar.bz2 2526832 RMD160 abba568b616d5837f6aeedf3d2759a349df66c9e
 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.20.10-r1.ebuild 6520 RMD160 bec05c9d8cab66c48376aa52f22c5a4d0d9e0f41 SHA1 9be06f4e2fbd6e80053b07bc45e545a3ef5915db SHA256 5d223c1e62ad080b2db17f0c2bc0cd6fec9c2945ad71be042de1ca18bdd01b82
-EBUILD gdm-2.20.10.ebuild 6743 RMD160 03ab61f6293f77ef228cc83e5b5d45843681dcd8 SHA1 2c662bb64b4201b4e7d20ba8061a9062d9b7044c SHA256 4b40a13054ee52ccd8361a9b0ae5e4d74001aea7c5d66d3d470217ba8c024d0e
 EBUILD gdm-2.20.3.ebuild 5462 RMD160 01aaa98ab94e130959e550282e4353727d972caa SHA1 7dbff1038ee6f984f2fbf705bf810a73561ea09b SHA256 1ad90379beebf205f16d2d5cc449e60a968e0854c438cd84413175a836accd87
 EBUILD gdm-2.20.9-r1.ebuild 6363 RMD160 3b4160a5ae31f902f8d13afab3ad7d00e19ef1ca SHA1 d5170509fdadb527f1e5001cdc7e8f8067ec5aad SHA256 0c761ebb646018875b2a326d578f1895cc48477bbb900b55034751478b236ec4
 EBUILD gdm-2.26.1.ebuild 5658 RMD160 af5494ccebe8a176f12d59f201eda2df97bbe152 SHA1 34d31f15cb2ebcf374234918554db028424dd715 SHA256 b226d4231faee7063773054bb53c45d44ce0fdad1e3da893bae7e70eb6d41ca4
-MISC ChangeLog 40868 RMD160 fd6c771fa21aef28fdb45cdeb4c2507e47715f3b SHA1 89e2d03d1b75767662cd5163662c262256a8857f SHA256 fc9c2ae9e2729fad0bb192a61dc7a44594eba813089d033733d244b6e7053ebd
+MISC ChangeLog 41023 RMD160 c50a21968ad9e90021c6199572a64513ff1f1d91 SHA1 6368de8dee7911355ea4818221fe57844ee2e795 SHA256 7877bd3eeff3ae1e82c3de036fce37c015a0b91ff680740a7e6b824aeba9ecdb
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpk+XMACgkQ1fmVwcYIWAZuBQCfQig80wsek4RPPZp8/K6mCVyt
-q1YAnifDc2vcodclBNNWmYHLFVg5ikE/
-=Aghl
+iEYEARECAAYFAkps1G8ACgkQ1fmVwcYIWAZKWQCfbmgEHIjJXC2WXOsSV4GrZ7J1
+TcwAnihZcsYjmu1n0UhjAk/Sj8R2s1GO
+=zqGv
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/50-ssh-agent b/gnome-base/gdm/files/50-ssh-agent
index 10460c5bd44a..28af2672c794 100644
--- a/gnome-base/gdm/files/50-ssh-agent
+++ b/gnome-base/gdm/files/50-ssh-agent
@@ -2,7 +2,7 @@
 
 # add ssh-agent if found
 
-sshagent="`gdmwhich ssh-agent`"
+sshagent="`which ssh-agent`"
 if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
 	command="$sshagent -- $command"
 elif [ -z "$sshagent" ] ; then
diff --git a/gnome-base/gdm/gdm-2.20.10.ebuild b/gnome-base/gdm/gdm-2.20.10.ebuild
deleted file mode 100644
index 18de4a3f88d6..000000000000
--- a/gnome-base/gdm/gdm-2.20.10.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.10.ebuild,v 1.1 2009/04/12 23:07:23 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 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-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/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama )
-	sys-auth/consolekit
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22 )
-	pam? (
-		virtual/pam
-		>=sys-auth/pambase-20080318 )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3"
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
-	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="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		--with-console-kit=yes
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(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 gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "You need to build gnome-base/gnome-keyring with USE=\"pam\""
-		eerror "for USE=\"gnome-keyring\" to have any effect on this package."
-	fi
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-
-		if use gnome-keyring && ! built_with_use sys-auth/pambase gnome-keyring; then
-			eerror "You need USE=\"gnome\" in sys-auth/pambase for proper keyring"
-			eerror "unlocking at login time. It will not work properly otherwise."
-		fi
-	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.2-gksu.patch"
-
-	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
-
-	# Make custom session work, bug #.
-	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d
-	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.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
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain"
-	doexe "${FILESDIR}/50-ssh-agent"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		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/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 use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	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
-}