Patch the schemas so that automounting CD's works on FreeBSD.

(Portage version: 2.1.2.7)

3 files changed, 60 insertions, 3 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index c133724b3d2d..840687b10fe9 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.33 2007/04/18 13:42:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.34 2007/05/17 14:14:37 uberlord Exp $
+
+  17 May 2007; Roy Marples <uberlord@gentoo.org>
+  +files/gnome-mount-0.6-freebsd-schemas.patch, gnome-mount-0.6.ebuild:
+  Patch the schemas so that automounting CD's works on FreeBSD.
 
   18 Apr 2007; Roy Marples <uberlord@gentoo.org> gnome-mount-0.6.ebuild:
   Blessed with the ~x86-fbsd keyword.
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch b/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch
new file mode 100644
index 000000000000..c46bf1609718
--- /dev/null
+++ b/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch
@@ -0,0 +1,47 @@
+--- gnome-mount.schemas.in.orig	Tue Apr 10 18:50:12 2007
++++ gnome-mount.schemas.in	Sat Apr 14 14:49:22 2007
+@@ -6,7 +6,7 @@
+         <applyto>/system/storage/default_options/vfat/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[shortname=lower,uid=]</default>
++        <default>[longnames,-u=]</default>
+         <locale name="C">
+           <short>Default mount options for vfat fs</short>
+           <long>A list of default mount options for volumes formatted with the vfat file system.</long>
+@@ -18,7 +18,7 @@
+         <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[uid=]</default>
++        <default>[]</default>
+         <locale name="C">
+           <short>Default mount options for iso9660 fs</short>
+           <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
+@@ -30,7 +30,7 @@
+         <applyto>/system/storage/default_options/udf/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[uid=]</default>
++        <default>[]</default>
+         <locale name="C">
+           <short>Default mount options for udf fs</short>
+           <long>A list of default mount options for volumes formatted with the udf file system.</long>
+@@ -42,7 +42,7 @@
+         <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[umask=222]</default>
++        <default>[-m=755]</default>
+         <locale name="C">
+           <short>Default mount options for ntfs fs</short>
+           <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
+@@ -52,7 +52,7 @@
+         <key>/schemas/system/storage/default_options/ntfs/fstype_override</key>
+         <applyto>/system/storage/default_options/ntfs/fstype_override</applyto>
+         <type>string</type>
+-        <default>ntfs-3g</default>
++        <default></default>
+         <locale name="C">
+           <short>When 'ntfs' is detected, what file system driver to use by default</short>
+           <long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long>
diff --git a/gnome-base/gnome-mount/gnome-mount-0.6.ebuild b/gnome-base/gnome-mount/gnome-mount-0.6.ebuild
index 9c0ff53600f2..a074827bd3ad 100644
--- a/gnome-base/gnome-mount/gnome-mount-0.6.ebuild
+++ b/gnome-base/gnome-mount/gnome-mount-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6.ebuild,v 1.2 2007/04/18 13:42:56 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.6.ebuild,v 1.3 2007/05/17 14:14:37 uberlord Exp $
 
 inherit eutils gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug gnome"
+IUSE="debug gnome kernel_FreeBSD"
 
 RDEPEND=">=gnome-base/libgnomeui-2.13
 	>=sys-apps/hal-0.5.8.1
@@ -35,3 +35,9 @@ DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
 pkg_setup() {
 	G2CONF="$(use_enable gnome nautilus_extension)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	use kernel_FreeBSD && epatch "${FILESDIR}/${P}"-freebsd-schemas.patch
+}