fixes for gnome-vfs

7 files changed, 132 insertions, 4 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 0f6f5672632d..df6209bc27d1 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.23 2002/09/13 17:56:52 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.24 2002/09/20 13:16:48 spider Exp $
 
+
+*gnome-vfs-2.0.4-r2 (20 Sep 2002)
+  20 Sep 2002; Spider <spider@gentoo.org> gnome-vfs-2.0.4-r2.ebuild :
+  moved the file removal to pre-install, thus not borking good things.
+  
 *gnome-vfs-2.0.4-r1 (13 Sep 2002)
   13 Sep 2002; Spider <spider@gentoo.org> gnome-vfs-2.0.4-r1.ebuild :
   added a check for a bad menu list file and removing it if needed
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2
new file mode 100644
index 000000000000..f06dd460f650
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.0.4-r2
@@ -0,0 +1 @@
+MD5 40ab89fa79dbb33c294b61337e54084e gnome-vfs-2.0.4.tar.bz2 892634
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild
new file mode 100644
index 000000000000..e3d281b24afd
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.0.4-r2.ebuild,v 1.1 2002/09/20 13:16:48 spider Exp $
+
+inherit gnome2
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Gnome Virtual Filesystem"
+SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+KEYWORDS="x86 ppc sparc sparc64"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND="=dev-libs/glib-2.0*
+	>=gnome-base/gconf-1.2.1
+	>=gnome-base/ORBit2-2.4.1
+	>=gnome-base/gnome-mime-data-2.0.1
+	>=gnome-base/libbonobo-2.0.0
+	>=gnome-base/bonobo-activation-1.0.3
+	>=sys-devel/gettext-0.10.40
+	>=dev-libs/openssl-0.9.5
+	>=sys-apps/bzip2-1.0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.22
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
+
+src_compile() {
+	gnome2_src_compile DESTDIR=${D}
+}
+
+pkg_preinst () {
+	## this check is there because gnome-vfs still adheres the file, though it doesn't need it. backwards compliance isnt always good
+	REMOVE="${ROOT}/etc/gnome-vfs-2.0/vfolders/applications.vfolder-info"
+	if [ -f ${REMOVE} ] ; then
+		rm -f ${REMOVE}
+	fi
+}
+
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 553c3f713386..f979774c94f2 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.39 2002/09/15 20:47:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.40 2002/09/20 13:16:48 spider Exp $
 
+
+*gnome-2.0.2-r1 (20 Sep 2002)
+  20 sep 2002; Spider <spider@gentoo.org> gnome-2.0.2-r1.ebuild :
+  updated gnome-vfs needs propagation
+  
 *gnome-2.0.2 (15 Sep 2002)
   15 Sep 2002; Spider <spider@gentoo.org> gnome-2.0.2.ebuild :
   back in style
diff --git a/gnome-base/gnome/files/digest-gnome-2.0.2-r1 b/gnome-base/gnome/files/digest-gnome-2.0.2-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnome-base/gnome/files/digest-gnome-2.0.2-r1
diff --git a/gnome-base/gnome/gnome-2.0.2-r1.ebuild b/gnome-base/gnome/gnome-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..36232fb9a117
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.0.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.0.2-r1.ebuild,v 1.1 2002/09/20 13:16:48 spider 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 sparc64"
+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.0.2.ebuild b/gnome-base/gnome/gnome-2.0.2.ebuild
index 6e2f1fcf929a..dc05b244500a 100644
--- a/gnome-base/gnome/gnome-2.0.2.ebuild
+++ b/gnome-base/gnome/gnome-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.0.2.ebuild,v 1.1 2002/09/15 20:47:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.0.2.ebuild,v 1.2 2002/09/20 13:16:48 spider Exp $
 
 S=${WORKDIR}
 DESCRIPTION="GNOME 2.0 - merge this package to merge the Gnome2 desktop"
@@ -53,7 +53,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=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/gnome-vfs-2.0.4-r2
 	>=gnome-base/libbonoboui-2.0.3
 	>=gnome-base/libbonobo-2.0.0
 	>=gnome-base/librsvg-2.0.1