Stable on x86 as part of GNOME-2.4.1

12 files changed, 13 insertions, 176 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index a11b33e77923..6b8884a4b198 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.66 2003/12/13 00:33:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.67 2004/01/14 13:45:46 obz Exp $
+
+  14 Jan 2004; Mike Gardiner <obz@gentoo.org> gnome-panel-2.4.1.ebuild:
+  Stable on x86 as part of GNOME-2.4.1
 
   14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gnome-panel-2.4.0-r2.ebuild:
   Stable on ia64
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.9 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.9
deleted file mode 100644
index fe3522c3fdbc..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c69ac1bca32d157cd88664dbf38f64e7 gnome-panel-2.0.9.tar.bz2 1644072
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1
deleted file mode 100644
index 86b489312b8b..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d859216e411d5c557b241fbd71fe110 gnome-panel-2.2.1.tar.bz2 1866837
diff --git a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2 b/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2
deleted file mode 100644
index 07916090b91b..000000000000
--- a/gnome-base/gnome-panel/files/digest-gnome-panel-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76540d36d551069db6d5f90c810459fb gnome-panel-2.2.2.tar.bz2 2564652
diff --git a/gnome-base/gnome-panel/gnome-panel-2.0.9.ebuild b/gnome-base/gnome-panel/gnome-panel-2.0.9.ebuild
deleted file mode 100644
index 455b715cf64a..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.0.9.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-panel/gnome-panel-2.0.9.ebuild,v 1.9 2003/09/12 19:50:41 liquidx Exp $
-
-IUSE="doc"
-
-MAKEOPTS="-j1"
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Panel for Gnome2"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2.1"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND=">=x11-libs/gtk+-2.0.6-r1
-	>=dev-libs/libxml2-2.4.24
-	>=dev-libs/atk-1.0.3-r1
-	>=dev-libs/glib-2.0.6-r1
-	>=media-libs/libart_lgpl-2.3.10
-	>=x11-libs/libwnck-0.14
-	>=net-libs/linc-0.5.3
-	>=media-libs/audiofile-0.2.3
-	>=sys-libs/zlib-1.1.4
-	>=app-text/scrollkeeper-0.3.11
-	>=gnome-base/ORBit2-2.4.3
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/gnome-desktop-2.0.8
-	>=gnome-base/libbonobo-2.0.0-r1
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libgnome-2.0.4
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/libgnomeui-2.0.5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.22
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS  README*"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.1.ebuild
deleted file mode 100644
index c7319ca2e848..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.2.1.ebuild
+++ /dev/null
@@ -1,35 +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-panel/gnome-panel-2.2.1.ebuild,v 1.6 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ppc alpha sparc"
-
-IUSE="doc"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.1.5
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/gnome-desktop-2.1.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gconf-1.2.1
-	>=app-text/scrollkeeper-0.3.11
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild
deleted file mode 100644
index ecfb68a8c7ac..000000000000
--- a/gnome-base/gnome-panel/gnome-panel-2.2.2.ebuild
+++ /dev/null
@@ -1,35 +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-panel/gnome-panel-2.2.2.ebuild,v 1.5 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The Panel for Gnome2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-KEYWORDS="x86 ~ppc alpha ~sparc amd64"
-
-IUSE="doc"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=x11-libs/libwnck-2.1.5
-	>=gnome-base/ORBit2-2.4
-	>=gnome-base/gnome-vfs-2.1.3
-	>=gnome-base/gnome-desktop-2.1.4
-	>=gnome-base/libbonoboui-2.1.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2.1.1
-	>=gnome-base/libgnomeui-2.1
-	>=gnome-base/gconf-1.2.1
-	>=app-text/scrollkeeper-0.3.11
-	!gnome-extra/system-tray-applet"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README"
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
index a6597af95a2b..d29a0c248014 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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-panel/gnome-panel-2.4.1.ebuild,v 1.3 2003/11/10 00:01:35 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.1.ebuild,v 1.4 2004/01/14 13:45:46 obz Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2 FDL-1.1 LGPL-2"
 
 # IUSE="doc menu"
 IUSE="doc"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 SLOT="0"
 
 MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index bf57aa79a481..aa812a2636ce 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,10 @@
 # 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.49 2003/12/13 01:01:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.50 2004/01/14 13:47:45 obz Exp $
+
+  14 Jan 2004; Mike Gardiner <obz@gentoo.org> gnome-session-2.2.1.ebuild,
+  gnome-session-2.4.1.ebuild:
+  Stable on x86 as part of GNOME-2.4.1
 
   13 Dec 2003; Guy Martin <gmsoft@gentoo.org> gnome-session-2.4.0.ebuild:
   Marked stable on hppa.
diff --git a/gnome-base/gnome-session/files/digest-gnome-session-2.2.1 b/gnome-base/gnome-session/files/digest-gnome-session-2.2.1
deleted file mode 100644
index ee567af64fc4..000000000000
--- a/gnome-base/gnome-session/files/digest-gnome-session-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53330d8b034d75c9e6d3e79e7314eb77 gnome-session-2.2.1.tar.bz2 726241
diff --git a/gnome-base/gnome-session/gnome-session-2.2.1.ebuild b/gnome-base/gnome-session/gnome-session-2.2.1.ebuild
deleted file mode 100644
index 04bd0ec6dd20..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.2.1.ebuild
+++ /dev/null
@@ -1,51 +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.1.ebuild,v 1.10 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 hppa amd64"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-
-RDEPEND=">=x11-libs/gtk+-2.1
-	>=media-sound/esound-0.2.26
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/gconf-1.2.1
-	>=sys-apps/tcp-wrappers-7.6
-	app-text/scrollkeeper"
-
-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
-
-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
-
-	# Our own splash for world domination
-	# FIXME : in an ideal world we would alter the gconf key
-	insinto /usr/share/pixmaps/splash/
-	doins ${FILESDIR}/gnome-splash.png
-}
diff --git a/gnome-base/gnome-session/gnome-session-2.4.1.ebuild b/gnome-base/gnome-session/gnome-session-2.4.1.ebuild
index 43d8b2bc092d..adbe2f6787a8 100644
--- a/gnome-base/gnome-session/gnome-session-2.4.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1.ebuild,v 1.1 2003/10/20 13:38:37 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.4.1.ebuild,v 1.2 2004/01/14 13:47:45 obz Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2 LGPL-2 FDL-1.1"
 
 IUSE="ipv6"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=media-sound/esound-0.2.26