Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

8 files changed, 119 insertions, 155 deletions

diff --git a/sys-apps/gnome-disk-utility/ChangeLog b/sys-apps/gnome-disk-utility/ChangeLog
index 9fa42f31e4c6..d9249cc002bd 100644
--- a/sys-apps/gnome-disk-utility/ChangeLog
+++ b/sys-apps/gnome-disk-utility/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/gnome-disk-utility
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.88 2013/12/08 19:39:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/ChangeLog,v 1.89 2013/12/24 17:40:32 pacho Exp $
+
+*gnome-disk-utility-3.10.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch,
+  +files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch,
+  +gnome-disk-utility-3.10.0.ebuild, -gnome-disk-utility-3.0.2-r301.ebuild,
+  -gnome-disk-utility-3.4.1.ebuild, -gnome-disk-utility-3.6.1.ebuild,
+  -gnome-disk-utility-3.8.0.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-disk-utility-3.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index fbf4f3912cc6..5ba9a680611e 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -6,25 +6,22 @@ AUX gnome-disk-utility-2.32.1-optional-avahi.patch 3271 SHA256 30965971604b96489
 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.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
-DIST gnome-disk-utility-3.8.0.tar.xz 1363100 SHA256 2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e SHA512 1ad8d44bc575234e1a02a16095639143a28e1b6ca6e12629570c9a4b00c1a8e0b24784f6ecef647104fc985859cabf3ea97ce9aa7391198d5b7ec304678f2e2f WHIRLPOOL 077946534ddc7acec0fef32cd70d7c87c6070b6b4b89140a8450f5a24b617ce2caba97b660964b7b33f72aa562cf1a14bdddcc0af409016decab09143fedfb19
+DIST gnome-disk-utility-3.10.0.tar.xz 1401460 SHA256 34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa SHA512 0de9aaea7835dfa12525aeb8ae5e3d7fd8db89b449d979267c1b50cf3b447c495c56f5340dc8cf355941dab6b68a29a25c8c152197cfbf0b348cf09c347d5459 WHIRLPOOL 2bb703e1c77a42516476fbfb3e8782f81dee80a717e03183a408c5527ae4d947dcafe0e6bed1fb630abd9cc63d1b47d74a136e38da611a54deee8a07816c4cab
 DIST gnome-disk-utility-3.8.2.tar.xz 1380196 SHA256 6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3 SHA512 531f4d7b2a377d1129149157e863b756605c86e8095ea76c89ad0ce7951e8724f3257f869f1f83be99600b7b575b18d7204a13aa1f20f351cbe4691390e33a23 WHIRLPOOL 950ced3028f1163904b4f8ebb477bc21ce42daf98eebb081d2aa15aef1c2bc6851d4b05aa72c5e591050972447e4acebab86a9c5c4bd74809fc147a8d903295c
 EBUILD gnome-disk-utility-3.0.2-r201.ebuild 1735 SHA256 506df4a87731a216412a4f70999b2313b8a6341228b9c228fd9011499a20c7da SHA512 fbfc818a297abbbad9a48216c9ac60224b3419ca6df1f4d0378a519229fed3637a5c135edec51ec9c714a07668b7ce7b0ebdf237d180f5616b8e109d98f214b2 WHIRLPOOL 89779c3eb006fca0d0a191ca83fb6160798a48e13eced064db906a343c3f77999b599fa60ea3d34c7014588d647912f1bcd30e8c35252741f5ab490e3e16c740
-EBUILD gnome-disk-utility-3.0.2-r301.ebuild 1628 SHA256 df8ae31fdeeed7072358f7eb1aa60f7627aa11e622028a54d81780565e2f1fa4 SHA512 bf6eebf414a39be14661a2440764d02ea8008885da75e992eeec632c0a37ece20243ec38be2502ddebca297b695b11d84771f0e7a06679ba2654d419e6cf8c4c WHIRLPOOL 277ee7a9b8cd6555b6d0ed2bdbff140f306adde2d1a9b96fb59dfa2248085f9b925dbd36c5996c4b1a35cc92c62e9c5b0f0fc793f9806acfb7f979154446c371
-EBUILD gnome-disk-utility-3.4.1.ebuild 746 SHA256 c8151c526e1cfe7af8da0c8740b4272417a8007ee87450bc4461f13c5cbedab6 SHA512 7d2d1c981b1f50f45dd55a78895208d3fb24b46d8e0a6a65cb05dedc9fc36456a6a8bba8f04bc88169ec4b0c79013f1b3982238f19e18d6946d6c9a0992e08b4 WHIRLPOOL 0f8775be520e106ce6f012d0b954157c26e7fde2d03c8ef432373aa859ceec00bea1a39f4768a872465638c4b7cf86d2acea82338bf5bbfe75fd41e9961616fa
-EBUILD gnome-disk-utility-3.6.1.ebuild 912 SHA256 176f1aa4c64d1b4790c064d18dbaa67f511ece28c52e1c44cd4af6d5e2b3c24e SHA512 8bd17c46731aadac0a1092dae82a98666ab297b384a17f6f17c09149f2f00adc6df53cec94d2b72c0ce30b7b2cd9dda9827f118190d500021a0829f2e0d11248 WHIRLPOOL 08962b94ce106909f52819e9bb3d4e72a55e85d279282a28022dc694ab93624773d6683227965c831d789a20d3c2b23f0b5487b73d33044a61a1f34c48174893
-EBUILD gnome-disk-utility-3.8.0.ebuild 1084 SHA256 7273ba73e9784266a9927bf568a830d70b759c665d40f23e00b6a09f537f09bd SHA512 be5d34c75f9cb72c0bfd31830234262b345081471dd5ac70ba0d6ccf8a4cd4df9693a28277c1774d553e6f4947ac678fa563ffd6eaba1832cb5bddeda92952ea WHIRLPOOL 4abdeca3cc33c69fcebd24a6e27b490b80c77f1b37b70f15874617796c67bb264e18f208ffddfdc4fae472c049f1955e539b2f138647e21633ba649b38eaacbc
+EBUILD gnome-disk-utility-3.10.0.ebuild 1418 SHA256 e0ba5c43466ab28ea05736a91cb8a733de3174c13ca4334eeff68eb8b3e799f4 SHA512 586f317ebeb4333aaf576dd52c2c7219816a8e5eb801b67fdbe3c52a8442822a1c1e6b27b3e2e033ebfd1b1eabd7936de70220755a6666ec0f93faf07171446c WHIRLPOOL 5b6272e5ba21aaccc5b5851e2fc9a79654107bc287b55ef6f5721398ebd46191e17fd4d614d5a547b886527a0404d316a4ef8edefbf181075861d8eba1346a58
 EBUILD gnome-disk-utility-3.8.2.ebuild 1386 SHA256 0fced0730277bdc95f9376140580eb77c4f253cbf09f87e1bc0d2429045754e4 SHA512 48e3007eb208ed43c5c3f723c4a5affa8e07d0962c8b4a94eff993b59a41794cc98a9c644dfcc0a8860ba36f872d31ef1f8c5651572995af77c494206c264964 WHIRLPOOL d46ad168c21c7a882c2052fc906444e50d1d69c05a8d93e06b2c70a386f51668e0299b49a7dc97df0d9cf683a8dc101fd47332501d35062ecd841eb3cfa5dca3
-MISC ChangeLog 15425 SHA256 275ccc22b8f403334ea5baf42c698f4c96c225442493d54dc44c49dae2b51d26 SHA512 1fcfdedd4bb4d225dad982d12b056e5682b624316a08c15f5c0a16408c91199e85c19fd60cde2492d7768becc8fbeeb71bfc83e72dba1738d776cb83ac4cfe22 WHIRLPOOL 7740d9d71479b52ae127b671b4e43045f2f345853cdbdd659539df86c594aabea2eda52704fe54a8a2304f8fa5358269c75a832b0965d73c0fdd97790f0ba912
+MISC ChangeLog 15850 SHA256 8ae94f36f0aef799e392a41fdd9e8a4016b573207451bfbc86db3bd86aa4ed5d SHA512 d43f5f66be3ae4e8370019b2f839fc3dfd18f326e07c18202d015c6852b2fd77b88677cc7edc8c3fc6b02715c0eed34340a1f344142090c40a6c6d7ebee2b343 WHIRLPOOL 4565a425425b44a3ce0200f5af453f3b95691c66d5466f2be5eafe2a6c25b9649a6dd226c16d4e216d97161de3de4040b79c95ac91b0272acbea371a0fdcf138
 MISC metadata.xml 413 SHA256 fa3b6fb623b748e2cef10e71cc41cc52a5985b51652e02c8078fd0216b9c8b04 SHA512 481ece48d81086f348a3bdb024365b5364ad9cc1fe3368305c9f0a8ee994815728a9c5639d67d530a29c755109c7ed951b6d0cac023be065fef4ba08710559a3 WHIRLPOOL c83403da9dbf754116ac1a1116b18dd6a2d7843323002b5a9a72c88fc295e45b510d8f8b24776057a0f65a55861606b6404df98df667624aeead0b44e56e01e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlKkyvwACgkQCaWpQKGI+9SoWACXSUx0YvSmXg7/JsLFdP+B+Ey2
-kgCfdjF1QgjjVDRA2MwRJlLln7wHhxQ=
-=GRfS
+iEYEAREIAAYFAlK5xxEACgkQCaWpQKGI+9TMjwCeJ1CGtNgr1e09Tur5J7ti+GSn
+7I4Anj84EnoEb3L84j0iyDt8YuHaMIHG
+=S6X+
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch
new file mode 100644
index 000000000000..c6d414c0ae97
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-kill-gsd-automagic.patch
@@ -0,0 +1,46 @@
+From cfefd62c7f23625fd1b07dacb35681bdf5aafa04 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Fri, 5 Apr 2013 12:42:06 +0200
+Subject: [PATCH 1/2] 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 cce9d62..d8f6198 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,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])
+ PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED])
+ 
+@@ -157,7 +156,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.8.3.2
+
diff --git a/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch
new file mode 100644
index 000000000000..f5ff3cec5359
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/files/gnome-disk-utility-3.10.0-raise-gsd-dependency.patch
@@ -0,0 +1,35 @@
+From f05af64dd29a5119f36d0c34f0d6aa9f04567933 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Fri, 5 Apr 2013 12:30:55 +0200
+Subject: [PATCH 2/2] 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 d8f6198..2604798 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -109,7 +109,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
+ LIBLZMA_REQUIRED=5.0.5
+ 
+-- 
+1.8.3.2
+
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r301.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r301.ebuild
deleted file mode 100644
index cb8be399527d..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r301.ebuild
+++ /dev/null
@@ -1,64 +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-r301.ebuild,v 1.2 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="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.91.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"
-
-	intltoolize --force --copy --automake || die
-	eautoreconf
-
-	gnome2_src_prepare
-}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
index 5f6b78863217..7b56439ab502 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.8.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild
@@ -1,32 +1,34 @@
 # Copyright 1999-2013 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.8.0.ebuild,v 1.2 2013/04/02 20:58:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gnome-disk-utility/gnome-disk-utility-3.10.0.ebuild,v 1.1 2013/12/24 17:40:32 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+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"
-KEYWORDS="~amd64 ~x86"
+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.0: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 )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=media-libs/libdvdread-4.2.0
-	>=media-libs/libcanberra-0.1
-	>=x11-libs/libnotify-0.7
+	>=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 )
@@ -37,10 +39,17 @@ DEPEND="${COMMON_DEPEND}
 	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() {
-	# TODO: add systemd
 	gnome2_src_configure \
 		$(use_enable gnome gsd-plugin) \
-		--disable-libsystemd-login
-
+		$(use_enable systemd libsystemd-login)
 }
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.1.ebuild
deleted file mode 100644
index a399353c8402..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.4.1.ebuild
+++ /dev/null
@@ -1,30 +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.4.1.ebuild,v 1.4 2012/06/15 06:40:33 mr_bones_ Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~x86"
-IUSE="fat"
-
-CDEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-1.90:2
-	>=x11-libs/gtk+-3.3.11:3
-"
-RDEPEND="${CDEPEND}
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	fat? ( sys-fs/dosfstools )"
-DEPEND="${CDEPEND}
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
deleted file mode 100644
index b6b733f69f2c..000000000000
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 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.6.1.ebuild,v 1.3 2013/07/17 19:12:48 maekke Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Disk Utility for GNOME using udisks"
-HOMEPAGE="http://git.gnome.org/browse/gnome-disk-utility"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="fat"
-KEYWORDS="~alpha ~amd64 ~arm ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	>=sys-fs/udisks-1.99.0:2
-	>=x11-libs/gtk+-3.5.8:3
-	>=app-crypt/libsecret-0.7
-	dev-libs/libpwquality
-"
-RDEPEND="${COMMON_DEPEND}
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	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
-}