Drop old (#508854)
authorPacho Ramos <pacho@gentoo.org>
Thu, 13 Nov 2014 12:38:08 +0000 (12:38 +0000)
committerPacho Ramos <pacho@gentoo.org>
Thu, 13 Nov 2014 12:38:08 +0000 (12:38 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

12 files changed:
sys-apps/gnome-disk-utility/ChangeLog
sys-apps/gnome-disk-utility/Manifest
sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-non-utf8-crash.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.32.1-optional-avahi.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat-r201.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-nautilus2-compat.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.0.2-separate-libgdu.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-kill-gsd-automagic.patch [deleted file]
sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.8.2-raise-gsd-dependency.patch [deleted file]
sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r201.ebuild [deleted file]
sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild [deleted file]
sys-apps/gnome-disk-utility/metadata.xml

index cd36d0cffa0e80c62035f14e1ad0ca752d8095bb..ed67813701c259cf4c130abd13b0fb6ec4190395 100644 (file)
@@ -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:
index 1b238945d20c5e95d7373eb2e5bd73a71a9a9708..9477097951db3b197ae9d7279368843d25bb7012 100644 (file)
@@ -1,37 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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-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
 AUX gnome-disk-utility-3.10.0-kill-gsd-automagic.patch 1777 SHA256 578670aa845e876f8e0f935a47441af3a45a38abb7f84e8101f5017d7e532872 SHA512 3fd1d865fce3b1c5220ca33247e6291d7a1afe4c2e4715c6f5d5946bca853effa4fd5c28f906df03eb968930e46e3aa358027cf5db3cee880d3945246c5200c3 WHIRLPOOL 40db689e3c03ef30ad34bd2f6b4b3abec972fc40b8b3a855228b394319a44133cad3b079d87251dec1ed38b806d9432125fa7df15012864a10f858194312bd38
 AUX gnome-disk-utility-3.10.0-raise-gsd-dependency.patch 1122 SHA256 e6c5ab12de3bebe2ec64c9893a2bccf3dff3eab1d5eee6f101a85b7805f95681 SHA512 ed1ee38061196608d2448b2bfac69d32defed89c80704826cba21a2d65c4dbff51ca897a9db5da0be2b3c606302a64f036217af949c30a875ed57c05f0f206a1 WHIRLPOOL 6fc0ce6d3068a84b14c3d8fbc1bebbe8f38e1948df10a6bcb2c713f1367b69bcdd2fa6cf7c553d6554e25d363803e261c25b2c6167559bdd0d69b3edfa723a04
-AUX gnome-disk-utility-3.8.2-kill-gsd-automagic.patch 1763 SHA256 176c2294b31ca7148662c39cedd06c5574c077e4ce8254381e49b605ee4341d4 SHA512 5f25bb1aac14b8b11c40cee4ac4e817d18b9a0d4b5924272f30e86d8d151f4958ccc61ac594c93218fb704a6b98766b7b136d4f6147f376361b07c958223d95e WHIRLPOOL 8ab4cddb2d03a3fe34f847c5f7283657ef858a17a90f48e2d1b3501750fd03fd7ff693e869bd17c7075a797c6aa89cf7201dc547f05b142229b0125f91bb5db1
-AUX gnome-disk-utility-3.8.2-raise-gsd-dependency.patch 1167 SHA256 9ec8aab62785a5bc0fd70568ca1bd34c5eac0efb3604665ca4f0f9ef06efa59e SHA512 2accae09b4ebc505f0c3892e14e3e28b3a607fe92238e042f8c4f020c0a62f9efe42a7beb297fb9b2bce98012531bbb7629e4ba34f746fbe4e278850a04cf872 WHIRLPOOL e9fa12b0d297ee93263273c4134722f24c4edd73335e6d919e675e479cb45983dce917af5ea3043bf0e315eabb900903d0a5887605bdf017b2ad82fa5f038dc3
-DIST gnome-disk-utility-3.0.2.tar.xz 2002052 SHA256 7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5 SHA512 b7e68f42d9199c74b60f32b27456b81a6351dc717e54a0dd6162b4e0af521f50deda587012a94ba2768d76dc9dda40dbf505cfea9ca94f879df5d9093fef8969 WHIRLPOOL dd13ad2e2ae57976cd1dfb0539a5dc1b845bb9c8d2feb3708b0bf8e50a3f5324df962dcff7ac937636f466257913f75f060775ba280fe56b63c6e53a243c8de3
-DIST gnome-disk-utility-3.10.0.tar.xz 1401460 SHA256 34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa SHA512 0de9aaea7835dfa12525aeb8ae5e3d7fd8db89b449d979267c1b50cf3b447c495c56f5340dc8cf355941dab6b68a29a25c8c152197cfbf0b348cf09c347d5459 WHIRLPOOL 2bb703e1c77a42516476fbfb3e8782f81dee80a717e03183a408c5527ae4d947dcafe0e6bed1fb630abd9cc63d1b47d74a136e38da611a54deee8a07816c4cab
 DIST gnome-disk-utility-3.12.1.tar.xz 1446148 SHA256 5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e SHA512 c1feb452955882beb64635e75594bc30acdc8fd4e102107b956e18a5bdea1b802b53464c4c4beef94eb22ad3ad7471b7bff17b566da6438247e5b05146e82ff3 WHIRLPOOL 9e0749fa246c5c2995082ae0dff1277f5e60b82747280ded234a3aa42ddf1b8ed8c4d85fd1cd0a16eca9edf23c7eabd31d6b4458d565ff51025ea87489058726
-EBUILD gnome-disk-utility-3.0.2-r201.ebuild 1735 SHA256 506df4a87731a216412a4f70999b2313b8a6341228b9c228fd9011499a20c7da SHA512 fbfc818a297abbbad9a48216c9ac60224b3419ca6df1f4d0378a519229fed3637a5c135edec51ec9c714a07668b7ce7b0ebdf237d180f5616b8e109d98f214b2 WHIRLPOOL 89779c3eb006fca0d0a191ca83fb6160798a48e13eced064db906a343c3f77999b599fa60ea3d34c7014588d647912f1bcd30e8c35252741f5ab490e3e16c740
-EBUILD gnome-disk-utility-3.10.0.ebuild 1448 SHA256 d33941f4d0ea67c2d8e2736e90c6d5155ca1eca4e8fa3b5ca66ffd7b0918df54 SHA512 9a8b73cc8ee0a3aa7628f477292a1144ab7cbad1c10a733edcc6c728734a6ce8a135c4df999b80cb27e71ec668656dcf06f28ba7fae71be8b3ed7eb4852ea963 WHIRLPOOL 5b3358631c809180351d391e2a2267ccc4c9ba0f9b34610f82e9a7f27d0383048ff5ddc8e30f052fac20e4866765ace549ca60fbfe5f8bbcf59d0e13a89d463a
 EBUILD gnome-disk-utility-3.12.1.ebuild 1441 SHA256 2f7cb583a89948810d91fa4510ffb0b7760af9a1e0012fe6e36707e8c5e4cbfb SHA512 ada65f4cda24cdf94ac83f7bafddcdfdf631d9076124d19ffc15a7105817b9a5d88a8de39e3b7e43a88d70b55273c38fe636cb910cbe2999707c84ba73296212 WHIRLPOOL cb92cc99a112a2e333e154ac5723846803d4a145a21c7ba91daeb5d1e1556e8f4f3822d7c6aac141c4ee5cb347f887b4631df8dfbdea0c1cd9f49f7a7768d3d6
-MISC ChangeLog 17004 SHA256 eeb89a567cf613a67e2f05de97d7703e08c9dcae683b2bce0610dd5b6993a97e SHA512 d906fe9fa725b7003a0e403328f868705d4b79e7f335355f11445a7265677a7c2b0cd333c466e1938deaa8422fb4935c3b97f57b5fa5b10f76a0a828020484f4 WHIRLPOOL f301f6bcfe86e5926bc0e9994dda1c9187f707bf3a1b1261c7c7da352ed230700f31e7ec9ebed7bb487056db09a12754c4c76b63e34f2dfaaa5ea24c8c6978ec
-MISC metadata.xml 413 SHA256 fa3b6fb623b748e2cef10e71cc41cc52a5985b51652e02c8078fd0216b9c8b04 SHA512 481ece48d81086f348a3bdb024365b5364ad9cc1fe3368305c9f0a8ee994815728a9c5639d67d530a29c755109c7ed951b6d0cac023be065fef4ba08710559a3 WHIRLPOOL c83403da9dbf754116ac1a1116b18dd6a2d7843323002b5a9a72c88fc295e45b510d8f8b24776057a0f65a55861606b6404df98df667624aeead0b44e56e01e9
+MISC ChangeLog 17580 SHA256 378b4fc02a4d3af5c25b12e7854190b82cd1136a7ab7cdaebe4cfac005587053 SHA512 1e0a457a5a6130330771acc0b685ebacf1c5ff6b7c62522d93f98ca8b3eac5e01209a8b8c55d46d874a8d062a7c8853a8f1a01e149a7819c01de7ce53c2db346 WHIRLPOOL 93cc9168e5dfc6168164d2c8b7c792c14d7b2773332793caed8beec36510904157499cda89ac44b429ed4ffc79c52dd46ae2d3e8d42eab260b5807c5f0072222
+MISC metadata.xml 257 SHA256 d2f53008de44cb76e8671b2fe4bbc5c74cc1cef9fee303cbd9753d6a84f490ca SHA512 945e01e0613fef309404a20ed476df09cf52286a816f481b605c169ca945fa4fb6195ac484db2d7c357f64b2c9d65edeb8987347ae88e72a7169a900ca6e16f1 WHIRLPOOL c1724e37c986989a97e6d1a8a2c540587c72d1ebadb0af0f3eb930c7859bff5f78dc2a03a5df2df2af08ca24390eca78dfd74f799b42b4fd0ffb04be7b66e23e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9bMAAoJELp701BxlEWfUnEP+wbZpf3Sw5DW4GlyXHW5oDSX
-TzU38ql29KLZQt2B31f9r89Jl2FmKQEKUbaCgTBiXS002cRozxVIcxIO+LmHlJns
-oPhQYTuap4w8v+XxEqPRJg8OlEIFKmAul8T57l71hzOPwAbc/u6FocAMNUjbHLFX
-OSaEPR491SZlH9SG6deafB1Q2uczgx4/q5uhtjz4ZZL42TW1KFn6RnLjBYog+1Ji
-DtMXzOovmoluEK3AjeOSTEzACz3EH4DuNKiTGSzxIJgaKQBnf3P5kJVLKAJ/29xp
-MxtG2FwUsMUUIDJA8ymSd9oaGVvrRGg5Uh4ZIKYh+Uol3qWnVLjQpnHa5Xy0dYYf
-ed/aam8bIXo/6fVQXm06A8sUGRalOQ3frGDCvaPFMlU2SBcyMG6AN2VLvh6txLPN
-P0JLVQ3zGmq9RwJTZGfF7uSC5NMwv4L/WLCCSV9ply/HmICWHOyRLbBsRne8E440
-eWf0BTfvnZG0iAaZ/emKseK2MPog4/G8b1ZTAFbnMgtKr/iuIRgmiNICHL7Nr3Yr
-SygHZTI1erghFry0zJzNjbA7Qe080bnC7Vuwy/BXlX6UDcyQ/iz+XMmKMzaLvDql
-vcIxh8xtp2w+i5MDHRkPE83Z0v+fKXYWgQcmpc/4A7BRluugirOk6fbbCWBLvnkT
-kZt5YYSYM+7NoEJTicxS
-=1st1
+iEYEAREIAAYFAlRkpjAACgkQCaWpQKGI+9SfLgCfRfV6eXrq13Qc9QBrr4+EXvax
+P8MAnArXWXA+2vwzwFBtwVBXc+m1r3kW
+=FjBy
 -----END PGP SIGNATURE-----
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 (file)
index 262748b..0000000
+++ /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 (file)
index 9caaf18..0000000
+++ /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 (file)
index e765a6c..0000000
+++ /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 (file)
index 20f0f31..0000000
+++ /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 (file)
index a141800..0000000
+++ /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 (file)
index 0ab654b..0000000
+++ /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 (file)
index b9f20c7..0000000
+++ /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 (file)
index e48d235..0000000
+++ /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 (file)
index 8b68853..0000000
+++ /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)
-}
index 01c7a15efb2962782fda2ac7cf8201074b0c7ee8..7ec8ee75a308cf9884e54f098f81139eb68f28ce 100644 (file)
@@ -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>