Use xdg-open instead of nautilus when accessing mountpoint from palimpsest wrt #350919 by Delan Azabani.

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

3 files changed, 84 insertions, 2 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index fb3a5d220d20..4c246f88c9be 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.29 2011/01/17 15:33:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.30 2011/01/17 18:30:12 ssuominen Exp $
+
+*gnome-disk-utility-2.32.0-r1 (17 Jan 2011)
+
+  17 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +gnome-disk-utility-2.32.0-r1.ebuild:
+  Use xdg-open instead of nautilus when accessing mountpoint from palimpsest
+  wrt #350919 by Delan Azabani.
 
   17 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-disk-utility-2.32.0.ebuild:
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 1f6998e49351..6d622ada553f 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -3,6 +3,7 @@ AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb
 DIST gnome-disk-utility-2.30.1.tar.bz2 2004770 RMD160 cfdfc38dd5856ddbf6111c6a861b0e434cbc2180 SHA1 a035a52b7fdc50dc557192b6b6fd2884f35e3a61 SHA256 df9b336c780b5d77ceda54e96f7c37c67645f5e73d48754ba0a8efba7c1836d7
 DIST gnome-disk-utility-2.32.0.tar.bz2 2209712 RMD160 7bc7afb2d8d235085f8a1adfd6f2ff4ade626417 SHA1 f3721db8957596e9772974c1c9da68ae268ad514 SHA256 03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98
 EBUILD gnome-disk-utility-2.30.1.ebuild 1831 RMD160 9ac362c8329dad2981e28b757680e76374855008 SHA1 9270d7f1aec26c5c3b91efaaaa389a923dce84f5 SHA256 884a8f89b7406e916259de237a0ca8b63dd57d0eb168fb61b7cb7ca4a7ec36a2
+EBUILD gnome-disk-utility-2.32.0-r1.ebuild 1926 RMD160 a0b036d0922d2f1de33c0083b59889efa7872a84 SHA1 746b26572f1ea3f2eb082a9b0a0158d9546a699a SHA256 42540be36e21a8688c399fe2ac2c78de82ef2265c11a23692fea0aeeb82a58cb
 EBUILD gnome-disk-utility-2.32.0.ebuild 1800 RMD160 476f5521c7f6f99fb329facc9ae0ebdecb75ad98 SHA1 e7972e8f19c218228c9a644a7bf8c8e1081420a1 SHA256 bb650be7affcc22346dff4a44ceac3f1a85b10fea83dc2fc02a582993173c306
-MISC ChangeLog 4868 RMD160 e4033484a10c8e3c2f6ff9def985a27114b325ce SHA1 2333b842e2c1c3759c30a359e712331f7828eb4b SHA256 c6def67ab496edbbabc81fb426c5c8e0d73a3c47e862ecca2ed3114a8b613a44
+MISC ChangeLog 5117 RMD160 bf005ea3ca48933bcd8cc3bd2c69e14e5cc1509a SHA1 681370ed3b52e69a8d36c31bfb8b633f19f0819a SHA256 a9ad12aa8887879124bfa4a9aa27e69eb1e085e69d77cdacc766d43c39691b0d
 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
new file mode 100644
index 000000000000..c8201f2b5e86
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.0-r1.ebuild,v 1.1 2011/01/17 18:30:12 ssuominen Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
+HOMEPAGE="http://git.gnome.org/cgit/gnome-disk-utility/"
+SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="avahi doc fat gnome-keyring nautilus remote-access"
+
+CDEPEND="
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/libunique-1
+	>=x11-libs/gtk+-2.20:2
+	=sys-fs/udisks-1.0*[remote-access?]
+	>=dev-libs/libatasmart-0.14
+	>=x11-libs/libnotify-0.3
+	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
+	gnome-keyring? ( || (
+		gnome-base/libgnome-keyring
+		<gnome-base/gnome-keyring-2.29.4 ) )
+	nautilus? ( >=gnome-base/nautilus-2.24 )
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	fat? ( sys-fs/dosfstools )
+	!!sys-apps/udisks"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.13
+
+	doc? ( >=dev-util/gtk-doc-1.3 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable avahi avahi-ui)
+		$(use_enable nautilus)
+		$(use_enable remote-access)
+		$(use_enable gnome-keyring)"
+	DOCS="AUTHORS NEWS README TODO"
+}
+
+src_prepare() {
+	sed -i \
+		-e '/printf/s:nautilus:xdg-open:' \
+		src/palimpsest/gdu-section-volumes.c || die #350919
+
+	# Keep avahi optional, upstream bug #631986
+	epatch "${FILESDIR}/${PN}-2.30.1-optional-avahi.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}