new release 'n cleanup

5 files changed, 22 insertions, 69 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index fcf668e504ca..b7de57401eac 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,16 +1,12 @@
 MD5 fef4a1b1a2fed04c2aa9a9d522aa012d gnome-session-2.4.1.ebuild 1282
-MD5 2458df03e82772e1001325be7eaace2c gnome-session-2.2.2.ebuild 1344
-MD5 b56cac7440398cae56af6432418991d7 gnome-session-2.2.0.2.ebuild 1162
 MD5 80b671305c525b0b2c2ff9baa7a60b46 gnome-session-2.4.0.ebuild 1466
-MD5 45e4175346140852731d35118f866c5b gnome-session-2.4.2.ebuild 1285
-MD5 d0659f6ea919f9bd59d80a9ba526b5fe ChangeLog 7091
+MD5 ea025cd1b5157496ed3cd2d33e2b9630 gnome-session-2.4.2.ebuild 1287
+MD5 1c4bf9090601d632639f813c5d8c9538 ChangeLog 7213
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
 MD5 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
-MD5 7a5241ff158ca1c840c035cb0ae9340d files/digest-gnome-session-2.2.2 72
 MD5 ebfde736b9aa58793476ac3dbf09fe23 files/digest-gnome-session-2.4.0 72
 MD5 4022794e99a461f04b831f82c4d823e8 files/digest-gnome-session-2.4.1 72
 MD5 c7dd76860a26aa54145fafa215e0aa42 files/digest-gnome-session-2.4.2 72
-MD5 e9d19abecd2642091611b90e094ef342 files/digest-gnome-session-2.2.0.2 74
 MD5 9b6a487176c392343b5ce7eab34297af files/gnome-session-2.4-defaults.patch 1004
 MD5 73b0d3a312160d827670731c38f3f2ce files/gnome-session-2.0.9-64bit.patch 889
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.2.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.2.2
deleted file mode 100644
index 46d8e78f458b..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7dcfea0d925ddecb7c9700ddf597b17c gnome-session-2.2.2.tar.bz2 716000
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.4.2 b/gnome-base/gnome-session/files/digest-gnome-session-2.4.2
new file mode 100644
index 000000000000..40835eb4c1d3
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.4.2
@@ -0,0 +1 @@
+MD5 fc2e6d9c71b4d1fe08ec329d7e03684e gnome-session-2.4.2.tar.bz2 911570
diff --git a/gnome-base/gnome-session/gnome-session-2.2.0.2.ebuild b/gnome-base/gnome-session/gnome-session-2.2.0.2.ebuild
deleted file mode 100644
index 1ee4e9399950..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.2.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.2.0.2.ebuild,v 1.9 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Gnome2 session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=media-sound/esound-0.2.26
-	>=gnome-base/libgnomeui-2
-	>=sys-devel/gettext-0.10.40
-	>=sys-apps/tcp-wrappers-7.6
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=gnome-base/gconf-1.2.1
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	!gnome-base/gnome-core"
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
-
-DOC="AUTHORS COPYING* README HACKING INSTALL NEWS TODO ChangeLog"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# This patch is only necessary on 64-bit platforms such as Alpha
-	# but it doesn't hurt elsewhere.
-	epatch ${FILESDIR}/${PN}-2.0.9-64bit.patch || die
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/Gnome
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.2.2.ebuild b/gnome-base/gnome-session/gnome-session-2.4.2.ebuild
index c7672e317181..4dc4ac4dd614 100644
--- a/gnome-base/gnome-session/gnome-session-2.2.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.4.2.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.2.2.ebuild,v 1.9 2003/09/23 15:50:38 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.4.2.ebuild,v 1.1 2004/01/16 18:05:09 foser Exp $
 
-inherit gnome2 eutils
+inherit gnome2
 
-IUSE=""
-S=${WORKDIR}/${P}
-DESCRIPTION="the Gnome2 session manager"
+DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
+IUSE="ipv6"
 SLOT="0"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=media-sound/esound-0.2.26
 	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/gconf-1.2.1
 	>=sys-apps/tcp-wrappers-7.6
-	app-text/scrollkeeper"
+	>=gnome-base/gconf-2"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.10.40
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.22
 	!gnome-base/gnome-core"
-# gnome-base/gnome-core overwrite /usr/bin/gnome-session
+# gnome-base/gnome-core overwrites /usr/bin/gnome-session
 
-DOC="AUTHORS COPYING* README HACKING INSTALL NEWS TODO ChangeLog"
+DOCS="AUTHORS ChangeLog COPYING* HACKING INSTALL NEWS README"
+
+G2CONF="${G2CONF} $(use_enable ipv6)"
 
 src_unpack() {
+
 	unpack ${A}
 	cd ${S}
 
-	# This patch is only necessary on 64-bit platforms such as Alpha
-	# but it doesn't hurt elsewhere.
-	epatch ${FILESDIR}/${PN}-2.0.9-64bit.patch || die
-	gnome2_omf_fix
+	# patch for logout dialog, see bug # 30230 and dups
+	epatch ${FILESDIR}/${PN}-2.4-defaults.patch
+
 }
 
 src_install() {
+
 	gnome2_src_install
 
 	dodir /etc/X11/Sessions
@@ -49,4 +51,5 @@ src_install() {
 	# FIXME : in an ideal world we would alter the gconf key
 	insinto /usr/share/pixmaps/splash/
 	doins ${FILESDIR}/gnome-splash.png
+
 }