Ensure correct automake version is used for regen. Remove old versions and (lots of) stale patches

Package-Manager: portage-2.1.2_rc2

10 files changed, 0 insertions, 186 deletions

diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1
deleted file mode 100644
index 264eee253749..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bc62212600167acf78c9771add5cce7e gnome-vfs-2.12.1.1.tar.bz2 1726588
-RMD160 b96cd620ce60131c0ff467fd277d89ac76419e09 gnome-vfs-2.12.1.1.tar.bz2 1726588
-SHA256 c6294cb9553a0d059ac307427b8ac89048103d48255996a879686a74024cd01c gnome-vfs-2.12.1.1.tar.bz2 1726588
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2
deleted file mode 100644
index 7b30a1f2c98f..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.12.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4d7b9c14af29a9bf813ab4831eeeacbb gnome-vfs-2.12.2.tar.bz2 1558218
-RMD160 831d83c791631e7273fdebec1047da6055757104 gnome-vfs-2.12.2.tar.bz2 1558218
-SHA256 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177 gnome-vfs-2.12.2.tar.bz2 1558218
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2
deleted file mode 100644
index c361566b351b..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.14.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b657e31974d6981adf9b2c4db981f62c gnome-vfs-2.14.2.tar.bz2 1816194
-RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 gnome-vfs-2.14.2.tar.bz2 1816194
-SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 gnome-vfs-2.14.2.tar.bz2 1816194
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
deleted file mode 100644
index 29f11795b592..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fdea9d7be42320c3fa6a09e645613480 gnome-vfs-2.16.0.tar.bz2 1890562
-RMD160 9f4008c0e8cae26513006e4c1f1c1c126116d8ef gnome-vfs-2.16.0.tar.bz2 1890562
-SHA256 d1854eed8ef93ac2f111d56367106159153bb5857793a880b13271bb5fb34361 gnome-vfs-2.16.0.tar.bz2 1890562
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1
deleted file mode 100644
index 986e9789c93c..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d9f7b01496ecc227015bc7a08fb798f gnome-vfs-2.16.1.tar.bz2 1893290
-RMD160 e43d47a58dc9dd4ceb6155d5c4b8229dd8be85f0 gnome-vfs-2.16.1.tar.bz2 1893290
-SHA256 8e6aaa1fb1fcf682484b27bbdf4335234752868ef3bc84ea1102a6ebf0d89067 gnome-vfs-2.16.1.tar.bz2 1893290
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
deleted file mode 100644
index 7164047f3cc5..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-date_time_stamp.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-? .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.10.1-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch
deleted file mode 100644
index e8a83da20092..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-resolve.c gnome-vfs-2.10.1-fbsd/libgnomevfs/gnome-vfs-resolve.c
---- gnome-vfs-2.10.1/libgnomevfs/gnome-vfs-resolve.c	2004-12-03 14:08:20.000000000 +0100
-+++ gnome-vfs-2.10.1-fbsd/libgnomevfs/gnome-vfs-resolve.c	2005-08-20 13:03:31.000000000 +0200
-@@ -172,8 +172,13 @@
- 	   switch (error) {
- 			 
- 	   case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
--	   case EAI_ADDRFAMILY:		
--	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#ifdef EAI_ADDRFAMILY
-+	   case EAI_ADDRFAMILY:
-+#endif
-+#ifdef EAI_NODATA
-+	   case EAI_NODATA:
-+#endif
-+	   	return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- 	   case EAI_FAIL:
- 	   case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
-diff -ur gnome-vfs-2.10.1/modules/sftp-method.c gnome-vfs-2.10.1-fbsd/modules/sftp-method.c
---- gnome-vfs-2.10.1/modules/sftp-method.c	2004-12-03 14:08:20.000000000 +0100
-+++ gnome-vfs-2.10.1-fbsd/modules/sftp-method.c	2005-08-20
-@@ -1243,7 +1243,9 @@
- 		if (io_status == G_IO_STATUS_NORMAL) {
- 			buffer[len] = 0;
- 			if (g_str_has_suffix (buffer, "password: ") ||
-+			    g_str_has_suffix (buffer, "password:")  ||
- 			    g_str_has_suffix (buffer, "Password: ") ||
-+			    g_str_has_suffix (buffer, "Password:")  ||
- 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
- 				if (!done_auth && gnome_vfs_uri_get_password (uri) != NULL) {
- 					password = g_strdup (gnome_vfs_uri_get_password (uri));
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
deleted file mode 100644
index e8608b63509f..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-samba-close_fn.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/config.h.in gnome-vfs-2.10.1.fixed/config.h.in
---- gnome-vfs-2.10.1/config.h.in	2005-04-11 03:07:33.000000000 -0400
-+++ gnome-vfs-2.10.1.fixed/config.h.in	2005-09-02 15:19:13.000000000 -0400
-@@ -253,6 +253,9 @@
- /* Defined if flags availible in SMBCCTXT */
- #undef HAVE_SAMBA_FLAGS
- 
-+/* Defined if close_fn is in SMBCCTXT instead of close */
-+#undef HAVE_SAMBA_CLOSE_FN
-+
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/configure.in gnome-vfs-2.10.1.fixed/configure.in
---- gnome-vfs-2.10.1/configure.in	2005-03-31 21:28:41.000000000 -0500
-+++ gnome-vfs-2.10.1.fixed/configure.in	2005-09-02 14:54:27.000000000 -0400
-@@ -541,6 +541,9 @@
- 		AC_CHECK_MEMBER(SMBCCTX.flags,
- 				[AC_DEFINE(HAVE_SAMBA_FLAGS,, [Defined if flags availible in SMBCCTXT])],,
- 				[#include <libsmbclient.h>])
-+		AC_CHECK_MEMBER(SMBCCTX.close_fn,
-+				[AC_DEFINE(HAVE_SAMBA_CLOSE_FN,, [Defined if close_fn used in SMBCCTXT instead of close])],,
-+				[#include <libsmbclient.h>])
- 		CPPFLAGS="$CPPFLAGS_save"
- 	else
- 		SAMBA_CFLAGS=""
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.10.1/modules/smb-method.c gnome-vfs-2.10.1.fixed/modules/smb-method.c
---- gnome-vfs-2.10.1/modules/smb-method.c	2005-03-02 18:44:11.000000000 -0500
-+++ gnome-vfs-2.10.1.fixed/modules/smb-method.c	2005-09-02 14:57:00.000000000 -0400
-@@ -1425,7 +1425,11 @@
- 
- 		/* Important: perform_authentication leaves and re-enters the lock! */
- 		while (perform_authentication (&actx) > 0) {
-+#ifndef HAVE_SAMBA_CLOSE_FN
- 			r = smb_context->close (smb_context, handle->file);
-+#else /* HAVE_SAMBA_CLOSE_FN */
-+			r = smb_context->close_fn (smb_context, handle->file);
-+#endif /* HAVE_SAMBA_CLOSE_FN */
- 			actx.res = (r >= 0) ? GNOME_VFS_OK : gnome_vfs_result_from_errno ();
- 		}
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
deleted file mode 100644
index a99bd26b5043..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: gnome-vfs-2.11.92/libgnomevfs/gnome-vfs-resolve.c
-===================================================================
---- gnome-vfs-2.11.92.orig/libgnomevfs/gnome-vfs-resolve.c
-+++ gnome-vfs-2.11.92/libgnomevfs/gnome-vfs-resolve.c
-@@ -174,7 +174,10 @@ _gnome_vfs_result_from_gai_error (int er
- #ifdef EAI_ADDRFAMILY
- 	   case EAI_ADDRFAMILY:		
- #endif
--	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#ifdef EAI_NODATA
-+	   case EAI_NODATA:
-+#endif
-+	   	return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
- #ifdef EAI_SYSTEM
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- #endif
-Index: gnome-vfs-2.11.92/modules/file-method.c
-===================================================================
---- gnome-vfs-2.11.92.orig/modules/file-method.c
-+++ gnome-vfs-2.11.92/modules/file-method.c
-@@ -51,6 +51,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #ifndef G_OS_WIN32		/* We don't want the ftruncate() in mingw's unistd.h */
- #include <unistd.h>
- #endif
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch
deleted file mode 100644
index 2fbddfc9ba3e..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.8.3-reiser4_support.patch
+++ /dev/null
@@ -1,11 +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 },