Drop old (#508854)

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

11 files changed, 13 insertions, 788 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index cd36d0cffa0e..ed67813701c2 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.98 2014/07/23 15:37:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.99 2014/11/13 12:38:07 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-disk-utility-2.32.1-non-utf8-crash.patch,
+  -files/gnome-disk-utility-2.32.1-optional-avahi.patch,
+  -files/gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch,
+  -files/gnome-disk-utility-3.0.2-nautilus2-compat.patch,
+  -files/gnome-disk-utility-3.0.2-separate-libgdu.patch,
+  -files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch,
+  -files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch,
+  -gnome-disk-utility-3.0.2-r201.ebuild, -gnome-disk-utility-3.10.0.ebuild,
+  metadata.xml:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org>
   gnome-disk-utility-3.12.1.ebuild:
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch
deleted file mode 100644
index 262748bfb607..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
-From: Pascal Terjan <pterjan@mandriva.com>
-Date: Mon, 3 May 2010 14:01:22 +0200
-Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
-
-GduPresentable created in gdu pool include intheir id some strings
-in local encoding like _("Peripheral Devices"). This patch
-enforces them to be UTF-8.
-
-This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
-available on a non UTF-8 system.
----
- src/gdu/gdu-pool.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
-index bd5eccf..cf6be53 100644
---- a/src/gdu/gdu-pool.c
-+++ b/src/gdu/gdu-pool.c
-@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
-                               g_cclosure_marshal_VOID__OBJECT,
-                               G_TYPE_NONE, 1,
-                               GDU_TYPE_PRESENTABLE);
-+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#endif
- }
- 
- static void
--- 
-1.7.1
-
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch
deleted file mode 100644
index 9caaf18042b9..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.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-ui], [disable use of Avahi for server searching]))
-+
-+if test "x$enable_avahi_ui" != "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-3.0.2-nautilus2-compat-r201.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch
deleted file mode 100644
index e765a6c6751d..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5856972c2dbe8883b8467b21a5c01df14e4b5de5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 12 Apr 2012 05:02:27 -0400
-Subject: [PATCH] Use the right directory for the nautilus extension
-
----
- configure.ac                       |    2 +-
- src/nautilus-extension/Makefile.am |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b351f3..00cb035 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -131,7 +131,7 @@ GNOME_KEYRING_REQUIRED=2.22
- GTK3_REQUIRED=2.90.7
- UNIQUE_REQUIRED=2.90.1
- LIBNOTIFY_REQUIRED=0.6.1
--NAUTILUS_REQUIRED=2.91.0
-+NAUTILUS_REQUIRED=2.24.0
- GDU_REQUIRED=3.0.2
- 
- SCROLLKEEPER_REQUIRED=0.3.14
-diff --git a/src/nautilus-extension/Makefile.am b/src/nautilus-extension/Makefile.am
-index 2c66cec..e86e0c2 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-3.0
-+nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
- nautilus_extension_LTLIBRARIES = libnautilus-gdu.la
- 
- libnautilus_gdu_la_SOURCES =			\
--- 
-1.7.8.5
-
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
deleted file mode 100644
index 20f0f31d94f3..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/files/gnome-disk-utility-3.0.2-separate-libgdu.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-separate-libgdu.patch
deleted file mode 100644
index a141800a7fa5..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-separate-libgdu.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 1596519d3c103d60c6870d80f3355a1987ce37e6 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 12 Apr 2012 03:45:37 -0400
-Subject: [PATCH] Split libgdu out of gnome-disk-utility
-
----
- Makefile.am                        |    2 +-
- configure.ac                       |   16 +-------------
- data/Makefile.am                   |   11 ----------
- data/icons/16x16/Makefile.am       |   37 ------------------------------------
- data/icons/22x22/Makefile.am       |   37 ------------------------------------
- data/icons/48x48/Makefile.am       |   37 ------------------------------------
- data/icons/scalable/Makefile.am    |   37 ------------------------------------
- src/Makefile.am                    |    2 +-
- src/format-tool/Makefile.am        |    4 +-
- src/nautilus-extension/Makefile.am |    4 +-
- src/palimpsest/Makefile.am         |    4 +-
- 11 files changed, 10 insertions(+), 181 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 4fd5718..2745725 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = src data doc help po
-+SUBDIRS = src data help po
- 
- EXTRA_DIST = \
- 	autogen.sh		\
-diff --git a/configure.ac b/configure.ac
-index 77a16ab..9b351f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -132,10 +132,7 @@ GTK3_REQUIRED=2.90.7
- UNIQUE_REQUIRED=2.90.1
- LIBNOTIFY_REQUIRED=0.6.1
- NAUTILUS_REQUIRED=2.91.0
--AVAHI_UI_REQUIRED=0.6.25
--
--UDISKS_REQUIRED=1.0.0
--UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0
-+GDU_REQUIRED=3.0.2
- 
- SCROLLKEEPER_REQUIRED=0.3.14
- INTLTOOL_REQUIRED=0.35.0
-@@ -149,10 +146,8 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= $DBUS_GLIB_REQUIRED])
- PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
- PKG_CHECK_MODULES(UNIQUE, [unique-3.0 >= $UNIQUE_REQUIRED])
- 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])
-+PKG_CHECK_MODULES(GDU, [gdu >= $GDU_REQUIRED gdu-gtk >= $GDU_REQUIRED])
- 
- # *************
- # Remote Access
-@@ -238,12 +233,7 @@ AC_SUBST([AM_LDFLAGS])
- AC_CONFIG_FILES([
- Makefile
- src/Makefile
--src/gdu/Makefile
--src/gdu/gdu.pc
--src/gdu-gtk/Makefile
--src/gdu-gtk/gdu-gtk.pc
- src/palimpsest/Makefile
--src/notification/Makefile
- src/format-tool/Makefile
- src/nautilus-extension/Makefile
- po/Makefile.in
-@@ -258,8 +248,6 @@ data/icons/48x48/Makefile
- data/icons/256x256/Makefile
- data/icons/scalable/Makefile
- help/Makefile
--doc/Makefile
--doc/version.xml
- ])
- 
- AC_OUTPUT
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 785368d..0232908 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -6,27 +6,16 @@ desktopdir = $(datadir)/applications
- desktop_in_files = palimpsest.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
--autostartdir = $(sysconfdir)/xdg/autostart
--autostart_in_files = gdu-notification-daemon.desktop.in
--autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
--
--gdu-notification-daemon.desktop.in: gdu-notification-daemon.desktop.in.in
--	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
--
- @INTLTOOL_DESKTOP_RULE@
- 
- distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
- 
- EXTRA_DIST = 			\
- 	$(desktop_in_files)	\
--	$(autostart_in_files)	\
- 	$(NULL)
- 
- CLEANFILES = \
- 	$(desktop_DATA)				\
--	$(autostart_DATA)			\
--	gdu-notification-daemon.desktop.in	\
--	gdu-notification-daemon.desktop.in.in	\
- 	$(NULL)
- 
- clean-local :
-diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
-index f62ef2d..25db659 100644
---- a/data/icons/16x16/Makefile.am
-+++ b/data/icons/16x16/Makefile.am
-@@ -3,43 +3,6 @@ NULL =
- icondir = $(datadir)/icons/hicolor/16x16/apps
- icon_DATA =				\
- 	palimpsest.png			\
--	gdu-eject.png			\
--	gdu-detach.png			\
--	gdu-mount.png			\
--	gdu-unmount.png			\
--	gdu-raid-array.png		\
--	gdu-raid-array-start.png	\
--	gdu-raid-array-stop.png		\
--	gdu-encrypted-lock.png		\
--	gdu-encrypted-unlock.png	\
--	gdu-smart-failing.png		\
--	gdu-smart-threshold.png		\
--	gdu-smart-healthy.png		\
--	gdu-smart-unknown.png		\
--	gdu-check-disk.png		\
--	gdu-info.png			\
--	gdu-error.png			\
--	gdu-warning.png			\
--	gdu-unmountable.png		\
--	nautilus-gdu.png		\
--	gdu-multidisk-drive.png		\
--	gdu-hba.png			\
--	gdu-expander.png		\
--	gdu-category-multidisk.png	\
--	gdu-category-multipath.png	\
--	gdu-category-peripheral.png	\
--	gdu-emblem-mp.png		\
--	gdu-emblem-mp-component.png	\
--	gdu-emblem-lvm-vg.png		\
--	gdu-emblem-lvm-lv.png		\
--	gdu-emblem-raid-linear.png	\
--	gdu-emblem-raid0.png		\
--	gdu-emblem-raid1.png		\
--	gdu-emblem-raid3.png		\
--	gdu-emblem-raid4.png		\
--	gdu-emblem-raid5.png		\
--	gdu-emblem-raid6.png		\
--	gdu-emblem-raid10.png		\
- 	$(NULL)
- 
- EXTRA_DIST = \
-diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
-index c0b4c4d..510b976 100644
---- a/data/icons/22x22/Makefile.am
-+++ b/data/icons/22x22/Makefile.am
-@@ -3,43 +3,6 @@ NULL =
- icondir = $(datadir)/icons/hicolor/22x22/apps
- icon_DATA =				\
- 	palimpsest.png			\
--	gdu-eject.png			\
--	gdu-detach.png			\
--	gdu-mount.png			\
--	gdu-unmount.png			\
--	gdu-raid-array.png		\
--	gdu-raid-array-start.png	\
--	gdu-raid-array-stop.png		\
--	gdu-encrypted-lock.png		\
--	gdu-encrypted-unlock.png	\
--	gdu-smart-failing.png		\
--	gdu-smart-threshold.png		\
--	gdu-smart-healthy.png		\
--	gdu-smart-unknown.png		\
--	gdu-check-disk.png		\
--	gdu-info.png			\
--	gdu-error.png			\
--	gdu-warning.png			\
--	gdu-unmountable.png		\
--	nautilus-gdu.png		\
--	gdu-multidisk-drive.png		\
--	gdu-hba.png			\
--	gdu-expander.png		\
--	gdu-category-multidisk.png	\
--	gdu-category-multipath.png	\
--	gdu-category-peripheral.png	\
--	gdu-emblem-mp.png		\
--	gdu-emblem-mp-component.png	\
--	gdu-emblem-lvm-vg.png		\
--	gdu-emblem-lvm-lv.png		\
--	gdu-emblem-raid-linear.png	\
--	gdu-emblem-raid0.png		\
--	gdu-emblem-raid1.png		\
--	gdu-emblem-raid3.png		\
--	gdu-emblem-raid4.png		\
--	gdu-emblem-raid5.png		\
--	gdu-emblem-raid6.png		\
--	gdu-emblem-raid10.png		\
- 	$(NULL)
- 
- EXTRA_DIST = \
-diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
-index 349b8ce..ad38bea 100644
---- a/data/icons/48x48/Makefile.am
-+++ b/data/icons/48x48/Makefile.am
-@@ -3,43 +3,6 @@ NULL =
- icondir = $(datadir)/icons/hicolor/48x48/apps
- icon_DATA = 				\
- 	palimpsest.png			\
--	gdu-eject.png			\
--	gdu-detach.png			\
--	gdu-mount.png			\
--	gdu-unmount.png			\
--	gdu-raid-array.png		\
--	gdu-raid-array-start.png	\
--	gdu-raid-array-stop.png		\
--	gdu-encrypted-lock.png		\
--	gdu-encrypted-unlock.png	\
--	gdu-smart-failing.png		\
--	gdu-smart-threshold.png		\
--	gdu-smart-healthy.png		\
--	gdu-smart-unknown.png		\
--	gdu-check-disk.png		\
--	gdu-info.png			\
--	gdu-error.png			\
--	gdu-warning.png			\
--	gdu-unmountable.png		\
--	nautilus-gdu.png		\
--	gdu-multidisk-drive.png		\
--	gdu-hba.png			\
--	gdu-expander.png		\
--	gdu-category-multidisk.png	\
--	gdu-category-multipath.png	\
--	gdu-category-peripheral.png	\
--	gdu-emblem-mp.png		\
--	gdu-emblem-mp-component.png	\
--	gdu-emblem-lvm-vg.png		\
--	gdu-emblem-lvm-lv.png		\
--	gdu-emblem-raid-linear.png	\
--	gdu-emblem-raid0.png		\
--	gdu-emblem-raid1.png		\
--	gdu-emblem-raid3.png		\
--	gdu-emblem-raid4.png		\
--	gdu-emblem-raid5.png		\
--	gdu-emblem-raid6.png		\
--	gdu-emblem-raid10.png		\
- 	$(NULL)
- 
- EXTRA_DIST = \
-diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
-index bc3f60f..3bbcecd 100644
---- a/data/icons/scalable/Makefile.am
-+++ b/data/icons/scalable/Makefile.am
-@@ -2,43 +2,6 @@ NULL =
- 
- icondir = $(datadir)/icons/hicolor/scalable/apps
- icon_DATA =				\
--	gdu-eject.svg			\
--	gdu-detach.svg			\
--	gdu-mount.svg			\
--	gdu-unmount.svg			\
--	gdu-raid-array.svg		\
--	gdu-raid-array-start.svg	\
--	gdu-raid-array-stop.svg		\
--	gdu-encrypted-lock.svg		\
--	gdu-encrypted-unlock.svg	\
--	gdu-smart-failing.svg		\
--	gdu-smart-threshold.svg		\
--	gdu-smart-healthy.svg		\
--	gdu-smart-unknown.svg		\
--	gdu-check-disk.svg		\
--	gdu-info.svg			\
--	gdu-error.svg			\
--	gdu-warning.svg			\
--	gdu-unmountable.svg		\
--	nautilus-gdu.svg		\
--	gdu-multidisk-drive.svg		\
--	gdu-hba.svg			\
--	gdu-expander.svg		\
--	gdu-category-multidisk.svg	\
--	gdu-category-multipath.svg	\
--	gdu-category-peripheral.svg	\
--	gdu-emblem-mp.svg		\
--	gdu-emblem-mp-component.svg	\
--	gdu-emblem-lvm-vg.svg		\
--	gdu-emblem-lvm-lv.svg		\
--	gdu-emblem-raid-linear.svg	\
--	gdu-emblem-raid0.svg		\
--	gdu-emblem-raid1.svg		\
--	gdu-emblem-raid3.svg		\
--	gdu-emblem-raid4.svg		\
--	gdu-emblem-raid5.svg		\
--	gdu-emblem-raid6.svg		\
--	gdu-emblem-raid10.svg		\
- 	$(NULL)
- 
- EXTRA_DIST = \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index bab902f..0d47f52 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = gdu gdu-gtk palimpsest notification format-tool
-+SUBDIRS = palimpsest format-tool
- 
- if ENABLE_NAUTILUS
- SUBDIRS += nautilus-extension
-diff --git a/src/format-tool/Makefile.am b/src/format-tool/Makefile.am
-index 4573770..e95d998 100644
---- a/src/format-tool/Makefile.am
-+++ b/src/format-tool/Makefile.am
-@@ -18,6 +18,7 @@ CORE_CFLAGS = 						\
- 	$(GIO_UNIX2_CFLAGS)				\
- 	$(GTHREAD2_CFLAGS)				\
- 	$(GTK3_CFLAGS)					\
-+	$(GDU_CFLAGS)					\
- 	$(NULL)
- 
- CORE_LIBADD = 						\
-@@ -28,8 +29,7 @@ CORE_LIBADD = 						\
- 	$(GTHREAD2_LIBS)				\
- 	$(GTK3_LIBS)					\
- 	$(INTLLIBS)					\
--	$(top_builddir)/src/gdu/libgdu.la		\
--	$(top_builddir)/src/gdu-gtk/libgdu-gtk.la	\
-+	$(GDU_LIBS)					\
- 	$(NULL)
- 
- libexec_PROGRAMS = gdu-format-tool
-diff --git a/src/nautilus-extension/Makefile.am b/src/nautilus-extension/Makefile.am
-index c5a9875..2c66cec 100644
---- a/src/nautilus-extension/Makefile.am
-+++ b/src/nautilus-extension/Makefile.am
-@@ -19,6 +19,7 @@ CORE_CFLAGS = 						\
- 	$(GIO_UNIX2_CFLAGS)				\
- 	$(GTHREAD2_CFLAGS)				\
- 	$(GTK2_CFLAGS)					\
-+	$(GDU_CFLAGS)					\
- 	$(NULL)
- 
- CORE_LIBADD = 						\
-@@ -29,8 +30,7 @@ CORE_LIBADD = 						\
- 	$(GTHREAD2_LIBS)				\
- 	$(GTK2_LIBS)					\
- 	$(INTLLIBS)					\
--	$(top_builddir)/src/gdu/libgdu.la		\
--	$(top_builddir)/src/gdu-gtk/libgdu-gtk.la	\
-+	$(GDU_LIBS)					\
- 	$(NULL)
- 
- 
-diff --git a/src/palimpsest/Makefile.am b/src/palimpsest/Makefile.am
-index 912da87..ca50998 100644
---- a/src/palimpsest/Makefile.am
-+++ b/src/palimpsest/Makefile.am
-@@ -34,6 +34,7 @@ palimpsest_CFLAGS = 					\
- 	$(GTK3_CFLAGS)					\
- 	$(UNIQUE_CFLAGS)				\
- 	$(X11_CFLAGS)					\
-+	$(GDU_CFLAGS)					\
- 	$(WARN_CFLAGS)					\
- 	$(AM_CFLAGS)
- 
-@@ -50,8 +51,7 @@ palimpsest_LDADD = 					\
- 	$(UNIQUE_LIBS)					\
- 	$(X11_LIBS)					\
- 	$(INTLLIBS)					\
--	$(top_builddir)/src/gdu/libgdu.la		\
--	$(top_builddir)/src/gdu-gtk/libgdu-gtk.la
-+	$(GDU_LIBS)
- 
- clean-local :
- 	rm -f *~
--- 
-1.7.8.5
-
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch
deleted file mode 100644
index 0ab654b114fb..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 57936f7012688af08328a5f5ffc9cd5e4b5c041f Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Fri, 5 Apr 2013 12:42:06 +0200
-Subject: [PATCH] Avoid needing gsd during build when --disable-gsd-plugin is
- used
-
-PKG_CHECK_MODULES was previously unconditionally requiring
-gnome-settings-daemon to be available, even when it was later
-not going to be used because the --disable-gsd-plugin configure
-switch was passed.
-
-Move the check to only require g-s-d when it's actually going to be
-used.
-
-While at it, also fix the indentation of the msg_gsd_plugin=yes line.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697146
----
- configure.ac |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9cf1011..054d9d7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -98,7 +98,6 @@ PKG_CHECK_MODULES(LIBSECRET1, [libsecret-1 >= $LIBSECRET1_REQUIRED])
- PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED])
- PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED])
- PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED])
--PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= GSD_PLUGIN_REQUIRED])
- PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= LIBNOTIFY_REQUIRED])
- 
- gsd_plugindir='${libdir}/gnome-settings-daemon-3.0'
-@@ -134,7 +133,8 @@ dnl *************************************
- AC_ARG_ENABLE(gsd_plugin, AS_HELP_STRING([--disable-gsd-plugin],[don't build gnome-settings-daemon plug-in]))
- msg_gsd_plugin=no
- if test "x$enable_gsd_plugin" != "xno"; then
--   msg_gsd_plugin=yes
-+  msg_gsd_plugin=yes
-+  PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= GSD_PLUGIN_REQUIRED])
- fi
- AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$msg_gsd_plugin" = "yes"])
- 
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch
deleted file mode 100644
index b9f20c733009..000000000000
--- a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a0ed8e8e80dcba96e5c35888c01f3f9b39aef02f Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Fri, 5 Apr 2013 12:30:55 +0200
-Subject: [PATCH] Bump required version of gnome-settings-daemon to 3.8
-
-Reported by Pacho Ramos in https://bugzilla.gnome.org/697146
-and from the references gentoo bug report:
-
-With gnome-base/gnome-settings-daemon-3.6.4:
-
-gdusdmanager.c: At top level:
-gdusdmanager.c:42:1: error: unknown type name 'GduSdClass'
-gdusdmanager.c:80:1: warning: 'gdu_sd_manager_start' defined but not used [-Wunused-function]
-gdusdmanager.c:124:1: warning: 'gdu_sd_manager_new' defined but not used [-Wunused-function]
-make[3]: *** [libgdu_sd_la-gdusdmanager.lo] Error 1
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b40d58f..9cf1011 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,7 @@ LIBSECRET1_REQUIRED=0.7
- PWQUALITY_REQUIRED=1.0.0
- CANBERRA_REQUIRED=0.1
- LIBDVDREAD_REQUIRED=4.2.0
--GSD_PLUGIN_REQUIRED=3.6
-+GSD_PLUGIN_REQUIRED=3.8
- LIBNOTIFY_REQUIRED=0.7
- 
- PKG_CHECK_MODULES(GLIB2, [gmodule-2.0 gio-unix-2.0 >= $GLIB2_REQUIRED])
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r201.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r201.ebuild
deleted file mode 100644
index e48d2357a71e..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r201.ebuild
+++ /dev/null
@@ -1,67 +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-r201.ebuild,v 1.9 2012/10/28 16:32:46 armin76 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="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
-	>=gnome-base/libgdu-${PV}[gnome-keyring?]
-	>=x11-libs/gtk+-2.90.7:3
-	>=x11-libs/libnotify-0.6.1
-
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	nautilus? ( >=gnome-base/nautilus-2.24.0 )
-"
-RDEPEND="${CDEPEND}
-	=sys-fs/udisks-1.0*:0[remote-access?]
-	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"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(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"
-
-	# Split libgdu out of gnome-disk-utility
-	epatch "${FILESDIR}/${PN}-3.0.2-separate-libgdu.patch"
-
-	# Keep nautilus extension working on Gnome2 setups
-	epatch "${FILESDIR}/${PN}-3.0.2-nautilus2-compat-r201.patch"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-
-	gnome2_src_prepare
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
deleted file mode 100644
index 8b68853263fd..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 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.10.0.ebuild,v 1.5 2014/03/29 21:53:43 tetromino Exp $
-
-EAPI="5"
-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="GPL-2+"
-SLOT="0"
-IUSE="fat +gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-2.1.1:2
-	>=x11-libs/gtk+-3.5.8:3
-	>=app-arch/xz-utils-5.0.5
-	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality
-	systemd? ( >=sys-apps/systemd-44:0= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-libs/libdvdread-4.2.0
-	>=media-libs/libcanberra-0.1[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )
-	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-libs/libxslt
-	gnome-base/gnome-common
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix USE=-gnome, bug #478820
-	epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch
-	epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gnome gsd-plugin) \
-		$(use_enable systemd libsystemd-login)
-}
diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 01c7a15efb29..7ec8ee75a308 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -5,8 +5,5 @@
 <use>
 	<flag name='fat'>Include FAT16/FAT32 support
 		(<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>
 </use>
 </pkgmetadata>