fix date/time stamp reporting, cleanup a lot

(Portage version: 2.0.51.19)

22 files changed, 77 insertions, 653 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 4535472eb995..d8adfd816b47 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.148 2005/05/16 12:37:24 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.149 2005/06/04 11:47:32 foser Exp $
+
+*gnome-vfs-2.10.0-r2 (04 Jun 2005)
+*gnome-vfs-2.10.1-r1 (04 Jun 2005)
+
+  04 Jun 2005; Marinus Schraal <foser@gentoo.org> gnome-vfs-2.10.{0-r2,1-r1}.ebuild :
+  Add patch to fix date/time stamps (#92740)
 
   16 May 2005; John N. Laliberte <allanonjl@gentoo.org>
   gnome-vfs-1.0.5-r3.ebuild, gnome-vfs-1.0.5-r4.ebuild:
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index af6257e1d85c..d3e34ab5e58f 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -4,9 +4,10 @@ MD5 d29d9cf8d7faf835e2e59cf2d64eabcc gnome-vfs-2.8.3-r1.ebuild 2204
 MD5 3f31e708c7ae2f7d071eae7e08197c0c gnome-vfs-2.8.4.ebuild 2229
 MD5 4e88a727dcc3f992b2613f21b12a45ca gnome-vfs-1.0.5-r4.ebuild 2069
 MD5 a6c0e4fd5056d056279862d6730500da gnome-vfs-2.8.1-r2.ebuild 2224
-MD5 4def153476697efaf9a0ef379b5d2f01 gnome-vfs-2.10.0.ebuild 1898
 MD5 ce61b31cbeaa511b66b4e4eab483e282 gnome-vfs-2.6.1.1.ebuild 1751
+MD5 ca93f0d2009605a1fc936a8df5c58de1 gnome-vfs-2.10.0-r2.ebuild 2051
 MD5 6befee84846c4be046b53aa91e700c98 gnome-vfs-1.0.5-r3.ebuild 1958
+MD5 410df1ca43be7bf37b50d82b374653b5 gnome-vfs-2.10.1-r1.ebuild 2052
 MD5 56ee3548e7e48c9d8296a3c36f22b613 ChangeLog 17645
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 0c1c4fdf8e904e02ebf213f9303e0dfc gnome-vfs-2.8.4-r1.ebuild 2300
@@ -15,7 +16,6 @@ MD5 87c1b9929fce8975fc0f9aedb3cab3f0 files/digest-gnome-vfs-2.8.3-r1 154
 MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4-r1 154
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1 70
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
@@ -24,7 +24,10 @@ MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
 MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
 MD5 b49e57b668d5b8951bd6b7fe5808e175 files/digest-gnome-vfs-2.8.4 154
 MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r1 70
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
 MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
+MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
 MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
 MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
 MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3
deleted file mode 100644
index be580ead0c89..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-1.0.5-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75df5354fe84ee66953ec54bf2989588 gnome-vfs-1.0.5.tar.gz 1048954
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1
deleted file mode 100644
index df5f68f8b43d..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb9df65d6a77414bbde9f1bc429c9d97 gnome-vfs-2.10.0.tar.bz2 1901027
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r2
index df5f68f8b43d..df5f68f8b43d 100644
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.0-r2
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1-r1
index d3c0e874ae58..d3c0e874ae58 100644
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1-r1
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1.1
deleted file mode 100644
index a7dba8d3130d..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.6.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a5a7e86dbe539d64c7be99ccef5bc8db gnome-vfs-2.6.1.1.tar.bz2 1482056
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r2
deleted file mode 100644
index b1c7f8ae04ea..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c7286496a417dabfea563b724eae86b gnome-vfs-2.8.1.tar.bz2 1877981
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1
deleted file mode 100644
index c15cfc7fc2b3..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5484694e7250c80a231cfc525d924cc3 gnome-vfs-2.8.3.tar.bz2 1907154
-MD5 9bca818543777c41004e9bd512f73753 gnome-vfs-2.8.3-updated_hal_support.patch 75389
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4
deleted file mode 100644
index ea5326076a52..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 42d3505e9ef9c26a7aae4e511b9b4c34 gnome-vfs-2.8.4.tar.bz2 1892413
-MD5 9bca818543777c41004e9bd512f73753 gnome-vfs-2.8.3-updated_hal_support.patch 75389
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch
new file mode 100644
index 000000000000..7164047f3cc5
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch
@@ -0,0 +1,59 @@
+? .303470.patch.swp
+? compile
+? gnome-vfs-zip
+? imported/fnmatch/Makefile
+? imported/fnmatch/Makefile.in
+? libgnomevfs/.gnome-vfs-xfer.c.swp
+? libgnomevfs/171495.patch
+Index: libgnomevfs/gnome-vfs-xfer.c
+===================================================================
+RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-xfer.c,v
+retrieving revision 1.123
+diff -u -p -r1.123 gnome-vfs-xfer.c
+--- libgnomevfs/gnome-vfs-xfer.c	6 May 2005 12:19:40 -0000	1.123
++++ libgnomevfs/gnome-vfs-xfer.c	9 May 2005 11:29:32 -0000
+@@ -1682,28 +1682,36 @@ copy_directory (GnomeVFSFileInfo *source
+ 	gnome_vfs_directory_close (dest_directory_handle);
+ 	gnome_vfs_directory_close (source_directory_handle);
+ 
+-	if (result == GNOME_VFS_OK) {
++	if (result == GNOME_VFS_OK) {			
+ 		GnomeVFSFileInfo *info;
+-		info = gnome_vfs_file_info_new ();
++
++		if (target_dir_info && GNOME_VFS_FILE_INFO_SGID (target_dir_info)) {
++			info = gnome_vfs_file_info_dup (source_file_info);
++			info->gid = target_dir_info->gid;
++		} else {
++			/* No need to dup the file info in this case */
++			gnome_vfs_file_info_ref (source_file_info);
++			info = source_file_info;
++		}
++		
+ 		/* FIXME the modules should ignore setting of permissions if
+ 		 * "valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS" is clear
+ 		 * for now, make sure permissions aren't set to 000
+ 		 */
+-		gnome_vfs_file_info_copy (source_file_info, info);
+-		if (target_dir_info && GNOME_VFS_FILE_INFO_SGID(target_dir_info)) {
+-			info->gid = target_dir_info->gid;
+-		}
+-		if ((source_file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) != 0) {
++		if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) != 0) {
++			
+ 			/* Call this separately from the time one, since one of them may fail,
+ 			   making the other not run. */
+ 			gnome_vfs_set_file_info_uri (target_dir_uri, info, 
+-						     GNOME_VFS_SET_FILE_INFO_OWNER | GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
++						     GNOME_VFS_SET_FILE_INFO_OWNER | 
++						     GNOME_VFS_SET_FILE_INFO_PERMISSIONS);
+ 		}
+ 		
+ 		/* Call this last so nothing else changes the times */
+ 		gnome_vfs_set_file_info_uri (target_dir_uri, info, GNOME_VFS_SET_FILE_INFO_TIME);
+ 		gnome_vfs_file_info_unref (info);
+ 	}
++	
+ 	if (target_dir_info) {
+ 		gnome_vfs_file_info_unref (target_dir_info);
+ 	}
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-eggdesktop.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-eggdesktop.patch
deleted file mode 100644
index c9d545ee6d5b..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-eggdesktop.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -uNr gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c gnome-vfs-2.8.1.patched/libgnomevfs/eggdesktopentries.c
---- gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c	2004-09-06 08:28:17.000000000 +0200
-+++ gnome-vfs-2.8.1.patched/libgnomevfs/eggdesktopentries.c	2004-10-27 12:51:20.495171696 +0200
-@@ -224,7 +224,7 @@
-           g_free (path);
- 
-           if (fd < 0 && file_error == NULL)
--            g_set_error (&file_error, G_FILE_ERROR,
-+            file_error = g_error_new (G_FILE_ERROR,
-                          g_file_error_from_errno (errno),
-                          _("File could not be opened: %s"),
-                          g_strerror (errno));
-@@ -261,10 +261,8 @@
-   gint fd;
-   gchar **data_dirs;
-   GError *file_error;
--  GError *secondary_error;
- 
-   file_error = NULL;
--  secondary_error = NULL;
- 
- 
-   data_dirs = g_new0 (char *, 2);
-@@ -275,20 +273,18 @@
-   if (fd < 0)
-     { 
-       data_dirs = egg_get_secondary_data_dirs ();
--      fd = egg_find_file_in_data_dirs (file, data_dirs, &secondary_error);
-+      fd = egg_find_file_in_data_dirs (file, data_dirs, NULL);
-       g_strfreev (data_dirs);
- 
-       if (fd >= 0)
--       {
--         g_error_free (file_error);
--         file_error = NULL;
--       }
-+        {
-+          g_error_free (file_error);
-+          file_error = NULL;
-+        }
-     }
- 
-   if (file_error)
-     g_propagate_error (error, file_error);
--  else if (secondary_error)
--    g_propagate_error (error, secondary_error);
- 
-   return fd;
- }
-@@ -405,6 +401,7 @@
-     g_string_free (entries->parse_buffer, TRUE);
- 
-   g_strfreev (entries->legal_start_groups);
-+  g_free (entries->default_group_name);
- 
-   tmp = entries->groups;
-   while (tmp != NULL)
-@@ -1912,9 +1909,9 @@
-     q = strstr (p, "@");
- 
-   if (!q)
--    country_len = q - p;
--  else
-     country_len = strlen (p);
-+  else
-+    country_len = q - p;
- 
-   if (country_len <= 0)
-     return NULL;
-@@ -1972,9 +1969,9 @@
-   q = strstr (p, "@");
- 
-   if (!q)
--    encoding_len = q - p;
--  else
-     encoding_len = strlen (p);
-+  else
-+    encoding_len = q - p;
- 
-   if (encoding_len <= 0)
-     {
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
deleted file mode 100644
index 8d2debd2a795..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-howl_config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -aurN gnome-vfs-2.8.1-orig/configure.in gnome-vfs-2.8.1/configure.in
---- gnome-vfs-2.8.1-orig/configure.in	2004-09-14 12:23:25.000000000 -0400
-+++ gnome-vfs-2.8.1/configure.in	2004-09-21 17:48:34.136579880 -0400
-@@ -676,12 +676,16 @@
- dnl Howl
- dnl ****************************
- 
--PKG_CHECK_MODULES(HOWL, howl >= 0.9.6,
--		  [AM_CONDITIONAL(HAVE_HOWL, true)
--		   AC_DEFINE(HAVE_HOWL, [], [Set if we can use howl])],
--	          [AM_CONDITIONAL(HAVE_HOWL, false)])
--AC_SUBST(HOWL_CFLAGS)
--AC_SUBST(HOWL_LIBS)
-+AM_CONDITIONAL(HAVE_HOWL, false)
-+AC_ARG_ENABLE(howl, [  --disable-howl     build without howl support])
-+if test "x$enable_howl" != "xno"; then
-+	PKG_CHECK_MODULES(HOWL, howl >= 0.9.6,
-+		  	[AM_CONDITIONAL(HAVE_HOWL, true)
-+		   	AC_DEFINE(HAVE_HOWL, [], [Set if we can use howl])],
-+	          	[AM_CONDITIONAL(HAVE_HOWL, false)])
-+	AC_SUBST(HOWL_CFLAGS)
-+	AC_SUBST(HOWL_LIBS)
-+fi
- 
- dnl ****************************
- dnl HAL stuff
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-reiser4_support.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-reiser4_support.patch
deleted file mode 100644
index 37f3a8e04160..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-reiser4_support.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -r -u --from-file=gnome-vfs-2.7.92.orig gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-filesystem-type.c	2004-09-12 16:25:59.650886232 +0100
-+++ gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-filesystem-type.c	2004-09-12 22:43:46.278080336 +0100
-@@ -61,6 +61,7 @@
- 	{ "nwfs"     , N_("Netware Volume"), 0 },
- 	{ "proc"     , N_("System Volume"), 0 },
- 	{ "procfs"   , N_("System Volume"), 0 },
-+	{ "reiser4"  , N_("Reiser4 Linux Volume"), 1 },
- 	{ "reiserfs" , N_("ReiserFS Linux Volume"), 1 },
- 	{ "smbfs"    , N_("Windows Shared Volume"), 1 },
- 	{ "supermount",N_("SuperMount Volume"), 0 },
-diff -r -u --from-file=gnome-vfs-2.7.92.orig gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-hal-mounts.c
---- gnome-vfs-2.7.92.orig/libgnomevfs/gnome-vfs-hal-mounts.c	2004-09-12 16:25:59.637888208 +0100
-+++ gnome-vfs-2.7.92/libgnomevfs/gnome-vfs-hal-mounts.c	2004-09-12 16:27:53.636557776 +0100
-@@ -693,7 +693,8 @@
- 				       strcmp (vol->fstype, "ext3") == 0 ||
- 				       strcmp (vol->fstype, "jfs") == 0 ||
- 				       strcmp (vol->fstype, "xfs") == 0 ||
--				       strcmp (vol->fstype, "reiser") == 0) {
-+				       strcmp (vol->fstype, "reiser") == 0 ||
-+				       strcmp (vol->fstype, "reiser4") == 0) {
- 				    name = g_strdup (_("Linux Disk"));
- 			    }
- 		}
-
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
deleted file mode 100644
index 8cf247e7a1c9..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r3.ebuild,v 1.20 2005/05/16 12:37:24 allanonjl Exp $
-
-inherit eutils libtool toolchain-funcs
-
-DESCRIPTION="GNOME Virtual File System"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.0/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips ppc64 arm"
-IUSE="doc ssl nls"
-
-RDEPEND="=gnome-base/gconf-1.0*
-	>=gnome-base/gnome-libs-1.4.1.2
-	>=gnome-base/gnome-mime-data-1.0.1
-	>=app-arch/bzip2-1.0.2
-	ssl? ( dev-libs/openssl )"
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.8.0
-	>=dev-util/intltool-0.11
-	>=gnome-base/gnome-common-1.2.4
-	nls? ( sys-devel/gettext )
-	doc? ( dev-util/gtk-doc )"
-# gnome-common is for m4 macros needed for patches ...
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Add missing macros for charset conversion
-	epatch ${FILESDIR}/1.0/${P}-codeset.patch
-	# Use GNOME2 Gconf keys for proxy settings
-	epatch ${FILESDIR}/1.0/${P}-proxy.patch
-	# Avoid openjade errors. See bug #46266.
-	epatch ${FILESDIR}/1.0/${P}-gtkdoc_fixes.patch
-
-	# Fix a rare segfault with gnome-mime-data-2.0.1.  Weird one really ...
-	# <azarah@gentoo.org> (2 Jan 2003).
-	epatch ${FILESDIR}/1.0/${P}-fix-segfault.patch
-
-	#apply both patches to compile with gcc-3.4 closing bug #53075
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
-	then
-		epatch ${FILESDIR}/1.0/${P}-gcc3.4.patch
-	fi
-
-
-	autoheader
-	aclocal -I /usr/share/aclocal/gnome-macros
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-
-	elibtoolize
-
-	use nls || {
-		myconf="${myconf} --disable-nls"
-		mkdir intl
-		touch intl/libgettext.h
-	}
-
-	myconf="${myconf} $(use_enable doc gtk-doc)"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rmdir ${D}/usr/doc
-
-	dodoc AUTHORS COPYING* ChangeLog NEWS README
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild
index b49400f17556..7948048c0bf4 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r1.ebuild,v 1.1 2005/04/05 02:12:14 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.0-r2.ebuild,v 1.1 2005/06/04 11:47:32 foser Exp $
 
 inherit gnome2 eutils
 
@@ -71,6 +71,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
 	# CAN-2005-0706 (#84936)
 	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+	# fix date/time stamp
+	epatch ${FILESDIR}/${PN}-2.10.1-date_time_stamp.patch
 
 }
 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.0.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.0.ebuild
deleted file mode 100644
index 4cdbefa9d13e..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.0.ebuild,v 1.2 2005/03/21 23:16:31 foser Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2 LGPL-2"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm"
-IUSE="doc ssl gnutls samba ipv6 hal howl"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=gnome-base/gconf-1.2
-	>=gnome-base/orbit-2.9
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	dev-libs/popt
-
-	virtual/fam
-
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-
-	ssl? ( >=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? ( !ssl? ( net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	samba? ( >=net-fs/samba-3
-		!gnome-extra/gnome-vfs-extras )
-	hal? ( >=sys-apps/hal-0.4
-		>=sys-apps/dbus-0.22 )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable ssl openssl) \
-	$(use_enable gnutls) \
-	$(use_enable samba) \
-	$(use_enable ipv6) \
-	$(use_enable hal) \
-	$(use_enable howl) \
-	--disable-schemas-install
-	--without-gtk"
-
-# this works because of the order of conifgure parsing
-# so should always be behind the use_enable options
-# foser <foser@gentoo.org 19 Apr 2004
-use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# reiser4 patch, c'mon (#57756)
-	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-
-}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.10.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild
index 1d717e6e05b9..4d4993e71579 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.10.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1.ebuild,v 1.2 2005/05/28 10:25:46 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r1.ebuild,v 1.1 2005/06/04 11:47:32 foser Exp $
 
 inherit gnome2 eutils
 
@@ -71,6 +71,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
 	# CAN-2005-0706 (#84936)
 	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+	# fix timestamp issues (#92740)
+	epatch ${FILESDIR}/${P}-date_time_stamp.patch
 
 }
 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild
deleted file mode 100644
index 59605092b983..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.6.1.1.ebuild,v 1.16 2005/01/08 23:13:38 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ~ppc alpha sparc hppa amd64 mips ia64 ppc64 arm"
-IUSE="doc ssl gnutls  samba ipv6"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/orbit-2.9
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.2.8
-
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-
-	virtual/fam
-
-	ssl? ( >=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? ( !ssl? ( net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-
-	samba? ( >=net-fs/samba-3
-		!gnome-extra/gnome-vfs-extras )"
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable ssl openssl) \
-	$(use_enable gnutls) \
-	$(use_enable samba) \
-	$(use_enable ipv6) \
-	--disable-schemas-install
-	--without-gtk"
-
-# this works because of the order of conifgure parsing
-# so should always be behind the use_enable options
-# foser <foser@gentoo.org 19 Apr 2004
-use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
-
-# Fix bonobo 
-USE_DESTDIR="1"
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild
deleted file mode 100644
index c2938b24b10b..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild,v 1.8 2005/01/08 23:13:38 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm"
-IUSE="doc ssl gnutls samba ipv6 hal howl"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/orbit-2.9
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-
-	virtual/fam
-
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-
-	ssl? ( >=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? ( !ssl? ( net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	samba? ( >=net-fs/samba-3
-		!gnome-extra/gnome-vfs-extras )
-	hal? ( >=sys-apps/hal-0.2.92
-		>=sys-apps/dbus-0.22 )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable ssl openssl) \
-	$(use_enable gnutls) \
-	$(use_enable samba) \
-	$(use_enable ipv6) \
-	$(use_enable hal) \
-	$(use_enable howl) \
-	--disable-schemas-install
-	--without-gtk"
-
-# this works because of the order of conifgure parsing
-# so should always be behind the use_enable options
-# foser <foser@gentoo.org 19 Apr 2004
-use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# fix eggdesktop leaks and misallacations (#66695)
-	epatch ${FILESDIR}/${P}-eggdesktop.patch
-	# make howl a real switch (#64906)
-	epatch ${FILESDIR}/${P}-howl_config.patch
-	# fix oh add reiser4 support (#57756)
-	epatch ${FILESDIR}/${P}-reiser4_support.patch
-	autoconf
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
-
-# Fix bonobo 
-USE_DESTDIR="1"
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild
deleted file mode 100644
index 666d3f605c0b..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.3-r1.ebuild,v 1.8 2005/04/02 03:57:40 geoman Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${P}-updated_hal_support.patch"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 mips ia64 ~ppc64 arm"
-IUSE="doc ssl gnutls samba ipv6 hal howl"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/orbit-2.9
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	dev-libs/popt
-
-	virtual/fam
-
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-
-	ssl? ( >=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? ( !ssl? ( net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	samba? ( >=net-fs/samba-3
-		!gnome-extra/gnome-vfs-extras )
-	hal? ( >=sys-apps/hal-0.4
-		>=sys-apps/dbus-0.22 )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable ssl openssl) \
-	$(use_enable gnutls) \
-	$(use_enable samba) \
-	$(use_enable ipv6) \
-	$(use_enable hal) \
-	$(use_enable howl) \
-	--disable-schemas-install
-	--without-gtk"
-
-# this works because of the order of conifgure parsing
-# so should always be behind the use_enable options
-# foser <foser@gentoo.org 19 Apr 2004
-use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# updated hal support (#65378)
-	epatch ${DISTDIR}/${P}-updated_hal_support.patch
-	# reiser4 patch, c'mon (#57756)
-	epatch ${FILESDIR}/${P}-reiser4_support.patch
-
-	autoconf
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
-
-# Fix bonobo 
-USE_DESTDIR="1"
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.4.ebuild
deleted file mode 100644
index cc22ba1f26ff..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.4.ebuild,v 1.1 2005/02/24 06:03:05 obz Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.8.3-updated_hal_support.patch"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64 ~arm"
-IUSE="doc ssl gnutls samba ipv6 hal howl"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/orbit-2.9
-	>=gnome-base/libbonobo-2
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	dev-libs/popt
-
-	virtual/fam
-
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-
-	ssl? ( >=dev-libs/openssl-0.9.5
-		!gnome-extra/gnome-vfs-sftp )
-	gnutls? ( !ssl? ( net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp ) )
-	samba? ( >=net-fs/samba-3
-		!gnome-extra/gnome-vfs-extras )
-	hal? ( >=sys-apps/hal-0.4
-		>=sys-apps/dbus-0.22 )
-	howl? ( >=net-misc/howl-0.9.6-r1 )"
-
-# ssl/gnutls USE deps : if both are enabled choose openssl
-# foser <foser@gentoo.org> 19 Apr 2004
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-G2CONF="${G2CONF} \
-	$(use_enable ssl openssl) \
-	$(use_enable gnutls) \
-	$(use_enable samba) \
-	$(use_enable ipv6) \
-	$(use_enable hal) \
-	$(use_enable howl) \
-	--disable-schemas-install
-	--without-gtk"
-
-# this works because of the order of conifgure parsing
-# so should always be behind the use_enable options
-# foser <foser@gentoo.org 19 Apr 2004
-use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
-
-# Fix bonobo 
-USE_DESTDIR="1"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# updated hal support (#65378)
-	epatch ${DISTDIR}/${PN}-2.8.3-updated_hal_support.patch
-	# reiser4 patch, c'mon (#57756)
-	epatch ${FILESDIR}/${PN}-2.8.3-reiser4_support.patch
-
-	autoconf
-
-}
-
-src_install() {
-
-	gnome2_src_install
-
-	# remove unused dir (#46567)
-	rmdir ${D}/usr/doc
-
-	# FIXME: there are cleaner ways to do this
-	echo "trash:    libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
-
-}
-