bump version to propagate fix

4 files changed, 99 insertions, 76 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 38b2e7e53a3a..36aafd3efb87 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.58 2003/02/12 06:49:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.59 2003/02/17 18:30:34 foser Exp $
+
+*gnome-2.2-r2 (17 Feb 2003)
+
+  17 Feb 2003; foser <foser@gentoo.org> gnome-2.2-r2.ebuild :
+  fixed gnome-panel dep to 2.2.0.1-r1 to propagete #15685 fix
 
 *gnome-2.2-r1 (10 Feb 2003)
 
-  10 Feb 2003; foser <foser@gentoo.org> gnome-2.2.1.ebuild :
+  10 Feb 2003; foser <foser@gentoo.org> gnome-2.2-r1.ebuild :
   Set gnome-vfs to 2.2.1 to fix theme-manager issues
 
 *gnome-2.2 (06 Feb 2003)
diff --git a/gnome-base/gnome/files/digest-gnome-2.0.0-r2 b/gnome-base/gnome/files/digest-gnome-2.2-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnome-base/gnome/files/digest-gnome-2.0.0-r2
+++ b/gnome-base/gnome/files/digest-gnome-2.2-r2
diff --git a/gnome-base/gnome/gnome-2.0.0-r2.ebuild b/gnome-base/gnome/gnome-2.0.0-r2.ebuild
deleted file mode 100644
index d4837760684b..000000000000
--- a/gnome-base/gnome/gnome-2.0.0-r2.ebuild
+++ /dev/null
@@ -1,74 +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/gnome-2.0.0-r2.ebuild,v 1.5 2003/02/13 12:06:26 vapier 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"
-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.3.987-r2
-	>=gnome-base/gnome-session-2.0.2
-	>=gnome-extra/bug-buddy-2.2.0
-	>=gnome-base/gdm-2.4.0.1
-	>=media-gfx/eog-1.0.1-r2
-	>=app-editors/gedit-2.0.1-r1
-	>=gnome-extra/yelp-1.0.1
-	>=gnome-base/nautilus-2.0.0-r3
-	>=x11-terms/gnome-terminal-2.0.0-r1
-	>=gnome-base/gnome-applets-2.0.0-r1
-	>=gnome-base/control-center-2.0.0
-	>=gnome-extra/gnome-utils-2.0.0
-	>=gnome-extra/gnome-media-2.0.0
-	>=gnome-extra/gnome-system-monitor-2.0.0-r1
-	>=gnome-extra/gnome-games-2.0.1
-	>=gnome-extra/gconf-editor-0.2
-	gnome-extra/gnome2-user-docs
-
-
-	>=x11-libs/gtk+-2.0.5
-	>=x11-libs/pango-1.0.3
-	>=dev-libs/atk-1.0.2
-	>=dev-libs/glib-2.0.4
-	>=gnome-base/eel-2.0.0-r1
-	>=gnome-base/gnome-panel-2.0.2
-	>=gnome-base/gnome-desktop-2.0.3
-	>=gnome-base/gnome-vfs-2.0.1
-	>=gnome-base/libbonoboui-2.0.0
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/librsvg-2.0.0-r1
-	>=gnome-base/libgnome-2.0.1-r1
-	>=gnome-base/libgnomecanvas-2.0.1
-	>=gnome-base/libgnomeui-2.0.1
-	>=gnome-base/bonobo-activation-1.0.2
-	>=net-libs/linc-0.5.0-r1
-	>=x11-libs/libzvt-2.0.1
-	>=gnome-base/libglade-2.0.0
-	>=x11-libs/libwnck-0.14-r1
-	>=gnome-base/ORBit2-2.4.0-r1"
-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
new file mode 100644
index 000000000000..01ca7ece35ca
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.2-r2.ebuild
@@ -0,0 +1,92 @@
+# 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/gnome-2.2-r2.ebuild,v 1.1 2003/02/17 18:30:34 foser 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"
+
+#  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/gnome-media-2.2.1.1
+	>=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
+	>=media-libs/gstreamer-0.6.0-r2
+	>=media-libs/gst-plugins-0.6.0-r1
+
+	>=x11-themes/gnome-icon-theme-1.0.0
+	>=x11-themes/gnome-themes-2.2
+	>=app-arch/file-roller-2.2.1
+	>=gnome-extra/nautilus-media-0.2.1
+	>=gnome-extra/acme-2.0.2
+	>=app-text/ggv-1.99.98"
+# g-s-m 2.0.4-r1 has a gnome 2.2+ only patch
+#	>=x11-libs/libzvt-2.0.1
+
+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"
+}