new version 'n cleanup

7 files changed, 15 insertions, 57 deletions

diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 33b813d9b4a7..d37ed35199eb 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.38 2003/08/24 18:20:16 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.39 2003/09/10 23:39:19 foser Exp $
+
+*gnome-session-2.4.0 (11 Sep 2003)
+
+  11 Sep 2003; foser <foser@gentoo.org> gnome-session-2.4.0.ebuild :
+  New version, add optional ipv6 support
 
   25 Aug 2003; Mike Gardiner <obz@gentoo.org> gnome-session-2.2.2.ebuild:
   Moved to stable on x86
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index e33da91405a6..2abfd5478f39 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,18 +1,14 @@
 MD5 a1dc83c40b329fdf19c1307e2a35f385 gnome-session-2.2.2.ebuild 1342
-MD5 48dc97857d50f6cac44609bd487ec68c gnome-session-2.3.90.ebuild 1315
 MD5 b56cac7440398cae56af6432418991d7 gnome-session-2.2.0.2.ebuild 1162
-MD5 48dc97857d50f6cac44609bd487ec68c gnome-session-2.4.0.ebuild 1315
+MD5 63c9ebcdd75fb13b710ae686aea830cc gnome-session-2.4.0.ebuild 1370
 MD5 2b600f6ca993a0a413d16f0099e38bf0 gnome-session-2.2.1.ebuild 1342
-MD5 902786ac12cc74d5d7bee970ad18fae5 gnome-session-2.0.7.ebuild 1064
-MD5 781b534ec3f36b8ad7b91457acdb40ab ChangeLog 5477
+MD5 a94101c07c2ccb13c31abf1d0e4cdc0a ChangeLog 5626
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 b10dbd1b6388f5fdf9feee0e56525ea5 files/Gnome 2464
 MD5 f02a80d3f1435547a479312c15cc1030 files/gnome-splash.png 78064
-MD5 5f25cbf7bc363419fec150bf6911585c files/digest-gnome-session-2.0.7 72
 MD5 282907afa4d1c49949811514a99e1909 files/digest-gnome-session-2.2.1 72
 MD5 7a5241ff158ca1c840c035cb0ae9340d files/digest-gnome-session-2.2.2 72
 MD5 ebfde736b9aa58793476ac3dbf09fe23 files/digest-gnome-session-2.4.0 72
 MD5 e9d19abecd2642091611b90e094ef342 files/digest-gnome-session-2.2.0.2 74
 MD5 89588771b6e21d9e94833183efbed8d6 files/gnome-session-2.0-defaults.patch 925
 MD5 73b0d3a312160d827670731c38f3f2ce files/gnome-session-2.0.9-64bit.patch 889
-MD5 43c756b3c715595879625a1890ac6597 files/digest-gnome-session-2.3.90 73
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.0.7 b/gnome-base/gnome-session/files/digest-gnome-session-2.0.7
deleted file mode 100644
index 4a73333254fd..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a36300db14f6933f41f7a1dfb1a85cfb gnome-session-2.0.7.tar.bz2 811896
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.3.90 b/gnome-base/gnome-session/files/digest-gnome-session-2.3.90
deleted file mode 100644
index e7c1350ebc51..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b5f895f9f0d3f00e080fb4bbc01a6b9 gnome-session-2.3.90.tar.bz2 938416
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.4.0 b/gnome-base/gnome-session/files/digest-gnome-session-2.4.0
new file mode 100644
index 000000000000..f8cbb3097021
--- /dev/null
+++ b/gnome-base/gnome-session/files/digest-gnome-session-2.4.0
@@ -0,0 +1 @@
+MD5 6a7acf3429b927c69e18019f9ec6fa9f gnome-session-2.4.0.tar.bz2 899580
diff --git a/gnome-base/gnome-session/gnome-session-2.0.7.ebuild b/gnome-base/gnome-session/gnome-session-2.0.7.ebuild
deleted file mode 100644
index fc873784769e..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.0.7.ebuild
+++ /dev/null
@@ -1,45 +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.0.7.ebuild,v 1.9 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the Gnome2 session manager"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-
-RDEPEND=">=dev-libs/glib-2.0.6-r1
-	>=x11-libs/gtk+-2.0.6-r1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=sys-devel/gettext-0.10.40
-	>=sys-apps/tcp-wrappers-7.6
-	>=gnome-base/gconf-1.2.1
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	>=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 COPY* README HACKING INSTALL NEWS TODO ChangeLog"
-
-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.3.90.ebuild b/gnome-base/gnome-session/gnome-session-2.4.0.ebuild
index 4b9377010e63..cb0b4cf609d6 100644
--- a/gnome-base/gnome-session/gnome-session-2.3.90.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.4.0.ebuild
@@ -1,14 +1,15 @@
 # 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.3.90.ebuild,v 1.2 2003/09/08 05:04:45 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.4.0.ebuild,v 1.1 2003/09/10 23:39:19 foser Exp $
 
 inherit gnome2
 
-DESCRIPTION="the Gnome2 session manager"
+DESCRIPTION="Gnome session manager"
 HOMEPAGE="http://www.gnome.org/"
 
+IUSE="ipv6"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
 RDEPEND=">=x11-libs/gtk+-2.2
@@ -25,6 +26,8 @@ DEPEND="${RDEPEND}
 
 DOC="AUTHORS COPYING* README HACKING INSTALL NEWS TODO ChangeLog"
 
+G2CONF="${G2CONF} $(use_enable ipv6)"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}