Have a version prepared to work on Gnome2 with nautilus-2 and another one for Gnome3.

(Portage version: 2.1.10.20/cvs/Linux x86_64)

4 files changed, 118 insertions, 2 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 02cd29d89748..6e422ed5ddd0 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,15 @@
 # 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.54 2011/10/01 20:44:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.55 2011/10/04 20:59:55 pacho Exp $
+
+*gnome-disk-utility-3.0.2-r300 (04 Oct 2011)
+*gnome-disk-utility-3.0.2-r200 (04 Oct 2011)
+
+  04 Oct 2011; Pacho Ramos <pacho@gentoo.org> -gnome-disk-utility-3.0.2.ebuild,
+  +gnome-disk-utility-3.0.2-r200.ebuild, +gnome-disk-utility-3.0.2-r300.ebuild,
+  +files/gnome-disk-utility-3.0.2-nautilus2-compat.patch:
+  Have a version prepared to work on Gnome2 with nautilus-2 and another one for
+  Gnome3.
 
   01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-disk-utility-2.32.1.ebuild, gnome-disk-utility-2.32.1-r1.ebuild,
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch
new file mode 100644
index 000000000000..20f0f31d94f3
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch
@@ -0,0 +1,35 @@
+From 9b6b5c771c14f6c7fc4800273fab88471e3b9cb0 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz@redhat.com>
+Date: Tue, 29 Mar 2011 14:34:14 +0000
+Subject: Use the right directory for the nautilus extension
+
+Signed-off-by: David Zeuthen <davidz@redhat.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 66fa8e8..ad7b051 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,7 +129,7 @@ GNOME_KEYRING_REQUIRED=2.22
+ GTK3_REQUIRED=2.90.7
+ UNIQUE_REQUIRED=2.90.1
+ LIBNOTIFY_REQUIRED=0.6.1
+-NAUTILUS_REQUIRED=2.24.0
++NAUTILUS_REQUIRED=2.91.0
+ AVAHI_UI_REQUIRED=0.6.25
+ 
+ UDISKS_REQUIRED=1.0.0
+diff --git a/src/nautilus-extension/Makefile.am b/src/nautilus-extension/Makefile.am
+index 6c2c82c..c5a9875 100644
+--- a/src/nautilus-extension/Makefile.am
++++ b/src/nautilus-extension/Makefile.am
+@@ -34,7 +34,7 @@ CORE_LIBADD = 						\
+ 	$(NULL)
+ 
+ 
+-nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
++nautilus_extensiondir = $(libdir)/nautilus/extensions-3.0
+ nautilus_extension_LTLIBRARIES = libnautilus-gdu.la
+ 
+ libnautilus_gdu_la_SOURCES =			\
+--
+cgit v0.9.0.2
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
new file mode 100644
index 000000000000..b8a04eef36ad
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
@@ -0,0 +1,72 @@
+# 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-3.0.2-r200.ebuild,v 1.1 2011/10/04 20:59:55 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Disk Utility for GNOME using devicekit-disks"
+HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="avahi doc fat gnome-keyring nautilus remote-access"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+CDEPEND="
+	>=dev-libs/glib-2.22:2
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/libunique-2.90.1:3
+	>=x11-libs/gtk+-2.90.7:3
+	=sys-fs/udisks-1.0*[remote-access?]
+	>=dev-libs/libatasmart-0.14
+	>=x11-libs/libnotify-0.6.1
+
+	avahi? ( >=net-dns/avahi-0.6.25[gtk3] )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	nautilus? ( >=gnome-base/nautilus-2.24.0 )
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	fat? ( sys-fs/dosfstools )"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian
+	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 -e '/printf/s:nautilus:xdg-open:' \
+		-i src/palimpsest/gdu-section-volumes.c || die "#350919"
+
+	# Keep avahi optional, upstream bug #631986
+	epatch "${FILESDIR}/${PN}-2.91.6-optional-avahi.patch"
+
+	# Keep nautilus extension working on Gnome2 setups
+	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-3.0.2-nautilus2-compat.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
index 230b1b0a9b43..64e530a0b0b0 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.2.ebuild,v 1.2 2011/10/01 20:44:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild,v 1.1 2011/10/04 20:59:55 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"