Pull in upstream fix for bug# 133549

Package-Manager: portage-2.1_rc1-r2

6 files changed, 96 insertions, 3 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index d6f745f82a94..3839c1bc1fd3 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.7 2006/05/14 09:19:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.8 2006/05/17 02:33:30 dang Exp $
+
+*gnome-mount-0.4-r2 (17 May 2006)
+
+  17 May 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-mount-0.4-hal-mountable.patch, +gnome-mount-0.4-r2.ebuild:
+  Pull in upstream fix for bug# 133549
 
   14 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   gnome-mount-0.4-r1.ebuild:
diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
index 007e14859b4b..0dad7989509d 100644
--- a/gnome-base/gnome-mount/Manifest
+++ b/gnome-base/gnome-mount/Manifest
@@ -1,4 +1,37 @@
-MD5 cfb6cc7726bc190bb211ed5580f4e99b ChangeLog 1121
-MD5 c09da8368370261b02c13528ed1ed140 files/digest-gnome-mount-0.4-r1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 SHA1 91d5e00d8138be5a9be0b4585f8535e236b29f05 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13 size 564
+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
+DIST gnome-mount-0.4.tar.gz 364546 RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 size 364546
+EBUILD gnome-mount-0.4-r1.ebuild 823 RMD160 b0d2f0c1ea04018b0fb3612901bc5863d0cf5ed3 SHA1 cbf27145819f6e31352aa175a66ddf4b3ca13061 SHA256 71409333a34f2704085ebdd2558db6e5eab10d1feaaf3635827fcc184431bd6c size 823
 MD5 eb415a41df870e2281ea24857c40fbe0 gnome-mount-0.4-r1.ebuild 823
+RMD160 b0d2f0c1ea04018b0fb3612901bc5863d0cf5ed3 gnome-mount-0.4-r1.ebuild 823
+SHA256 71409333a34f2704085ebdd2558db6e5eab10d1feaaf3635827fcc184431bd6c gnome-mount-0.4-r1.ebuild 823
+EBUILD gnome-mount-0.4-r2.ebuild 928 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 SHA1 4fc2ef3fd3cd2a149322cb060d81058e3a34a630 SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267 size 928
+MD5 8bd044bdf0d00887e0e3da13fa6bf382 gnome-mount-0.4-r2.ebuild 928
+RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 gnome-mount-0.4-r2.ebuild 928
+SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267 gnome-mount-0.4-r2.ebuild 928
+MISC ChangeLog 1315 RMD160 18cf62609439730f517f1033ae119f93bb85911c SHA1 0aec4fb2e091111c53f9eb12e4a580feecbeaf8e SHA256 8574811ebea83dd9391ba9b04c222161026115a8577ad5c7ec8d134d2fca8f19 size 1315
+MD5 bb409cc14e3f96d6d20ccc7a6c770b00 ChangeLog 1315
+RMD160 18cf62609439730f517f1033ae119f93bb85911c ChangeLog 1315
+SHA256 8574811ebea83dd9391ba9b04c222161026115a8577ad5c7ec8d134d2fca8f19 ChangeLog 1315
+MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193 size 206
 MD5 8f804bac2d3835f24ed9a73034f969a1 metadata.xml 206
+RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 metadata.xml 206
+SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193 metadata.xml 206
+MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r1 247
+RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r1 247
+SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r1 247
+MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r2 247
+RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r2 247
+SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEaouHomPajV0RnrERArweAJ47L9rY+gaxfIivn+8opFyuHA3PuACfdIgO
+Q19Bp9NdXNJAHoPaja1nty4=
+=BQB1
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r1 b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r1
index ce6778897aa6..8b49c8a43c9e 100644
--- a/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r1
+++ b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r1
@@ -1 +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/digest-gnome-mount-0.4-r2 b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r2
new file mode 100644
index 000000000000..8b49c8a43c9e
--- /dev/null
+++ b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r2
@@ -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-hal-mountable.patch b/gnome-base/gnome-mount/files/gnome-mount-0.4-hal-mountable.patch
new file mode 100644
index 000000000000..f59c9c7fc097
--- /dev/null
+++ b/gnome-base/gnome-mount/files/gnome-mount-0.4-hal-mountable.patch
@@ -0,0 +1,13 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN 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-05-16 22:25:17.000000000 -0400
+@@ -1689,7 +1689,8 @@
+ 			
+ 			goto out;
+ 
+-		} else if (fsusage == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM) {
++		} else if (fsusage == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM ||
++			   fsusage == LIBHAL_VOLUME_USAGE_UNKNOWN) {
+ 			if (volume_mount (udi, volume, drive))
+ 				rc = 0;
+ 		}
diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r2.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r2.ebuild
new file mode 100644
index 000000000000..33f9998f0277
--- /dev/null
+++ b/gnome-base/gnome-mount/gnome-mount-0.4-r2.ebuild
@@ -0,0 +1,36 @@
+# 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-r2.ebuild,v 1.1 2006/05/17 02:33:30 dang 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() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch for bug #133549
+	epatch ${FILESDIR}/${P}-hal-mountable.patch
+}