fix date/time stamp reporting, cleanup a lot

(Portage version: 2.0.51.19)

12 files changed, 59 insertions, 140 deletions

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"));
- 			    }
- 		}
-