reiser 4 fix

7 files changed, 38 insertions, 94 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 2b61b5b60ba2..cc58b68d6d70 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.111 2004/10/27 11:14:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.112 2004/11/03 00:11:12 foser Exp $
+
+*gnome-vfs-2.8.1-r2 (02 Nov 2004)
+
+  02 Nov 2004; foser <foser@gentoo.org> gnome-vfs-2.8.1-r2.ebuild :
+  Add reiser4 fix (#57756), thanks to infirit for suggesting the patch
 
 *gnome-vfs-2.8.1-r1 (27 Oct 2004)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index b8cbb095752d..2e9ac7035c3a 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,4 @@
+MD5 91d6213adb8a29442f81b9070ce297f5 gnome-vfs-2.8.1-r2.ebuild 2275
 MD5 8d2dab77b3ce6081125aca8cd297a3ab gnome-vfs-2.6.0.ebuild 1315
 MD5 3fa92087ee253ead4e3be4b0e3444add gnome-vfs-2.8.1.ebuild 2090
 MD5 38c1c3722f6f3174c951fb9e2f9a23d2 gnome-vfs-2.4.2-r1.ebuild 1049
@@ -9,6 +10,7 @@ MD5 3ba3e93e38198879a9a231aceb290ead ChangeLog 13267
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r1 69
+MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r2 69
 MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
 MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
 MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
@@ -16,6 +18,7 @@ MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
 MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
 MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
 MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1 69
+MD5 879f26aea1c97096745b3bcce181f5f7 files/gnome-vfs-2.8.1-reiser4_support.patch 1432
 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-2.8.1-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r1
deleted file mode 100644
index b1c7f8ae04ea..000000000000
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r1
+++ /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.1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r2
index b1c7f8ae04ea..b1c7f8ae04ea 100644
--- a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.8.1-r2
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
new file mode 100644
index 000000000000..37f3a8e04160
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.8.1-reiser4_support.patch
@@ -0,0 +1,25 @@
+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-2.8.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild
index 6ac06331e6f3..c1669a306e67 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/10/27 11:14:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.8.1-r2.ebuild,v 1.1 2004/11/03 00:11:12 foser Exp $
 
 inherit gnome2 eutils
 
@@ -21,7 +21,6 @@ RDEPEND=">=dev-libs/glib-2
 	>=dev-libs/libxml2-2.6
 	app-arch/bzip2
 
-	app-admin/fam
 
 	gnome-base/gnome-mime-data
 	>=x11-misc/shared-mime-info-0.14
@@ -35,6 +34,7 @@ RDEPEND=">=dev-libs/glib-2
 	hal? ( >=sys-apps/hal-0.2.92
 		>=sys-apps/dbus-0.22 )
 	howl? ( >=net-misc/howl-0.9.6-r1 )"
+#	app-admin/fam
 
 # FIXME : make the fam dep a virtual
 
@@ -72,6 +72,8 @@ src_unpack() {
 	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
 
 }
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
deleted file mode 100644
index bb7a65f565df..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.8.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.5 2004/10/18 16:30:21 foser Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl gnutls samba ipv6 hal howl"
-
-SLOT="2"
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64"
-LICENSE="GPL-2 LGPL-2"
-
-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
-
-	app-admin/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 )"
-
-# FIXME : make the fam dep a virtual
-
-# 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 COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# make howl a real switch (#64906)
-	epatch ${FILESDIR}/${P}-howl_config.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"