Version bump for Gnome 3.6. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

9 files changed, 40 insertions, 411 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index cf03bebe4d5a..bf29a4cc9fc3 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.75 2012/10/28 16:32:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.76 2012/12/24 16:26:33 eva Exp $
+
+*gnome-disk-utility-3.6.1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-disk-utility-2.30.1-optional-avahi.patch,
+  -gnome-disk-utility-2.32.1.ebuild,
+  -files/gnome-disk-utility-2.91.6-optional-avahi.patch,
+  -gnome-disk-utility-3.0.2-r200.ebuild, -gnome-disk-utility-3.0.2-r300.ebuild,
+  -gnome-disk-utility-3.4.0.ebuild, +gnome-disk-utility-3.6.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org>
   gnome-disk-utility-3.0.2-r201.ebuild:
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4d627f9780a3..3a0ab5921920 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,31 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnome-disk-utility-2.30.1-optional-avahi.patch 3265 SHA256 84fa2f6ed58003b881a8169c2f253ea453afdc7f28beca583a76af8a27fd828d SHA512 fe429c7e78457ea8206d4184e6e75965db58148b5545bc34725d5925ed5ba96a49e17a6d6976e04f69e9d51b05e3f406be6cbc4e1261743094d19895f9382cdb WHIRLPOOL 4839dc95821c0f2c12632110ea92a4f84a2c12ea54cf0b9d9535f0798e62538efa9cf1d3515769b62be50434cc9bf2f0446a0b22fc3b315500ed1e09f079dc79
 AUX gnome-disk-utility-2.32.1-non-utf8-crash.patch 1044 SHA256 818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526 SHA512 ba1ed4e5a318938545660f96157c35f901975555434db4f8a539b329b6c3489e84b0f7d5225acc38b30503049419ef79ccffcc0db59a40852cd28da6d17a0bd3 WHIRLPOOL 115d3a8ec409a8bb6f10fba3254d89577e8fbc5adfc7af69f0cbec872df8dcf4659eff694251e6040286cd039848c8e0b88c0cf1793ec627eac17085c60558e5
 AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 SHA256 30965971604b96489857eb7d2703ab0e7ca053ded5cd50fd5fed9ceb34235df2 SHA512 04e66492d966138bba1a16f8a6cbf12bdfe5943533f9728819ad2a2569dd56314d55bd17bb57feeb87a93262de27ed457efa616563acf78b0e890009c4e5b847 WHIRLPOOL a6c38c3165ec622a614b48acd787d350e3f2203bc31164f06fe6f52b4706362230e5f5aa1c2eec33385b14f44d0896af0576a9e6945ea2826ffea9771e80c1cd
-AUX gnome-disk-utility-2.91.6-optional-avahi.patch 2665 SHA256 2698b158a2552a9650d07634e478d6d15a26cd18c881f065cd14f81dadf5d867 SHA512 5ec69003bd74254d92ea1d7b602cd29d6863fc9c1fd7530873f4efcdbfc33c86021e162e49996db52a0221334e3f2c4aef5f6a116b251e8bb1a72e9ce3603505 WHIRLPOOL e6d0b17a2f773b546eb3fc5c5bac3eb9e6123cc6a459a4a472500b3612e0cf0d7d561e10ec41615de432de9e7e460f772b393a113e5754724ce539bb9904616e
 AUX gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch 1179 SHA256 e5b2985858da2bb9cf6868565af485a5d8ba61c96ed95fa1bc550333c3eb9c27 SHA512 f3476d6e8179b846ffe08a44985d401dec4d3d62c28b7fa654bac6bdaf9a5d19ecf20db1ffb3f7dd346b57801838fb94d9ea793123154fdf619485e84c1541be WHIRLPOOL b0176f14b58f6ff55c851c910b4de2c5cbdb8aed1433d4655cf60afd752a791e1ee7183e0c732d9e8a4f35cdd7972106437256a441ca5f2f1f7504e0f157bd3d
 AUX gnome-disk-utility-3.0.2-nautilus2-compat.patch 1070 SHA256 217317df21ecad827d6e462810036c75f182f8efc8f600a407fddd862211356c SHA512 c26f8c6383fc3885703a6434b2615f6cfcd0160df3e9573096f5b0d1a885e604d09d7b73519d8169bb0290d0bc2a14e61954016bde54b3bb231ca2cdec3f851f WHIRLPOOL d610a1b90a93df58b027500c922887d99489339fe3c8e3ab4ebba2bf9531d1e4424f6c786604701ea52b5d142f0463fb2ed1e25a59deb56bdf122c86031be55e
 AUX gnome-disk-utility-3.0.2-separate-libgdu.patch 10733 SHA256 463b337f5515e8b6ba2bb791ac34ec79a13b72f110d56d4171e73e54216dd1cf SHA512 48509510dd40b14fccccab330bc23b75e4a020e3a6bc33ff43d0169dba1aa1e45e4ca8828ecbe4efc84d8f054eb68aa4a12787f8252704510dd9257fbffb7e70 WHIRLPOOL 165547a898cca58d476c16712415e1f5c8525b6a5459241e6961b39b5621be8979cbba527e2f1113caa3a57ee84c9cc5bb79db9857f349e5390c8a5a419706ec
 DIST gnome-disk-utility-2.32.1.tar.bz2 2216871 SHA256 fb3f6c8962eca9706fd96e1f0b431c1284536298bc927e8413e763054c618e99 SHA512 7c812f06ffed304a59a55ffaf8a6cd24265738ccacfe05ff58e5b9d09a503b5601bf3766fb4086f78123d6f88f1bb24007d29e2a2abc203003dd2050e05a1b45 WHIRLPOOL baab95f10c5f3bbef2c3ef0588f804ac592f2d8db56ac1a9f7a8662673d848d6f5fabfe8183954e01b1dc528b09c88f53d4291841a3aaf674d4667e0ab8cd39a
 DIST gnome-disk-utility-3.0.2.tar.xz 2002052 SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5 SHA512 b7e68f42d9199c74b60f32b27456b81a6351dc717e54a0dd6162b4e0af521f50deda587012a94ba2768d76dc9dda40dbf505cfea9ca94f879df5d9093fef8969 WHIRLPOOL dd13ad2e2ae57976cd1dfb0539a5dc1b845bb9c8d2feb3708b0bf8e50a3f5324df962dcff7ac937636f466257913f75f060775ba280fe56b63c6e53a243c8de3
-DIST gnome-disk-utility-3.4.0.tar.xz 1102500 SHA256 1d5b7ba73ee2b5373ea8a087902ab05339723c72eab278670856375280e02f03
 DIST gnome-disk-utility-3.4.1.tar.xz 1108004 SHA256 54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129 SHA512 2b69d6c0960bfb5820946aa5340dab8ff6053292a4b49d0c24a9a41ee93186ec36a85cddb2743d3feca1ac6c63652ac3a342e74634b0d2286d5e6a229533f848 WHIRLPOOL e831e07e8c337fe8345296f3211871fff65e936fd5e4d7786a7420b5c36cbb6c70def094c715d8f68d65b3492e711eedb574ffa0347d9f0602ba50c7694286b2
+DIST gnome-disk-utility-3.6.1.tar.xz 1214796 SHA256 e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32 SHA512 f513cb57d0807eb38b32ee6c0e70f3303c7afbe21d39a9b8e9fa35ce49b1932985b1a989f7608fc41063d62608356a6de9c6739af6794a82dfdf8ce0f10a51ac WHIRLPOOL 940e4e514e13eeb49e3a9862e40f482aa1352b271e11287d83b197f771a6dd753ed9e193a88f8b64e078448f750d86a5891ead44ed1055d4a28f1e7f0babee18
 EBUILD gnome-disk-utility-2.32.1-r1.ebuild 1958 SHA256 62089d418976aa4e042ef4ceb9179945ffc4b9dc5edb6c71c128cac25b0b6832 SHA512 60573962b6a94fe467faf0f9bfa6a2b35f45e849e278ada7dab094ca31877719253e137b7687d9574645f6d1ec089a6d4573df8deb0276a6c194cd17eedb8a0f WHIRLPOOL 8d8a1b6dfc3ecdf30ee3cddbd464f087d2e19b266e13b448da29e31f67c47624887b79fab98b76f7972d9dc642a471ff0291f411b0646e14e3c48cd4b57df85f
-EBUILD gnome-disk-utility-2.32.1.ebuild 1807 SHA256 c16739cb6adba2edf45dfcc24fcb116dbda2da91b0888ffdd5d8c9af79c3c69f SHA512 1a769412c7078e3b89ca1dff42c5638ff096e7a885ec31d3e9217dd3a4b89e2bbf7651c194d591eff749c13d7bc8ad9c48813ff67bb9573d2d587114a5f4c598 WHIRLPOOL 52702bb94b21e31b0d175955a9816be475403621deda58b21b0e56bc25ce5655243fba24792bd89cee4608b0e09f6172616daca2538cdcfccc789b4d358de214
-EBUILD gnome-disk-utility-3.0.2-r200.ebuild 2007 SHA256 40f524740c0fb269987101333b58ba525d1434a219d1333c4e4409f462f0d3f6 SHA512 4ba056d31f8f19b864ceb0739cfb0c48a5140f0cbc34a151191cb1d36c0ff98424b4b6b4c403da72f0ac099a10709dc478a9f2cbe02d375d16621e1c32ea6034 WHIRLPOOL ddb1ea4a4e708fc58117cb0f0f1468f6fbc44eb708fc250b91d0e9df9c91b5af4d088f6423c597c6f00507ef3eb8ae8269006f92e16b9acf14eae3f458e2418b
 EBUILD gnome-disk-utility-3.0.2-r201.ebuild 1735 SHA256 506df4a87731a216412a4f70999b2313b8a6341228b9c228fd9011499a20c7da SHA512 fbfc818a297abbbad9a48216c9ac60224b3419ca6df1f4d0378a519229fed3637a5c135edec51ec9c714a07668b7ce7b0ebdf237d180f5616b8e109d98f214b2 WHIRLPOOL 89779c3eb006fca0d0a191ca83fb6160798a48e13eced064db906a343c3f77999b599fa60ea3d34c7014588d647912f1bcd30e8c35252741f5ab490e3e16c740
-EBUILD gnome-disk-utility-3.0.2-r300.ebuild 1887 SHA256 87a3b8873b85b7bfbea08cabc75ed3d6917ebf8ed39afbf85c452df0bb5f60b1 SHA512 df8252df03ea2e818d69fe54a7dac7d90fb33e4ba3e6b8cb80799d03ea184b444d9cb1bb15e8ed3a522ec071ca75bb43ea906dc264f294a64bbe055ed39d964e WHIRLPOOL 029b2f7238353504461e4952cec90d956229c9b3bd2e5545a7e31bfd6d26182684019419c239e98c930313ccaf13e05d42b7344eb740d0a2e870b17a84d7316c
 EBUILD gnome-disk-utility-3.0.2-r301.ebuild 1628 SHA256 df8ae31fdeeed7072358f7eb1aa60f7627aa11e622028a54d81780565e2f1fa4 SHA512 bf6eebf414a39be14661a2440764d02ea8008885da75e992eeec632c0a37ece20243ec38be2502ddebca297b695b11d84771f0e7a06679ba2654d419e6cf8c4c WHIRLPOOL 277ee7a9b8cd6555b6d0ed2bdbff140f306adde2d1a9b96fb59dfa2248085f9b925dbd36c5996c4b1a35cc92c62e9c5b0f0fc793f9806acfb7f979154446c371
-EBUILD gnome-disk-utility-3.4.0.ebuild 746 SHA256 2b6b3756a09249a1c7b80118d32a4d14d18ac7d92384585bc8fb8b048b6c045f SHA512 ec11bd09bd73dcd03dc7014966fe25a100e0bbbbe1340f2065f0036ce4a8db6a600b8b75e2b2bc60dbf9d607e54ea2b0bc01732c49480b47592da7c9236f6284 WHIRLPOOL 7eb666025fb47d33218d8609619430a3fcc69ce37e90d4222e2d527d7909cb6f290954d1591358084a9a573955ccf5a4edec9299d7a9146fd04828f50bd1f549
 EBUILD gnome-disk-utility-3.4.1.ebuild 746 SHA256 c8151c526e1cfe7af8da0c8740b4272417a8007ee87450bc4461f13c5cbedab6 SHA512 7d2d1c981b1f50f45dd55a78895208d3fb24b46d8e0a6a65cb05dedc9fc36456a6a8bba8f04bc88169ec4b0c79013f1b3982238f19e18d6946d6c9a0992e08b4 WHIRLPOOL 0f8775be520e106ce6f012d0b954157c26e7fde2d03c8ef432373aa859ceec00bea1a39f4768a872465638c4b7cf86d2acea82338bf5bbfe75fd41e9961616fa
-MISC ChangeLog 12998 SHA256 2ea7a0d91b5207d0036b8ad7b928f8c1a8bfe1c6dbd8395e5378db78be7f4ec0 SHA512 135bf5aa93ae81c49428ceb626307a9194aa2ea84614e32bbd246d0dc565a259fc4bdc3ddb2b22d0a13c80464bc69050835c848737c383257b203736e218edda WHIRLPOOL 3154b1b365a45d473f0b0df251f58a39e37f1bb838496561ff00d03b620c3ad68d184f0b1aba060b426b2648b568f7e5b4f0e4f6e0e009a94a1505fb48c877b8
-MISC metadata.xml 411 SHA256 194a3aa8e459cf8efd11f19a1368a0764877a356578aec429100ffd969cd34bf SHA512 e0e107415e072ac1c360fdced0086a0e4dd4e09abdd7e4493922b1d20c77033107029f9e446f336b420eb346f7fd5924b7e88a680a26757330b08414f1e10d10 WHIRLPOOL e766f3887a6953a7422c208a5a912896b8f40f5cd15fd3c1b9d021d00e00cabc3b6f050d0a043cab1d6747e52928eec49b7053200112329c708e068095d4f026
+EBUILD gnome-disk-utility-3.6.1.ebuild 897 SHA256 6d8c116e15abdf5a2f7d78bec028e536398e569fa08aa97a31e5c60a6ca4cd1a SHA512 52412361ad14228d16a64e4dd3f047cab11173815018b3f2ab2bbaad52dacbdc6a41446e0573ba26d67e0f7a8836e39c77189f165167e48d38252b019c47c2b5 WHIRLPOOL d4711fc5ce3013e10ece3c9f0839b27843afc8af9182eef8dd7b25280f4724b590f4e6d04869f43c99c4142b57fb0330b9a938188d66a167c671dcd96b49413e
+MISC ChangeLog 13461 SHA256 b62cab6494d8814afbfde68edc67389cfad3a64746c37e4aab713eceb6707f9f SHA512 62df6a127a47a1e597fbc205818e170b065b2fa79a9a51857e0488912e278c6cf7fd3397ca1bc59b9d02f781d6c94fcd72f346915bce50ffd967b9e39268a549 WHIRLPOOL 1b62246ff1bd5f832bb44ba8f722c4b36cb4bdd196b101ed4f2bd4e41ca57ad42d5dba4d3a188fcb95b603d9196eb1ae7d9f72012a507de9dc62453946ea0dc8
+MISC metadata.xml 413 SHA256 fa3b6fb623b748e2cef10e71cc41cc52a5985b51652e02c8078fd0216b9c8b04 SHA512 481ece48d81086f348a3bdb024365b5364ad9cc1fe3368305c9f0a8ee994815728a9c5639d67d530a29c755109c7ed951b6d0cac023be065fef4ba08710559a3 WHIRLPOOL c83403da9dbf754116ac1a1116b18dd6a2d7843323002b5a9a72c88fc295e45b510d8f8b24776057a0f65a55861606b6404df98df667624aeead0b44e56e01e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNXi8ACgkQuQc30/atMkAdNQCfdiCpQuoR2SerYK/OwIVAISGk
-aRkAoLZ7z+w/A7zNSzK0tA+aRstmcpXJ
-=CNuJ
+iEYEAREIAAYFAlDYgjoACgkQ1fmVwcYIWAb7BwCgxCvxkc6EQSZu0OLGPpxyx8iA
+OWsAnRYTRPbMwQKRKayjO2Iyh/xrp0L0
+=j8ZN
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
deleted file mode 100644
index 65c4726ada0d..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 674d9284bd09a9378f99ff19b2d2ffb8032ce8ea Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
-Date: Tue, 16 Mar 2010 10:58:55 +0530
-Subject: [PATCH] Make avahi support build-time configureable
-
----
- configure.ac                               |   21 ++++++++++++++++++++-
- src/gdu-gtk/gdu-connect-to-server-dialog.c |    7 +++++++
- 2 files changed, 27 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 01be5f0..95f2087 100644
---- 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 >= $AVAHI_UI_REQUIRED])
-+
-+# *************
-+# Avahi
-+# *************
-+
-+have_avahi_ui=no
-+AC_ARG_ENABLE(avahi-ui, AS_HELP_STRING([--disable-avahi], [disable use of Avahi for server searching]))
-+
-+if test "x$enable_avahi" != "xno"; then
-+	PKG_CHECK_MODULES(AVAHI_UI, avahi-ui >= $AVAHI_UI_REQUIRED,
-+			  [AC_DEFINE(HAVE_AVAHI_UI, 1, [Define if avahi-ui 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 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
-diff --git a/src/gdu-gtk/gdu-connect-to-server-dialog.c b/src/gdu-gtk/gdu-connect-to-server-dialog.c
-index 9ecf08c..5ad47bb 100644
---- 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));
- 
--- 
-1.6.4.4
-
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
deleted file mode 100644
index b9080ea06ae0..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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-2.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
deleted file mode 100644
index 7558878981eb..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 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.1.ebuild,v 1.15 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-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:1
-	>=x11-libs/gtk+-2.20:2
-	=sys-fs/udisks-1.0*:0[remote-access?]
-	>=dev-libs/libatasmart-0.14
-	>=x11-libs/libnotify-0.6.1
-	avahi? ( >=net-dns/avahi-0.6.25[gtk] )
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	nautilus? ( >=gnome-base/nautilus-2.24 )
-"
-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
-
-	virtual/pkgconfig
-	>=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"
-}
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
deleted file mode 100644
index 0a75f7b8e355..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 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.11 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-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*: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
-
-	virtual/pkgconfig
-	>=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() {
-	local f=data/gdu-notification-daemon.desktop.in.in.in
-	sed -i -e '/^OnlyShowIn/d' ${f} || die
-	echo 'NotShowIn=KDE;' >> ${f}
-
-	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-r300.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
deleted file mode 100644
index 25a55d2f5220..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 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-r300.ebuild,v 1.5 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-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*: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.91.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
-
-	virtual/pkgconfig
-	>=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() {
-	local f=data/gdu-notification-daemon.desktop.in.in.in
-	sed -i -e '/^OnlyShowIn/d' ${f} || die
-	echo 'NotShowIn=KDE;' >> ${f}
-
-	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
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
index 6a02ece0d2b7..ce409718181f 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.4.0.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild,v 1.1 2012/12/24 16:26:33 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,20 +11,29 @@ inherit gnome2
 DESCRIPTION="Disk Utility for GNOME using udisks"
 HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
 
-LICENSE="LGPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
 IUSE="fat"
+KEYWORDS="~amd64 ~x86"
 
-CDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-1.90:2
-	>=x11-libs/gtk+-3.3.11:3
+	>=sys-fs/udisks-1.99.0:2
+	>=x11-libs/gtk+-3.5.8:3
+	>=app-crypt/libsecret-0.7
+	dev-libs/libpwquality
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
+	fat? ( sys-fs/dosfstools )
+"
+DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
+	dev-libs/libxslt
 	virtual/pkgconfig
 "
+
+src_configure() {
+	G2CONF="${G2CONF} --disable-libsystemd-login"
+	gnome2_src_configure
+}
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 7a29b77d4e92..01c7a15efb29 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -4,9 +4,9 @@
 <herd>gnome</herd>
 <use>
 	<flag name='fat'>Include FAT16/FAT32 support
-	(<pkg>sys-fs/dosfstools</pkg>)</flag>
+		(<pkg>sys-fs/dosfstools</pkg>)</flag>
 	<flag name="nautilus">Enable <pkg>gnome-base/nautilus</pkg> extension.</flag>
 	<flag name="remote-access">Enable access to remote udisks
-	daemons.</flag>
+		daemons.</flag>
 </use>
 </pkgmetadata>