cleanup

9 files changed, 6 insertions, 372 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 259b08038129..8209e8d7325c 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.101 2004/03/31 23:07:55 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.102 2004/04/05 15:26:20 foser Exp $
+
+*gnome-2.6 (05 Apr 2004)
+
+  05 Apr 2004; foser <foser@gentoo.org> gnome-2.6.ebuild :
+  Add changelog entry for 2.6 release
 
 *gnome-2.6_rc5 (01 Apr 2004)
 
diff --git a/gnome-base/gnome/files/digest-gnome-2.0.2-r1 b/gnome-base/gnome/files/digest-gnome-2.0.2-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.0.2-r1
+++ /dev/null
diff --git a/gnome-base/gnome/files/digest-gnome-2.2-r2 b/gnome-base/gnome/files/digest-gnome-2.2-r2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.2-r2
+++ /dev/null
diff --git a/gnome-base/gnome/files/digest-gnome-2.2.1 b/gnome-base/gnome/files/digest-gnome-2.2.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.2.1
+++ /dev/null
diff --git a/gnome-base/gnome/files/digest-gnome-2.2.2-r1 b/gnome-base/gnome/files/digest-gnome-2.2.2-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnome-base/gnome/files/digest-gnome-2.2.2-r1
+++ /dev/null
diff --git a/gnome-base/gnome/gnome-2.0.2-r1.ebuild b/gnome-base/gnome/gnome-2.0.2-r1.ebuild
deleted file mode 100644
index c79d80ced5d6..000000000000
--- a/gnome-base/gnome/gnome-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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/gnome-2.0.2-r1.ebuild,v 1.8 2004/03/17 22:47:52 leonardop Exp $
-
-S=${WORKDIR}
-DESCRIPTION="GNOME 2.0 - merge this package to merge the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-KEYWORDS="ppc x86 sparc alpha"
-SLOT="2.0"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-# Metacity was choosen as the default window manager because of sawfish's long time of non-working state.
-
-# eog is installed to provide with image previews in nautilus.
-
-# gedit is a core example of Gnome2 platform
-
-# applets will pull in the gnome-panel
-
-# after the blank line are the "complete" list we use for gnome2 betas
-
-RDEPEND="!gnome-base/gnome-core
-	>=x11-wm/metacity-2.4.0
-	>=gnome-base/gnome-session-2.0.7
-	>=gnome-extra/bug-buddy-2.2.0
-	>=gnome-base/gdm-2.4.0.11
-	>=media-gfx/eog-1.0.3
-	>=app-editors/gedit-2.0.5
-	>=gnome-extra/yelp-1.0.6
-	>=gnome-base/nautilus-2.0.7
-	>=x11-terms/gnome-terminal-2.0.1
-	>=gnome-base/gnome-applets-2.0.2
-	>=gnome-base/control-center-2.0.1.1
-	>=gnome-extra/gnome-utils-2.0.5
-	>=gnome-extra/gnome-media-2.0.2.5
-	>=gnome-extra/gnome-system-monitor-2.0.2
-	>=gnome-extra/gnome-games-2.0.4
-	>=gnome-extra/gconf-editor-0.3.1
-	>=gnome-extra/gnome2-user-docs-2.0.1
-
-
-	>=x11-libs/gtk+-2.0.6
-	>=x11-libs/pango-1.0.4
-	>=dev-libs/atk-1.0.3
-	>=dev-libs/glib-2.0.6
-	>=gnome-base/eel-2.0.7
-	>=gnome-base/gnome-panel-2.0.9
-	>=gnome-base/gnome-desktop-2.0.8
-	>=gnome-base/gnome-vfs-2.0.4-r1
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/librsvg-2.0.1
-	>=gnome-base/libgnome-2.0.5
-	>=gnome-base/libgnomecanvas-2.0.4
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/bonobo-activation-1.0.3
-	>=net-libs/linc-0.5.3
-	>=x11-libs/libzvt-2.0.1
-	>=gnome-base/libglade-2.0.1
-	>=x11-libs/libwnck-0.17
-	>=gnome-base/ORBit2-2.4.3"
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-
-}
diff --git a/gnome-base/gnome/gnome-2.2-r2.ebuild b/gnome-base/gnome/gnome-2.2-r2.ebuild
deleted file mode 100644
index 5bca3947a504..000000000000
--- a/gnome-base/gnome/gnome-2.2-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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/gnome-2.2-r2.ebuild,v 1.6 2004/03/17 22:47:52 leonardop Exp $
-
-S=${WORKDIR}
-DESCRIPTION="GNOME 2.0 - merge this package to merge the Gnome2 desktop"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="x86 ~ppc alpha ~sparc"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-# Metacity was choosen as the default window manager because of sawfish's long time of non-working state.
-
-# eog is installed to provide with image previews in nautilus.
-
-# gedit is a core example of Gnome2 platform
-
-# applets will pull in the gnome-panel
-
-# after the blank line are the "complete" list we use for gnome2 betas
-
-# after the second blank line added packages for gnome2.1+
-# file-roller
-
-RDEPEND="!gnome-base/gnome-core
-	>=x11-wm/metacity-2.4.34
-	>=gnome-base/gnome-session-2.2.0.2
-	>=gnome-extra/bug-buddy-2.2.102
-	>=gnome-base/gdm-2.4.1.3
-	>=media-gfx/eog-2.2
-	>=app-editors/gedit-2.2.0.1
-	>=gnome-extra/yelp-2.2
-	>=gnome-base/nautilus-2.2.0.2
-	>=x11-terms/gnome-terminal-2.2.1
-	>=gnome-base/gnome-applets-2.2
-	>=gnome-base/control-center-2.2.0.1
-	>=gnome-extra/gnome-utils-2.2.0.3
-	>=gnome-extra/gnome-system-monitor-2.0.4-r1
-	>=gnome-extra/gnome-games-2.2
-	>=gnome-extra/gconf-editor-0.4.0
-	>=gnome-extra/gnome2-user-docs-2.0.5
-	>=gnome-base/gnome-mime-data-2.2.0
-
-	>=x11-libs/gtk+-2.2.1
-	>=x11-libs/pango-1.2.1
-	>=dev-libs/atk-1.2.2
-	>=dev-libs/glib-2.2.1
-	>=gnome-base/eel-2.2.0.2
-	>=gnome-base/gnome-panel-2.2.0.1-r1
-	>=gnome-base/gnome-desktop-2.2.0.1
-	>=gnome-base/gnome-vfs-2.2.1
-	>=gnome-base/libbonobo-2.2
-	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/librsvg-2.2.2.1
-	>=gnome-base/libgnome-2.2.0.1
-	>=gnome-base/libgnomecanvas-2.2.0.1
-	>=gnome-base/libgnomeui-2.2.0.1
-	>=gnome-base/bonobo-activation-2.2
-	>=net-libs/linc-1.0.1
-	>=gnome-base/libglade-2.0.1
-	>=x11-libs/libwnck-2.2.1
-	>=gnome-base/ORBit2-2.6
-	>=gnome-base/libgnomeprint-2.2.1.1
-	>=gnome-base/libgnomeprintui-2.2.1.1
-	>=x11-themes/gnome-icon-theme-1.0.0
-	>=x11-themes/gnome-themes-2.2
-	>=app-arch/file-roller-2.2.1
-	>=gnome-extra/acme-2.0.2
-	>=app-text/ggv-1.99.98
-	!alpha? (
-		>=gnome-extra/gnome-media-2.2.1.1
-		>=gnome-extra/nautilus-media-0.2.1
-		>=media-libs/gst-plugins-0.6.0-r1
-		>=media-libs/gstreamer-0.6.0-r2 )"
-# g-s-m 2.0.4-r1 has a gnome 2.2+ only patch
-#	>=x11-libs/libzvt-2.0.1
-
-# The packages marked !alpha above don't build yet on alpha.  We
-# haven't given up, but there's no reason for them to hold up Gnome
-# 2.2 for alpha.
-
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-}
diff --git a/gnome-base/gnome/gnome-2.2.1.ebuild b/gnome-base/gnome/gnome-2.2.1.ebuild
deleted file mode 100644
index 51d7037558f6..000000000000
--- a/gnome-base/gnome/gnome-2.2.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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/gnome-2.2.1.ebuild,v 1.9 2004/03/17 22:47:52 leonardop Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="x86 ppc ~alpha sparc hppa amd64"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-# Metacity was choosen as the default window manager because of sawfish's long time of non-working state.
-
-# eog is installed to provide with image previews in nautilus.
-
-# gedit is a core example of Gnome2 platform
-
-# applets will pull in the gnome-panel
-
-# after the blank line are the "complete" list we use for gnome2 betas
-
-# after the second blank line added packages for gnome2.1+
-
-RDEPEND="!gnome-base/gnome-core
-	>=x11-wm/metacity-2.4.34
-	>=gnome-base/gnome-session-2.2.1
-	>=gnome-extra/bug-buddy-2.2.103
-	>=gnome-base/gdm-2.4.1.3
-	>=media-gfx/eog-2.2.1
-	>=app-editors/gedit-2.2.1
-	>=gnome-extra/yelp-2.2
-	>=gnome-base/nautilus-2.2.2
-	>=x11-terms/gnome-terminal-2.2.1
-	>=gnome-base/gnome-applets-2.2.1
-	>=gnome-base/control-center-2.2.1
-	>=gnome-extra/gnome-utils-2.2.1
-	>=gnome-extra/gnome-system-monitor-2.0.4
-	>=gnome-extra/gnome-games-2.2
-	>=gnome-extra/gconf-editor-0.4.0
-	>=gnome-extra/gnome2-user-docs-2.0.6
-	>=gnome-base/gnome-mime-data-2.2.0
-
-	>=x11-libs/gtk+-2.2.1
-	>=x11-libs/pango-1.2.1
-	>=dev-libs/atk-1.2.2
-	>=dev-libs/glib-2.2.1
-	>=gnome-base/gconf-2.2
-	>=gnome-base/gnome-panel-2.2.1
-	>=gnome-base/gnome-desktop-2.2.1
-	>=gnome-base/gnome-vfs-2.2.3
-	>=gnome-base/libbonobo-2.2.1
-	>=gnome-base/libbonoboui-2.2.0.1
-	>=gnome-base/librsvg-2.2.4
-	>=gnome-base/libgnome-2.2.0.1
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=gnome-base/libgnomeui-2.2.0.1
-	>=gnome-base/bonobo-activation-2.2.1.1
-	>=net-libs/linc-1.0.1
-	>=gnome-base/libglade-2.0.1
-	>=x11-libs/libwnck-2.2.1
-	>=gnome-base/ORBit2-2.6.1
-	>=gnome-base/libgnomeprint-2.2.1.2
-	>=gnome-base/libgnomeprintui-2.2.1.2
-	>=gnome-extra/libgail-gnome-1.0.2
-	>=x11-themes/gnome-icon-theme-1.0.1
-	>=x11-themes/gnome-themes-2.2.1
-
-	>=app-arch/file-roller-2.2.2
-	>=gnome-extra/acme-2.0.2
-	>=app-text/ggv-1.99.98
-
-	!hppa? ( !alpha? (
-		>=gnome-extra/gnome-media-2.2.1.1
-		>=gnome-extra/nautilus-media-0.2.1
-		>=media-libs/gst-plugins-0.6.0-r1
-		>=media-libs/gstreamer-0.6.0-r2 ) )"
-
-# The packages marked !alpha above don't build yet on alpha.  We
-# haven't given up, but there's no reason for them to hold up Gnome
-# 2.2 for alpha.
-
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-}
diff --git a/gnome-base/gnome/gnome-2.2.2-r1.ebuild b/gnome-base/gnome/gnome-2.2.2-r1.ebuild
deleted file mode 100644
index 8c932d602506..000000000000
--- a/gnome-base/gnome/gnome-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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/gnome-2.2.2-r1.ebuild,v 1.10 2004/03/17 22:47:52 leonardop Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop."
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-
-# removed ~hppa, as a dependency (xscreensaver) isnt available
-# on that arch. We mean what we say above. <obz@gentoo.org>
-KEYWORDS="x86 ppc ~alpha ~sparc ~amd64"
-
-#  Note to developers:
-#  This is a wrapper for the complete Gnome2 desktop,
-#  This means all components that a user expects in Gnome2 are present
-#  please do not reduce this list further unless
-#  dependencies pull in what you remove.
-#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
-
-#drobbins, 10 Sep 2003; xscreensaver added to deps with a bindist? conditional
-#this is a hack to get GRP working right (to get xscreensaver installed) until
-#we can get control-center to RDEPEND on xscreensaver with gtk2 in USE. Carpaski
-#will be adding this soon; when this happens, the xscreensaver should be removed
-#from here and something like this should be added to RDEPEND (not DEPEND) in
-#control-center: "x11-misc/xscreensaver[gtk2]"
-
-RDEPEND="!gnome-base/gnome-core
-
-	>=dev-util/intltool-0.26
-
-	>=x11-wm/metacity-2.4.55
-	>=gnome-base/gnome-session-2.2.2
-	>=gnome-extra/bug-buddy-2.2.106
-	>=gnome-base/control-center-2.2.2
-	>=gnome-base/gdm-2.4.1.6
-	>=media-gfx/eog-2.2.2
-	>=app-editors/gedit-2.2.2
-	>=gnome-extra/yelp-2.2.3
-	>=gnome-base/nautilus-2.2.4
-	>=x11-terms/gnome-terminal-2.2.2
-	>=gnome-base/gnome-applets-2.2.2
-	>=gnome-extra/gnome-utils-2.2.3
-	>=gnome-extra/gnome-system-monitor-2.0.5
-	>=gnome-extra/gnome-games-2.2.1
-	>=gnome-extra/gconf-editor-0.4.1
-	>=gnome-extra/gnome2-user-docs-2.0.6
-	>=gnome-base/gnome-mime-data-2.2.1
-
-	>=x11-libs/gtk+-2.2.1-r1
-	>=x11-libs/pango-1.2.3
-	>=dev-libs/atk-1.2.4
-	>=dev-libs/glib-2.2.2
-
-	>=gnome-base/ORBit2-2.6.3
-	>=gnome-base/bonobo-activation-2.2.4
-	>=gnome-base/libbonobo-2.2.3
-	>=gnome-base/libbonoboui-2.2.4
-
-	>=gnome-base/gconf-2.2.1
-	>=gnome-base/gnome-panel-2.2.2.2
-	>=gnome-base/gnome-desktop-2.2.2
-	>=gnome-base/gnome-vfs-2.2.5
-	>=gnome-base/librsvg-2.2.5
-	>=gnome-base/libgnome-2.2.3
-	>=gnome-base/libgnomeui-2.2.2
-	>=gnome-base/libgnomecanvas-2.2.1
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libgtop-2.0.3
-
-	>=net-libs/linc-1.0.3
-
-	>=x11-libs/libwnck-2.2.2
-	>=gnome-base/libgnomeprint-2.2.1.3
-	>=gnome-base/libgnomeprintui-2.2.1.3
-	>=gnome-extra/libgail-gnome-1.0.2
-
-	>=x11-themes/gnome-icon-theme-1.0.6
-	>=x11-themes/gnome-themes-2.2.2
-
-	>=app-arch/file-roller-2.2.5
-	>=gnome-extra/acme-2.0.6
-	>=app-text/ggv-2.0.1
-
-	bindist? ( x11-misc/xscreensaver )
-
-	!hppa? ( !alpha? (
-		>=gnome-extra/gnome-media-2.2.2
-		>=gnome-extra/nautilus-media-0.2.2
-		>=media-libs/gst-plugins-0.6.2-r1
-		>=media-libs/gstreamer-0.6.2 ) )"
-
-# The packages marked !alpha above don't build yet on alpha.  We
-# haven't given up, but there's no reason for them to hold up Gnome
-# 2.2 for alpha.
-
-pkg_postinst () {
-	einfo "note that to change windowmanager to metacity do: "
-	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	einfo "of course this works for all other window managers as well"
-}