Bump to 3.0.2, from gnome overlay for GNOME 3

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

4 files changed, 171 insertions, 5 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 4889f015fd7a..d823459053de 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.52 2011/08/13 18:23:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.53 2011/08/15 12:26:09 nirbheek Exp $
+
+*gnome-disk-utility-3.0.2 (15 Aug 2011)
+
+  15 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-disk-utility-2.91.6-optional-avahi.patch,
+  +gnome-disk-utility-3.0.2.ebuild:
+  Bump to 3.0.2, from gnome overlay for GNOME 3
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org>
   gnome-disk-utility-2.32.1-r1.ebuild:
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 6ab80c41eb6e..359cd4bfb295 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -4,15 +4,28 @@ Hash: SHA1
 AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 RMD160 f6e29b0421b5b7feb0fab96d8e0c4cc13785858b SHA1 9bcf767d9da569a9469e364b19776ca80ad4843f SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d
 AUX gnome-disk-utility-2.32.1-non-utf8-crash.patch 1044 RMD160 d24bd35f6f3b02c9939e5a48b17ee58657272cf5 SHA1 a4cec1a87279c11d9f79e8b9ffcbec1a1b0f3acb SHA256 818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526
 AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 RMD160 6e401303d5bfefa01f843992898dd3c1e4bf4187 SHA1 2672f51196101503688ca73be17bbddae0ee897a SHA256 30965971604b96489857eb7d2703ab0e7ca053ded5cd50fd5fed9ceb34235df2
+AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 RMD160 e6019f814f03ebacb7f4607dfd2e91f0a5bc3ced SHA1 131f04f14fa105712d555c617d699fc02fb18215 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867
 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 RMD160 d3572b44890e2aa89f2268ba684ba80732dd0ea1 SHA1 afd03dc2c59629d4789045e0b967bd17b71f70f2 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99
+DIST gnome-disk-utility-3.0.2.tar.xz 2002052 RMD160 7355f13be7c67f10f3fb337cccfe8bea7ec2e36d SHA1 61718232756657542c89a0b3355a4fdee78b7ffd SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5
 EBUILD gnome-disk-utility-2.32.1-r1.ebuild 2043 RMD160 a92ba13b84fab2fe95a096f6006ddec376e4150c SHA1 d5b48e361893f9527f320a3b16e3379fd473700b SHA256 afe3043e4b657db9874f90d5014feea6723d20bb033a426dd5b1caa3657f21e4
 EBUILD gnome-disk-utility-2.32.1.ebuild 1893 RMD160 2d68d23e4583e77ab7b5bc233f41d1ecfd9f6837 SHA1 83848de6aeccb689d43d0511f451df44444e59ca SHA256 619d308a3125a821a0c4c56e45089e78dda2801b20b698a91db23c9920a89347
-MISC ChangeLog 8349 RMD160 e84bf203b434f800dc3942ad365eb8943ab2cf60 SHA1 2cb3276490ef5ff35b2617b3bce67814fcd10dff SHA256 8ee8a25dc0ad2c8d12d7ac6528d192e0d590fead5b9813130e94d37a5c50a6dd
+EBUILD gnome-disk-utility-3.0.2.ebuild 1840 RMD160 297d8677f250ca194e3eb407ce8571722166ff5a SHA1 f0fc276fb82f3e6165e8fb7f50c6683f5361093e SHA256 013847c257b48457df9431e3ddb29de06f6c51147d925584b5da20ba48b23162
+MISC ChangeLog 8587 RMD160 15bfa9a796a41066bd0561195e9becebf4f62da3 SHA1 a00738a8f8b4c5635f0380c5f69de251a9ccaac6 SHA256 3e82655f671d8b83d5aaeaa658d6ad56d6bca7c4a3e2968ea104dda27359ac16
 MISC metadata.xml 411 RMD160 a1c12c7620efc6350a471ec6dfa23c86603f4a63 SHA1 3a1d45a1c201852a8067b535b214777ad95754ab SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5GwRwACgkQuQc30/atMkAPswCgnpXUxVU2XcQuAaLeahEVjwpY
-P+UAoJxP1P2gzApWNIa5ZOEnCWv8E3Ui
-=5MB1
+iQIcBAEBAgAGBQJOSRBkAAoJEO/kOhxWD91kBDkP/16AqZr+sZ98fhHYyMWZWI4Y
+dk88WoyEvlV1sSuFwVWclxR3gO5+uz38Tf7lqOzuHfJG0NpLZH8M84kiXtR4g9Y3
+g2YcwtZkfKw0m5knS9fY4Luo/i574kmb8JWovGROTiBBAy5Ee+fj4W09fYNKWy4W
+yfof3GwPyPQatm+W/Mz8aU2lrBWQCwsxCOGALJAoeC+WfxcnmqfboYjZuKpGTNJe
+E3ipb3jz+WR9DaTInsJgEmDg/Oj0bjiQPkJgr3rLjF7SpQ8A4CKwQ7k7MnMGPdf7
+Qp00sB3Ti4+Sp+OU0LBAerun0tj6np9o2jTy4GfdSwsKOJnk3jZEDNoiFo2Fjjzq
+hQ6wv3InlgsIOBW8AAndoafUEqpQbX/TyAlV5IxKVMzT4IS0LisSeLtMPG47TCjz
+QN+K18KhXr7LBfjrC2sguRRy0MZ4yhp59pBOiWYuSPGqq6cwf9vPeQ2OyxbTVi/j
+c7KMOmCYAwXN7VNN+bw4d21q9lGXzcBbncf2bq/GeqlwojsNBCy4LseTA0NNF6ai
+1BNkK8me8n1xB+d1NZBF0p3EpQvHwq6z7+C9e6/duFAcFRtcDP/ZaRmbusYV33la
+zHaqI/rG4zvMj+HfeJvFpEkSxHXpzKY/SeoImSVPEw3yEmPvm/Dqv0l8//fLhRlJ
+R8YAWsona0v0MI+XmWIK
+=y7Io
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
new file mode 100644
index 000000000000..b9080ea06ae0
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
@@ -0,0 +1,75 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,7 +150,26 @@ PKG_CHECK_MODULES(LIBNOTIFY, [libnotify  >= $LIBNOTIFY_REQUIRED])
+ PKG_CHECK_MODULES(UDISKS, [udisks  >= $UDISKS_REQUIRED udisks < $UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION])
+ PKG_CHECK_MODULES(X11, [x11])
+ PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.14])
+-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED])
++
++# *************
++# Avahi
++# *************
++
++have_avahi_ui=no
++AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi-ui], [disable use of Avahi for server searching]))
++
++if test "x$enable_avahi_ui" != "xno"; then
++	PKG_CHECK_MODULES(AVAHI_UI, avahi-ui-gtk3 >= $AVAHI_UI_REQUIRED,
++			  [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui-gtk3 is available])
++			  have_avahi_ui=yes], have_avahi_ui=no)
++	if test "x$have_avahi_ui" = xno -a "x$enable_avahi_ui" = xyes; then
++		AC_MSG_ERROR([avahi-ui-gtk3 support requested but libraries not found])
++	fi
++fi
++
++AC_SUBST(AVAHI_UI_LIBS)
++AC_SUBST(AVAHI_UI_CFLAGS)
++AM_CONDITIONAL(ENABLE_AVAHI_UI, [test "$have_avahi_ui" = "yes"])
+ 
+ # *************
+ # Remote Access
+--- a/src/gdu-gtk/gdu-connect-to-server-dialog.c
++++ b/src/gdu-gtk/gdu-connect-to-server-dialog.c
+@@ -24,7 +24,10 @@
+ 
+ #include "config.h"
+ #include <glib/gi18n-lib.h>
++
++#ifdef HAVE_AVAHI_UI
+ #include <avahi-ui/avahi-ui.h>
++#endif
+ 
+ #include "gdu-connect-to-server-dialog.h"
+ 
+@@ -143,6 +146,7 @@ gdu_connect_to_server_dialog_get_address  (GduConnectToServerDialog *dialog)
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
++#ifdef HAVE_AVAHI_UI
+ static void
+ on_dns_sd_clicked (GtkButton *button,
+                    gpointer   user_data)
+@@ -171,6 +175,7 @@ on_dns_sd_clicked (GtkButton *button,
+ 
+         gtk_widget_destroy (service_dialog);
+ }
++#endif
+ 
+ /* ---------------------------------------------------------------------------------------------------- */
+ 
+@@ -218,6 +223,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
+                                         GTK_STOCK_CONNECT,
+                                         GTK_RESPONSE_OK);
+ 
++#ifdef HAVE_AVAHI_UI
+         button = gtk_button_new_with_mnemonic (_("_Browse..."));
+         image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
+         gtk_button_set_image (GTK_BUTTON (button), image);
+@@ -235,6 +241,7 @@ gdu_connect_to_server_dialog_constructed (GObject *object)
+                           "clicked",
+                           G_CALLBACK (on_dns_sd_clicked),
+                           dialog);
++#endif
+ 
+         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ 
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.ebuild
new file mode 100644
index 000000000000..c4c81f211f4f
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2.ebuild
@@ -0,0 +1,71 @@
+# 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.1 2011/08/15 12:26:09 nirbheek 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
+		<gnome-base/gnome-keyring-2.29.4 ) )
+	nautilus? ( >=gnome-base/nautilus-2.91.0 )
+"
+RDEPEND="${CDEPEND}
+	x11-misc/xdg-utils
+	fat? ( sys-fs/dosfstools )
+	!!sys-apps/udisks"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	app-text/docbook-xml-dtd:4.1.2
+	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 -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"
+	intltoolize --force --copy --automake || die
+	eautoreconf
+
+	gnome2_src_prepare
+}