Fix bug 329225

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 92 insertions, 2 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index 174217c1966d..26ae542b52a1 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.74 2010/07/20 01:38:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.75 2010/07/21 17:34:47 pacho Exp $
+
+*gnome-mount-0.8-r2 (21 Jul 2010)
+
+  21 Jul 2010; Pacho Ramos <pacho@gentoo.org> +gnome-mount-0.8-r2.ebuild,
+  +files/gnome-mount-0.8-ntfs3g-locale.patch:
+  Revision bump to stop passing locale mount option for ntfs3g since no
+  version in the tree recognizes it (bug #329225 by Fabio Erculiani).
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.8-r1.ebuild:
   Drop HPPA keywording (bug #324511).
diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index ee54c996368c..c51a06462cb7 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-mount-0.6-freebsd-schemas.patch 2554 RMD160 73783e4a8dd6a753530b50b970777624c915ab0d SHA1 e24311a3aec500ec5218b2f5ea0ddf2ee08e90b5 SHA256 0b4911f49c1e9906022348d03f697dbe0b600ee99d62096eb429d43d1f233a87
 AUX gnome-mount-0.6-include-locale-h.patch 253 RMD160 3a45892d5117e42f5cda39fa3dbdfcde484e5609 SHA1 f071c5e6ec8ca4f2b26e5c8439937da9f3301091 SHA256 c848331ed247eb678c759a07bcc9cbbed443f6a38009d8d035ba2516b7552e2f
 AUX gnome-mount-0.8-fstablock.patch 3281 RMD160 7b0d5f5f4ba4bed2776488425a732708f6155080 SHA1 50f06c9dd1d903cca6b96d9cd20f42692b3be837 SHA256 1aa891d6c578458ee4b465b8a27172edb826fe8b589fabf5a8ff4418b10f8a5a
 AUX gnome-mount-0.8-libnotify-automagic.patch 2369 RMD160 41a76ca7bb97ad6117b2d8391d9fba29c04ca505 SHA1 9bb3dadb23c20c37331a39e56cfc7a469565a955 SHA256 add3dbfe0b7b4a7b3a80eb39feb6856a0ce468bfe12a7d99e8ddeecc2c31c4d5
+AUX gnome-mount-0.8-ntfs3g-locale.patch 502 RMD160 6813a15df784de0951c9a20546e6c6ffab551759 SHA1 08beb9964574a30cc383be017be2343fed62f69a SHA256 e57d854bd0b830b126c4093b9c994d28ad351af5a09cc0adc45db69df8491495
 AUX gnome-mount-0.8-vfat-defaults.patch 706 RMD160 cbbf337ea1598e11f43aebe8505b9ce5ec2b21fc SHA1 387dc0976b2f08db1376f0af63c840f72d332650 SHA256 37f80a8c37507e5ebd6b4f75610ef39c0e66c1363fe554ab0aeda8a526dd21c2
 DIST gnome-mount-0.8.tar.gz 505788 RMD160 003800eda3edb7747714b1002bd1a1b50ea44fe9 SHA1 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb SHA256 44ca6b78b49a4181435e489c7b7d416c8f26442dcecdc01ec4b981274ed957e2
 EBUILD gnome-mount-0.8-r1.ebuild 1639 RMD160 31242ec38f5df6e2eee06e49c5fd225cfeee6ef1 SHA1 b41d8d0332a952253429479672cc73662f00f9db SHA256 c9616d893cf23ffd84e80251cd7093e54329364246ed2c7c83506c6d9dcca9d4
-MISC ChangeLog 10229 RMD160 459da2d9a1506f1ebf2a47b40a4ce1514e1a320d SHA1 877983cd92c18b633129298775d6996695586470 SHA256 1e7f8c59353c8377717707fcfd48ac5eaae5f009fe8500047fab070fb44eea1d
+EBUILD gnome-mount-0.8-r2.ebuild 1770 RMD160 a7e308dee16fb9748885543a3e57151175d0e627 SHA1 654d3410efec899275880d9bf690c93a5894d2e9 SHA256 c067d2a9794ac67625503ed8d65e7cd992261e933591ca78790387e77ba5aad0
+MISC ChangeLog 10529 RMD160 b5dee1ff0c608eb118452e51bb6c7b8ab9068a54 SHA1 be27fe2db7b2bdf4c1c250e6e36ec296c7637182 SHA256 e55d8b0dfad2352a74e70ea2d26a022ae1184b0d7b5a7f9568a88737bf81aced
 MISC metadata.xml 254 RMD160 6a737fb45f6f2fd20426f7b0bbaece103a1cf891 SHA1 5320b8e2ae1cdee69cc65091497d9e100c364e64 SHA256 f9d82c574f40e1436601a877ad0895aff511f02edd3656608279ccad35650a31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxHL7wACgkQCaWpQKGI+9Se1gCfbB24UcEhdfjbEqafHqj46LzG
+8+MAnRZJ4rkPP6DItQKJprz6yYiYBEUt
+=L761
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch b/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch
new file mode 100644
index 000000000000..21f02a36ead4
--- /dev/null
+++ b/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch
@@ -0,0 +1,11 @@
+--- a/gnome-mount.schemas.in
++++ b/gnome-mount.schemas.in
+@@ -64,7 +64,7 @@
+         <applyto>/system/storage/default_options/ntfs-3g/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[locale=]</default>
++        <default>[]</default>
+         <locale name="C">
+           <short>Default mount options for ntfs-3g fs</short>
+           <long>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</long>
diff --git a/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild b/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild
new file mode 100644
index 000000000000..e82bf5b3bece
--- /dev/null
+++ b/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 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.8-r2.ebuild,v 1.1 2010/07/21 17:34:47 pacho Exp $
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Wrapper for (un)mounting and ejecting disks"
+HOMEPAGE="http://hal.freedesktop.org/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="libnotify nautilus kernel_FreeBSD"
+
+RDEPEND=">=dev-libs/glib-2.15.0
+	>=x11-libs/gtk+-2.8
+	>=sys-apps/hal-0.5.8.1
+	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
+	>=gnome-base/gconf-2
+	libnotify? ( >=x11-libs/libnotify-0.3 )
+	nautilus? (
+		>=gnome-base/libglade-2
+		>=gnome-base/nautilus-2.21.2 )
+	>=dev-libs/dbus-glib-0.71"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35.5"
+
+DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static
+		$(use_enable libnotify)
+		$(use_enable nautilus nautilus-extension)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	use kernel_FreeBSD && epatch "${FILESDIR}/${PN}-0.6-freebsd-schemas.patch"
+
+	# Include missing locale.h, bug #176035
+	epatch "${FILESDIR}/${PN}-0.6-include-locale-h.patch"
+
+	# Better defaults for vfat, bug #257745
+	use kernel_FreeBSD || epatch "${FILESDIR}/${P}-vfat-defaults.patch"
+
+	# Fix HAL locking for devices in fstab, bug #257746
+	epatch "${FILESDIR}/${P}-fstablock.patch"
+
+	# Fix automagic dependency, bug #257753
+	epatch "${FILESDIR}/${P}-libnotify-automagic.patch"
+
+	# locale option is no longer recognized by ntfs3g, upstream bug #624953
+	epatch "${FILESDIR}/${P}-ntfs3g-locale.patch"
+
+	eautoreconf
+}