Add gnome-base/gnome-session to RDEPEND, bug #309161.

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

5 files changed, 23 insertions, 211 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 6890fd205f37..a180ed2da241 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.317 2010/03/07 14:40:01 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.318 2010/03/14 21:55:48 eva Exp $
+
+  14 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> gdm-2.26.1.ebuild,
+  -gdm-2.28.2.ebuild, gdm-2.28.2-r1.ebuild:
+  Add gnome-base/gnome-session to RDEPEND, bug #309161.
 
 *gdm-2.28.2-r1 (07 Mar 2010)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 12a2c492e3a2..26f76a624604 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 49-keychain 181 RMD160 32ce131e93fc2d8640edee72ad42124537860156 SHA1 b4518f9d8ba65d0cf4d64ded844e59be343088d3 SHA256 d73e07847bfa6ac69938aa309f5c137d4c36248cedf9834db1315ba1b2b87140
 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
@@ -17,8 +20,14 @@ DIST gdm-2.28.2.tar.bz2 2283246 RMD160 9b5cd1fb0a9799e783546331ac117aebc3ee7474
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 EBUILD gdm-2.20.10-r2.ebuild 6714 RMD160 51ec36566d48b4a565faf9c91770b084a87901be SHA1 058e00a26aab1642d1f54c95b9e7ce3dcf1aab39 SHA256 96af7b13bd13537c337cf6c82e85488a821940803984ab0d497753c0dd9a8fb2
 EBUILD gdm-2.20.10-r3.ebuild 6870 RMD160 0ba86bd89d1705d2636a7ad54aae5e659751d5ce SHA1 26fba0a993d340bbc978748138eb9631f7eaac68 SHA256 b482a4ad944563d4e32fec54f769e16e17cf428708565dff17bbdd249c7a4f33
-EBUILD gdm-2.26.1.ebuild 5658 RMD160 af5494ccebe8a176f12d59f201eda2df97bbe152 SHA1 34d31f15cb2ebcf374234918554db028424dd715 SHA256 b226d4231faee7063773054bb53c45d44ce0fdad1e3da893bae7e70eb6d41ca4
-EBUILD gdm-2.28.2-r1.ebuild 5832 RMD160 83b55fd152c606bea1a4de5351099b38c9f5d442 SHA1 9ddc0776c4597fcc3b41934fd20349581c964ef5 SHA256 b719cb724e6deb200ba64daf4d0e7ad8f43f10f3aa7d20c0e00b4477f18af57e
-EBUILD gdm-2.28.2.ebuild 5762 RMD160 4d63704daf128ea3573f126223a6fdd12f32f2e9 SHA1 a09b76bc59f5e5e2f7c40c33ddb98ffdf7e4c368 SHA256 5400ebee80d05044c697450d19fa6edaef24022e1f94645532b36eb4678e455e
-MISC ChangeLog 43492 RMD160 0ef9c1a9cbff94e7378fd3856fabb1b8fe91eab1 SHA1 0ec07ebd8e0e8293b6b8d7147475a50926bad0fa SHA256 34f724ec5c0c009833ba50c27a92cfb16db4f920780924000aa55fd2e07f43ea
+EBUILD gdm-2.26.1.ebuild 5691 RMD160 a2eca50621b6f7cfc80cef41a341e3a826b44f4b SHA1 e5327e9abc04a32739d11787e698f6f6968e3376 SHA256 cae888b05147ffd48c2bdb1dc94fc0f7c2861954d100472389f2140599a7ceaa
+EBUILD gdm-2.28.2-r1.ebuild 5860 RMD160 1a8861af8d72f5cdb1b3c490b9b42d2bf833fd48 SHA1 0c78f6e9f77c38d8ef73c07042e270e1f481adb4 SHA256 d0ea590b870dc8511254dc3e37518811abdffae7cfc50f54bd532f1eeb517950
+MISC ChangeLog 43661 RMD160 18647958f706976904812c76142f6bbb76406014 SHA1 7107e1c9da7dc9c67b4fc6c8f731c3658556af3c SHA256 9b8e68a4fc93db0b104916633ac1b12897bd5ba8964ce5db22b230b1196c46a0
 MISC metadata.xml 536 RMD160 53b21d3083b79fe916434c4031a06d108130185c SHA1 b1e22aa4ac145b16471c105709861ffff6585795 SHA256 9d8a22879d6e19a12a8f47ed551cdf440fec0d7057ff0a12feec1c5752c9ce2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkudW28ACgkQ1fmVwcYIWAbnmACgu3NxSkk6N38L27VZ7f+z/S4a
+jb4AoKvITTaV0gKADQg83dI57rxTYkud
+=Octe
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.26.1.ebuild b/gnome-base/gdm/gdm-2.26.1.ebuild
index 8156033810f6..9a94220ddd7c 100644
--- a/gnome-base/gdm/gdm-2.26.1.ebuild
+++ b/gnome-base/gdm/gdm-2.26.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.26.1.ebuild,v 1.4 2009/07/20 23:10:36 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.26.1.ebuild,v 1.5 2010/03/14 21:55:48 eva Exp $
 
 EAPI="2"
 
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-panel-2
+	>=gnome-base/gnome-session-2.26
 	xklavier? ( >=x11-libs/libxklavier-3.5 )
 	x11-libs/libXft
 	app-text/iso-codes
diff --git a/gnome-base/gdm/gdm-2.28.2-r1.ebuild b/gnome-base/gdm/gdm-2.28.2-r1.ebuild
index fef18fad3cea..d6f89c6b9013 100644
--- a/gnome-base/gdm/gdm-2.28.2-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.28.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.1 2010/03/07 14:40:01 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2-r1.ebuild,v 1.2 2010/03/14 21:55:48 eva Exp $
 
 EAPI="2"
 
@@ -34,6 +34,7 @@ RDEPEND=">=sys-apps/devicekit-power-008
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-2.6.1
 	>=gnome-base/gnome-panel-2
+	>=gnome-base/gnome-session-2.28
 	>=x11-misc/xdg-utils-1.0.2-r3
 
 	app-text/iso-codes
diff --git a/gnome-base/gdm/gdm-2.28.2.ebuild b/gnome-base/gdm/gdm-2.28.2.ebuild
deleted file mode 100644
index 163b3a46c96f..000000000000
--- a/gnome-base/gdm/gdm-2.28.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.28.2.ebuild,v 1.3 2010/03/05 10:27:08 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils pam gnome2 autotools
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="http://www.gnome.org/projects/gdm/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility +consolekit debug ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $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/${PN}-2.26-gentoo-patches.tar.bz2
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-# FIXME: gdm has a strange behaviour on reboot (from runlevel), especially when xdm tries to stop it (its blocks).
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug 295686
-RDEPEND=">=sys-apps/devicekit-power-008
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.15.4
-	>=x11-libs/gtk+-2.10.0
-	>=x11-libs/pango-1.3
-	>=media-libs/libcanberra-0.4[gtk]
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2.6.1
-	>=gnome-base/gnome-panel-2
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	app-text/iso-codes
-
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-apps/sessreg
-
-	virtual/pam
-	consolekit? (
-		sys-auth/consolekit
-		>=sys-apps/hal-0.5.12_rc1-r1[consolekit] )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )
-
-	!gnome-extra/fast-user-switch-applet"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.19
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-PDEPEND=">=sys-auth/pambase-20090430[consolekit=,gnome-keyring=]"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=/etc
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_with accessibility xevie)
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${WORKDIR}/${PN}-2.26.1-selinux-remove-attr.patch"
-
-	# Make it daemonize so that the boot process can continue (#236701)
-	epatch "${WORKDIR}/${PN}-2.26.1-fix-daemonize-regression.patch"
-
-	# Fix VT grab problem causing GDM to grab VT2 instead of 7 (#261339)
-	epatch "${WORKDIR}/${PN}-2.26.1-broken-VT-detection.patch"
-
-	# Make custom session work, bug #.
-	epatch "${WORKDIR}/${PN}-2.26.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d
-	epatch "${WORKDIR}/${PN}-2.26.1-xinitrc-ssh-agent.patch"
-
-	# Fix libxklavier automagic support
-	epatch "${WORKDIR}/${PN}-2.26.1-automagic-libxklavier-support.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-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" || die "doexe 1 failed"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
-
-	# 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"
-
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-	dopamd "${gentoodir}"/pam.d/*
-	dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	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
-}
-
-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
-}