Added patches for Gentoo/FreeBSD. As per bug #103130. See also gnome bug #168203.

(Portage version: 2.0.51.22)

7 files changed, 176 insertions, 9 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index ef3a8028b4a0..59f77be1eeea 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.166 2005/08/24 09:22:04 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.167 2005/08/25 23:24:43 flameeyes Exp $
+
+*gnome-vfs-2.10.1-r2 (25 Aug 2005)
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gnome-vfs-2.10.1-fbsd.patch, +files/gnome-vfs-2.11.92-fbsd.patch,
+  +gnome-vfs-2.10.1-r2.ebuild, gnome-vfs-2.11.92.ebuild:
+  Added patches for Gentoo/FreeBSD. As per bug #103130. See also gnome bug
+  #168203.
 
 *gnome-vfs-2.11.92 (24 Aug 2005)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index ba0cdf899e79..8633c2488cdf 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,18 +1,22 @@
+MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
 MD5 4a044742c2b2b81932d50fdd40438218 ChangeLog 19664
 MD5 b38fd6ba659d5d63d370a8bc36c43733 gnome-vfs-2.10.1-r1.ebuild 2049
-MD5 4f935f9effdc50e0dfa0a45ebb66bd73 gnome-vfs-2.11.92.ebuild 1784
+MD5 777dcc1206653a41000775199ccd0e86 gnome-vfs-2.11.92.ebuild 1861
+MD5 5c4f33e1a4c0dbe26de2fa2fc00b66a4 gnome-vfs-2.10.1-r2.ebuild 2106
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5c37214d9aecc7f5aef92160839ceeb6 gnome-vfs-2.10.0-r2.ebuild 2045
-MD5 ed7cf04e9deeacff0d7c7848a5985556 gnome-vfs-1.0.5-r4.ebuild 2122
 MD5 c4482dd33a470e671d27a00eb8fbe044 files/gnome-vfs-2.10.1-date_time_stamp.patch 2297
-MD5 b0c503dc8276be2fae063259ca0f2514 files/digest-gnome-vfs-2.11.92 71
 MD5 09f0fab6d414a859d0f979bef3e10dfb files/gnome-vfs-2.8.3-reiser4_support.patch 710
-MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
+MD5 b0c503dc8276be2fae063259ca0f2514 files/digest-gnome-vfs-2.11.92 71
+MD5 c599d081cb908d1fe6851ab69d80a7fa files/gnome-vfs-2.10.1-fbsd.patch 1505
+MD5 a1cf50fb8bc49456cf596baa1a3d417d files/gnome-vfs-2.11.92-fbsd.patch 612
+MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r2 70
 MD5 d20a2ead9fd45768a182fe24423b0842 files/digest-gnome-vfs-2.10.1-r1 70
 MD5 ba8ad5c040af8bd498c9ec71ac1df40e files/gnome-vfs-2-CAN-2005-0706.patch 490
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r4 68
+MD5 2bebfc7d172b325dc37efef679cbf545 files/digest-gnome-vfs-2.10.0-r2 70
 MD5 4072a11c3c98c493cbc0bb851176fb44 files/1.0/gnome-vfs-1.0.5-codeset.patch 1762
-MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
-MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
 MD5 7320d4ac9d4f99766075061daa53ea63 files/1.0/gnome-vfs-1.0.5-gtkdoc_fixes.patch 4892
+MD5 2ae3110a6e6fb30cfa593e4210535dc2 files/1.0/gnome-vfs-1.0.5-gcc3.4.patch 837
 MD5 25d42b1a4cf935fbedd3465bc4a8dd7c files/1.0/gnome-vfs-1.0.5-proxy.patch 2863
+MD5 071edd844b13f596a2f7d986b4512521 files/1.0/gnome-vfs-1.0.5-fix-segfault.patch 430
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1-r2 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1-r2
new file mode 100644
index 000000000000..d3c0e874ae58
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.10.1-r2
@@ -0,0 +1 @@
+MD5 88b520e5de748a310a2aef62fc095c8b gnome-vfs-2.10.1.tar.bz2 1905314
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
new file mode 100644
index 000000000000..e8a83da20092
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.10.1-fbsd.patch
@@ -0,0 +1,32 @@
+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.11.92-fbsd.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
new file mode 100644
index 000000000000..a99bd26b5043
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.11.92-fbsd.patch
@@ -0,0 +1,28 @@
+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/gnome-vfs-2.10.1-r2.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
new file mode 100644
index 000000000000..7d1085e4e2b3
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.10.1-r2.ebuild
@@ -0,0 +1,87 @@
+# 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-r2.ebuild,v 1.1 2005/08/25 23:24:43 flameeyes Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+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.16
+
+	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
+	# CAN-2005-0706 (#84936)
+	epatch ${FILESDIR}/${PN}-2-CAN-2005-0706.patch
+	# fix timestamp issues (#92740)
+	epatch ${FILESDIR}/${P}-date_time_stamp.patch
+	# fix Gentoo/FreeBSD
+	epatch ${FILESDIR}/${P}-fbsd.patch
+}
+
+src_install() {
+
+	gnome2_src_install
+
+	# remove unused dir (#46567)
+	rmdir ${D}/usr/doc
+
+}
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
index 75be363b9c06..3b798660168b 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild
@@ -1,8 +1,8 @@
 # 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.11.92.ebuild,v 1.1 2005/08/24 09:22:04 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.11.92.ebuild,v 1.2 2005/08/25 23:24:43 flameeyes Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="http://www.gnome.org/"
@@ -60,6 +60,13 @@ pkg_setup() {
 	use gnutls && use ssl && G2CONF="${G2CONF} --disable-gnutls"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-fbsd.patch
+}
+
 src_install() {
 	gnome2_src_install