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

(Portage version: 2.2_rc65/cvs/Linux x86_64)

4 files changed, 10 insertions, 207 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/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
-}