New revision, add patch to support mounting NTFS drives with ntfs-3g.

Package-Manager: portage-2.1.1_pre5-r3

5 files changed, 80 insertions, 5 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index 37a64a340ee5..e0bfa22df4f3 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.18 2006/08/18 23:23:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.19 2006/08/25 19:44:00 chutzpah Exp $
+
+*gnome-mount-0.4-r5 (25 Aug 2006)
+
+  25 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/gnome-mount-0.4-ntfs3g.patch, +gnome-mount-0.4-r5.ebuild:
+  New revision, add patch to support mounting NTFS drives with ntfs-3g.
 
   19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org>
   gnome-mount-0.4-r4.ebuild:
diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index 73ce67c1282c..aae0fb8959c6 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -6,6 +6,10 @@ AUX gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df260358
 MD5 cbbc2b9e3b351a389b877bbb0423e34b files/gnome-mount-0.4-hal-mountable.patch 564
 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 files/gnome-mount-0.4-hal-mountable.patch 564
 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13 files/gnome-mount-0.4-hal-mountable.patch 564
+AUX gnome-mount-0.4-ntfs3g.patch 765 RMD160 95cfd9ea57cc0b38fab0b2732bfffef61e0a947a SHA1 ef8af3919b4082245ddb60acf9a67cac12a12edb SHA256 b3d74f64f4cae0731e33df00c213750a815a77971cba6aa6795e898682966ca9
+MD5 534285925d6d02bead2c5fdd1bc7ef00 files/gnome-mount-0.4-ntfs3g.patch 765
+RMD160 95cfd9ea57cc0b38fab0b2732bfffef61e0a947a files/gnome-mount-0.4-ntfs3g.patch 765
+SHA256 b3d74f64f4cae0731e33df00c213750a815a77971cba6aa6795e898682966ca9 files/gnome-mount-0.4-ntfs3g.patch 765
 AUX gnome-mount-hal-no-media-fstab.patch 15854 RMD160 53fc945ecca7fb7ba7a3805002e23b4abc160351 SHA1 23259c23fc95fe7c77671b9b69e88dacb2538b7e SHA256 49fe069d1fc5ebe16cb4f6929c457ae459056195f242891e20bb05e3b9fc91f8
 MD5 7a04f8633da7884e72aaf1016bc8ca96 files/gnome-mount-hal-no-media-fstab.patch 15854
 RMD160 53fc945ecca7fb7ba7a3805002e23b4abc160351 files/gnome-mount-hal-no-media-fstab.patch 15854
@@ -23,10 +27,14 @@ EBUILD gnome-mount-0.4-r4.ebuild 952 RMD160 23d8d88f5e84c962ddbdec7679b1cbbbfefa
 MD5 a3335f54b8b62a2f0f1387d7dfe6250a gnome-mount-0.4-r4.ebuild 952
 RMD160 23d8d88f5e84c962ddbdec7679b1cbbbfefa6159 gnome-mount-0.4-r4.ebuild 952
 SHA256 8535d5cbcedfbe0b9b076e3e6f5aa15ad4b1f8323cc29b47090f96ad9da23027 gnome-mount-0.4-r4.ebuild 952
-MISC ChangeLog 2714 RMD160 159fd23fbad39bc1176147f56b41bae4169b895a SHA1 50719770b24e64c9f3e86b20b14d624647d4d63b SHA256 8cc8dbbd68eb3af4e0beea6d927f626579a2beeb755da8b85d5e529aaf47dbb4
-MD5 0ba808dee1865aa8b8426d298b295cb5 ChangeLog 2714
-RMD160 159fd23fbad39bc1176147f56b41bae4169b895a ChangeLog 2714
-SHA256 8cc8dbbd68eb3af4e0beea6d927f626579a2beeb755da8b85d5e529aaf47dbb4 ChangeLog 2714
+EBUILD gnome-mount-0.4-r5.ebuild 1041 RMD160 16f22358fa6aae2b7050b7c8c567214b19577934 SHA1 081b351e79bb6712763c44acd0911726f42d17bf SHA256 0f08cff97b482804079eccd30b70599ae765f20557e696d93c1d738a3af28066
+MD5 399730ebefe53d4a63b14cc418906fe5 gnome-mount-0.4-r5.ebuild 1041
+RMD160 16f22358fa6aae2b7050b7c8c567214b19577934 gnome-mount-0.4-r5.ebuild 1041
+SHA256 0f08cff97b482804079eccd30b70599ae765f20557e696d93c1d738a3af28066 gnome-mount-0.4-r5.ebuild 1041
+MISC ChangeLog 2943 RMD160 63170256bd9ea4dd3d3b8a3ccf150bbc8ccc6355 SHA1 044287cfd90cb48aad129d3ec29c3a2080b2c206 SHA256 ce7761b808a0bb725a08f42b6cc80af72aef5b9e227a6a9ad9c4364fb1836142
+MD5 e94665441b6939d39d760efbc7d0166b ChangeLog 2943
+RMD160 63170256bd9ea4dd3d3b8a3ccf150bbc8ccc6355 ChangeLog 2943
+SHA256 ce7761b808a0bb725a08f42b6cc80af72aef5b9e227a6a9ad9c4364fb1836142 ChangeLog 2943
 MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193
 MD5 8f804bac2d3835f24ed9a73034f969a1 metadata.xml 206
 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 metadata.xml 206
@@ -40,3 +48,6 @@ SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/di
 MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r4 247
 RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r4 247
 SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r4 247
+MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r5 247
+RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r5 247
+SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r5 247
diff --git a/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r5 b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r5
new file mode 100644
index 000000000000..8b49c8a43c9e
--- /dev/null
+++ b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r5
@@ -0,0 +1,3 @@
+MD5 75f260ea6b0ec3c5e0af3c722fbd9568 gnome-mount-0.4.tar.gz 364546
+RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be gnome-mount-0.4.tar.gz 364546
+SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 gnome-mount-0.4.tar.gz 364546
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.4-ntfs3g.patch b/gnome-base/gnome-mount/files/gnome-mount-0.4-ntfs3g.patch
new file mode 100644
index 000000000000..e1c282319cf2
--- /dev/null
+++ b/gnome-base/gnome-mount/files/gnome-mount-0.4-ntfs3g.patch
@@ -0,0 +1,17 @@
+diff -ur gnome-mount-0.4-orig/src/gnome-mount.c gnome-mount-0.4/src/gnome-mount.c
+--- gnome-mount-0.4-orig/src/gnome-mount.c	2006-02-24 00:14:23.000000000 -0500
++++ gnome-mount-0.4/src/gnome-mount.c	2006-08-25 13:56:00.000000000 -0400
+@@ -651,6 +651,13 @@
+ 			snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
+ 			g_ptr_array_add (options, uidbuf);
+ 		}
++	} else if (strcmp (fstype, "ntfs-3g") == 0) {
++		/* needed for FUSE to mount */
++		g_ptr_array_add (options, "nonempty");
++		if (opts & MOUNT_UID) {
++			snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
++			g_ptr_array_add (options, uidbuf);
++		}
+ 	} else if (strcmp (fstype, "iso9660") == 0) {
+ 		if (opts & MOUNT_UID) {
+ 			snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
new file mode 100644
index 000000000000..fa4e9547cbaa
--- /dev/null
+++ b/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r5.ebuild,v 1.1 2006/08/25 19:44:00 chutzpah Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Wrapper for (un)mounting and ejecting disks"
+HOMEPAGE="http://freedesktop.org/~david/"
+SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=gnome-base/libgnomeui-2.13
+	>=sys-apps/dbus-0.60
+	>=sys-apps/hal-0.5.7-r1
+	>=x11-libs/gtk+-2.8
+	gnome-base/gnome-keyring
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README TODO"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fixes for bug #133549, bug #133880, bug #137211
+	epatch ${FILESDIR}/${PN}-hal-no-media-fstab.patch
+
+	# add support for mounting with ntfs-3g
+	epatch ${FILESDIR}/${P}-ntfs3g.patch
+}