Fix duplicate RDEPEND, closes #258539. Clean up old revision.

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

4 files changed, 11 insertions, 74 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 9a232d012a1e..204210270b8e 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-session
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.224 2008/11/13 19:29:51 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.225 2009/02/28 11:39:24 eva Exp $
+
+  28 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-session-2.20.3.ebuild, gnome-session-2.22.3.ebuild,
+  gnome-session-2.22.3-r1.ebuild:
+  Fix duplicate RDEPEND, closes #258539. Clean up old revision.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> gnome-session-2.22.3.ebuild:
   Marking gnome-session-2.22.3 ppc64 stable for bug 236971
diff --git a/gnome-base/gnome-session/gnome-session-2.20.3.ebuild b/gnome-base/gnome-session/gnome-session-2.20.3.ebuild
deleted file mode 100644
index 1ead6a8c5b5b..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.20.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.20.3.ebuild,v 1.8 2008/06/05 11:52:26 remi Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-		 branding? ( mirror://gentoo/gentoo-splash.png )"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="branding esd ipv6 tcpd"
-
-RDEPEND=">=dev-libs/glib-2.13
-		 >=x11-libs/gtk+-2.11.1
-		 x11-libs/libXau
-		 x11-apps/xdpyinfo
-		 >=gnome-base/libgnomeui-2.2
-		 >=gnome-base/gnome-control-center-2.15.4
-		 >=x11-libs/libnotify-0.2.1
-		 >=gnome-base/gconf-2
-		 >=gnome-base/gnome-keyring-0.5.1
-		 >=dev-libs/dbus-glib-0.71
-		 esd? ( >=media-sound/esound-0.2.26 )
-		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-DEPEND="${RDEPEND}
-		  x11-apps/xrdb
-		>=sys-devel/gettext-0.10.40
-		>=dev-util/pkgconfig-0.17
-		>=dev-util/intltool-0.35
-		!gnome-base/gnome-core"
-
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable esd) $(use_enable tcpd tcp-wrappers)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Patch for Gentoo Branding (bug #42687)
-	use branding && epatch "${FILESDIR}/${PN}-2.17.90.1-gentoo-branding.patch"
-
-	# Get rid of random asserts in tons of programs due to development versions
-	epatch "${FILESDIR}/${PN}-2.19.2-no-asserts.patch"
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	# Our own splash for world domination
-	if use branding ; then
-		insinto /usr/share/pixmaps/splash/
-		doins "${DISTDIR}/gentoo-splash.png"
-	fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild
index 59ca65e52918..b94f7716a60f 100644
--- a/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild,v 1.2 2008/12/31 03:26:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.3-r1.ebuild,v 1.3 2009/02/28 11:39:24 eva Exp $
 
 inherit eutils gnome2 autotools
 
@@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.13
 		 >=x11-libs/libnotify-0.2.1
 		 x11-libs/libXau
 		 x11-apps/xdpyinfo
-		 gnome-base/gnome-settings-daemon
 		 >=gnome-base/gconf-2
 		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}
diff --git a/gnome-base/gnome-session/gnome-session-2.22.3.ebuild b/gnome-base/gnome-session/gnome-session-2.22.3.ebuild
index 083553e03940..4c520899f03d 100644
--- a/gnome-base/gnome-session/gnome-session-2.22.3.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.3.ebuild,v 1.7 2008/11/13 19:29:51 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.22.3.ebuild,v 1.8 2009/02/28 11:39:24 eva Exp $
 
 inherit eutils gnome2
 
@@ -23,7 +23,6 @@ RDEPEND=">=dev-libs/glib-2.13
 		 >=x11-libs/libnotify-0.2.1
 		 x11-libs/libXau
 		 x11-apps/xdpyinfo
-		 gnome-base/gnome-settings-daemon
 		 >=gnome-base/gconf-2
 		 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}