Drop old (#508854)

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

71 files changed, 115 insertions, 4559 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 4cf21b07442f..62a5a6b85fa8 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.262 2014/10/11 12:00:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.263 2014/11/13 11:24:10 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-keyring-2.32.1-fix-undefined.patch,
+  -files/gnome-keyring-2.32.1-glib-2.32.patch, -gnome-keyring-2.32.1-r1.ebuild,
+  -gnome-keyring-3.10.1.ebuild, -gnome-keyring-3.12.0.ebuild,
+  -gnome-keyring-3.12.2.ebuild:
+  Drop old (#508854)
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> gnome-keyring-3.12.2-r1.ebuild:
   arm stable, bug #512012
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a1dd0f93b3d9..7dadb37fb106 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,23 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnome-keyring-2.32.1-fix-undefined.patch 783 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408 SHA512 2f60202c4b07c37cc59d19838344ac666371495b9230c8f6b3a3030e58364dbb9a012ee8eeb6d89ed1e8dbb9324340971259a5b75e7666563a402c88735dc916 WHIRLPOOL 7030408d34850a6ac827149b3aaf1dd1f7f80ea7fa9731e4c76b5c95fedfec2bad51797f428685cdc9232fa455f2d78c814d35c06b905b2126d9a7aa8c2661e2
-AUX gnome-keyring-2.32.1-glib-2.32.patch 1355 SHA256 042bf9bc95f8e37bf9733531cc4d38db5c33d382f15152afdd7288ea09145fee SHA512 5745e64d77ec48cb8fe5b76bfc902f97749ee125e0c6db6ee7aed87f996cbae92e3c835792e76e33f49386ac8a9a4ec3613212f6ff5f470d038f2abf737c4aa7 WHIRLPOOL 23c45dd081eebaf9da75d159c71c3addd40e6f15b88c167ae932c6d3e0c261296c5e9222a0ed8cdf47045e9e30dc9f27bf331cb0482b26acfd5d2ac3f0ca611a
-DIST gnome-keyring-2.32.1.tar.bz2 1619245 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9 SHA512 23b91bc11be2805df228de98513a5f96386a89d6ead6434b7fdf4a3bee86b6601bb994b9de4524f8751c7d7f1ac9462c592bcd9b77c32234fc709148450e382b WHIRLPOOL fa9ed1d79a8af912ca8c4957d6dba30322a0239dd2c9b40f5c6adbfc66147402870a6400ae8bbdb56380c250e095b601ab9689f65ea17c95a76e7e2defe27c7d
-DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 SHA512 ed37e64aed6963ee97894df58e380af2efa4995515891f36bce9aadeea29eef8b25d28d1b30adc0a3e912eb9ddf7662de92dc7b4962ed5aeaacaa7b60dd5b39b WHIRLPOOL 4e025fa3a3f9744ffb377e5dda40c3c194f3f4929805f530b59638d4750eb49f1975311b25b97b980d41305fa5062c11866924dd5d2bb711e9b0b03e64097c06
-DIST gnome-keyring-3.12.0.tar.xz 1162892 SHA256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f SHA512 2eeb19b9a9361dfae3627f2e292d7b23f298bc7c77b9c1bcd275baf2ff91ac002bf9897d3ef6d9ebe3e343f31be4813b00c014b2659b2f16748ba3b87ee57938 WHIRLPOOL 71e67ab2802bbe3ef32b6edebf9a075d265130510e21b05485ad3ff556bb2e3698962c95e32d34d2bf3768ed9b5f2af0ef8ad2e8c15c7209be7097efa314f6f6
 DIST gnome-keyring-3.12.2.tar.xz 1170560 SHA256 3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c SHA512 e8e095904e63f589cdc30818ecab7938e42750054880f1fc01dfbb39375ae56a4497158309717b726594e54ad2604eaeedd8a8ed73697b4c348185f32af17457 WHIRLPOOL cb5b0dcff8d5d5d1e7633f835f242cad2c1f4a383717dd75fdf5e5d9e22c8e0b4966a50e2cb34c5fff39d50a42a92b7647335263677dd277bbf9fbfeccb7ca16
-EBUILD gnome-keyring-2.32.1-r1.ebuild 2049 SHA256 0612aa59a77710f1e5438213184f40243e36edd831dd2e22454a236a6469367b SHA512 fa86ef0001d0083e5ca44a16ba53e747b0d9c969c386ba3e9cd98d6d3437dab73a2219318bd4c67511701074ed5e8d87f4a0805097890837cf1ea00a1a0293a7 WHIRLPOOL 3b035dc1317011d2611bd5d7fb9ecd89f49f8387a71c8138c3a9321f4fbf8a60de96c2605ef687ad1e1360194b3c362228560259742350557a3b59bc72f11314
-EBUILD gnome-keyring-3.10.1.ebuild 2326 SHA256 6a5cd2e398b21512a1b62cf6c2fd90630029dfd8642402892df1c73a3767419b SHA512 d689ac9bdf76115083c2a3cad528a728b26070b3b1064df918c91d324bb61bc3d8ba7066457b5ec06105cafc87ed19d713fbf297ffd717ce4d108c280dda7ca1 WHIRLPOOL 41ed2174b3871cdb8bd860ccefa43f7df4670cdb775614d1cefdc5d020033cfab6b7486ae135efb8d19172bdb521f3fae71b2990946c009392111bf28939eaf9
-EBUILD gnome-keyring-3.12.0.ebuild 2395 SHA256 857362cd0e360726dea4aa5bdbfbf2e8db72f17f968da4234c091a16b8f0bbaa SHA512 741adbd705609688941f761801029c91efc136b3d9fba95bd99018122f5bf576cf2eb5bad24d294f14b2cc202482cd3682027ba63a1b2a6f373a20bcfa862fc2 WHIRLPOOL a1b05922c7c5ff318e666f027239ed45f512f0061e0a06c749241f0d7952998f9c7c3c98311de525bee62445be2b8800b91d60ba66fd39e16991ed2a1d6775e6
 EBUILD gnome-keyring-3.12.2-r1.ebuild 2517 SHA256 c955bb9aa4b62e56171ffb14847fd677ec1ea8b12795c1166da9b0311a4a0263 SHA512 0b6bdd7c457976eb15b85e37be85503b344e4b8863d050499396a9d9c1713e87715940836c1c9d93af03f4040b280bd3dc5ff276e7d1ae184e65774efea12078 WHIRLPOOL 1032e3ba62da5284ac0f2ecdfcef230605b82acf014a0ff4fe390c220f66ccba323c317b5d4a0440a7637fb9b9f67659e539e1111455f1e5d3c850d86087a5b0
-EBUILD gnome-keyring-3.12.2.ebuild 2373 SHA256 20b25a79f487c80a0db1da135da88c6030f08c45b15a4491ec88e605e69f4906 SHA512 0fd4307de5c9a926fc06d8618e91bef3d1b7b3cd831626c9cf11a7f61d65a02b59d3af0614f6ba1e0de2a8fcc759cce24721c707a37fcb1816c35f62db42c8d7 WHIRLPOOL 648e77e23fc5adc8cfd2b71399cf0630faf9e87aa13c0ae3de27601afaa8dc885ce6c1a04ca7248465a52a899c85b73a8c33245bc4476ff893dc3f3ad836bf75
-MISC ChangeLog 38458 SHA256 b4066af778027a0871dfc4b5e18d94370c308e14b7c91a48c67a9c64c46d33b7 SHA512 9ceabaa6e37330798a046cf4143f06242335ae3b0170d64e927fc959532cfee7f3494a28a8d682bd31f66e4db6462e88ab9f8f87fad4ad0cc33b219a59e904c6 WHIRLPOOL 087062444b5a677cb6a55f291a99b84fc14c6b5c9403500d22fe8c14a5604f01ab50f46890dacd2d46f0f9a566cfd94528097feea03edb6c821f5dc94b9a075f
+MISC ChangeLog 38750 SHA256 e626923561a828a91e69c128f352a7103522c2348fc4a6131ff50910a3c6b925 SHA512 56137e3b0506b080919f9073f822c88758cee2c684cfc31cdc900c925b0176a07123fb2a6508619f11fd2b6ed9a764c6d609ec544b99fb8fca7c53b6650bc091 WHIRLPOOL 3e05cc7db94dcdafc2fed9fd9824d63dc995815291017feb6ecf4010a9f59f0fbc793300516bf6630c9dcf4f3f8aedd21b128b40257983c20e8e8d5802f6f320
 MISC metadata.xml 789 SHA256 77bcb7e0dbc7721e5491732fb92fba7473e9ae9b17725842270c75fe12124e5c SHA512 802568250f4e486d06a5b724deee4bc1aeab25348d58df62a37ab82f61c56ef47d69fdd853bf7ad4fcd9ce4cd8cbf174c86c1f1f6f96dc145fa40a5aaf22d299 WHIRLPOOL 6af3afe8de8b38ff7ff6a14a0fad9bc89ba498164c112a1adcbdc721d41d7e2651ddaf94de11a072eed951255f55866f8d74c813cde0f2a0db18fb7e44f945a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5G9UACgkQkKaRLQcq0GLJpwCeO+GzEowOOZKLWSGsvLRrgr2D
-C/cAoK8A1pMEF+9ZozcRyMW5SMxtCP4J
-=hmbg
+iEYEAREIAAYFAlRklNsACgkQCaWpQKGI+9T+gACdGHPz50NsAg8ZLQGGZyYbIxLV
+VkYAn10mHN4BQfxeOuy1Edm5BMfZb9F/
+=tdvb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch
deleted file mode 100644
index 28103ba5d594..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-fix-undefined.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4050d583e8fe6c5c4bb71f0fd4ba6498cdf5a1b6 Mon Sep 17 00:00:00 2001
-From: Ryan Stonecipher <Ryan.Stonecipher.Fisher@gmail.com>
-Date: Mon, 24 Jan 2011 20:42:02 +0000
-Subject: Fix undefined type in egg-asn1x.c
-
-Mac OSX doesn't have a ulong type
-
-https://bugzilla.gnome.org/show_bug.cgi?id=640362
----
-diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
-index 122cedf..10bd92c 100644
---- a/egg/egg-asn1x.c
-+++ b/egg/egg-asn1x.c
-@@ -2064,8 +2064,8 @@ anode_write_integer_ulong (gulong value, guchar *data, gsize *n_data)
- 	guchar buf[sizeof (gulong)];
- 	gint bytes, i, off;
- 
--	for (i = 0; i < sizeof (ulong); ++i) {
--		off = sizeof (ulong) - (i + 1);
-+	for (i = 0; i < sizeof (gulong); ++i) {
-+		off = sizeof (gulong) - (i + 1);
- 		buf[i] = (value >> (off * 8)) & 0xFF;
- 	}
- 
---
-cgit v0.9
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch
deleted file mode 100644
index ab63d5fa3d3a..000000000000
--- a/gnome-base/gnome-keyring/files/gnome-keyring-2.32.1-glib-2.32.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 002a073fe2b403ae7d006372e690743b664236d3 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 24 Oct 2012 02:52:28 -0400
-Subject: [PATCH] Explicitly link to gmodule
-
-Fixes build failure with glib-2.32 and gold.
----
- configure.in     | 4 ++++
- gp11/Makefile.am | 4 +++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index f781384..cdf9a2e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -70,6 +70,10 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0)
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
-+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
-+AC_SUBST(GMODULE_CFLAGS)
-+AC_SUBST(GMODULE_LIBS)
-+
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.8.0)
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
-diff --git a/gp11/Makefile.am b/gp11/Makefile.am
-index 18942bd..5a90404 100644
---- a/gp11/Makefile.am
-+++ b/gp11/Makefile.am
-@@ -8,6 +8,7 @@ INCLUDES = \
-     	-I$(top_srcdir) \
-     	$(GOBJECT_CFLAGS) \
- 	$(GTHREAD_CFLAGS) \
-+	$(GMODULE_CFLAGS) \
- 	$(GLIB_CFLAGS)
- 
- BUILT_SOURCES = \
-@@ -34,6 +35,7 @@ libgp11_la_LIBADD = \
- 	$(GOBJECT_LIBS) \
- 	$(GTHREAD_LIBS) \
- 	$(GIO_LIBS) \
-+	$(GMODULE_LIBS) \
- 	$(GLIB_LIBS)
- 
- gp11-marshal.h: gp11-marshal.list $(GLIB_GENMARSHAL)
-@@ -64,4 +66,4 @@ endif
- 
- SUBDIRS = . \
- 	$(TESTS_DIR)
--	
-\ No newline at end of file
-+	
--- 
-1.7.12.4
-
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
deleted file mode 100644
index 8565e60cb83e..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1-r1.ebuild,v 1.11 2014/03/01 22:29:51 mgorny Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2 multilib pam virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="debug pam test"
-# USE=valgrind is probably not a good idea for the tree
-
-RDEPEND=">=dev-libs/glib-2.25:2
-	>=x11-libs/gtk+-2.20:2
-	gnome-base/gconf:2
-	>=sys-apps/dbus-1.0
-	pam? ( virtual/pam )
-	>=dev-libs/libgcrypt-1.2.2:0
-	>=dev-libs/libtasn1-1"
-#	valgrind? ( dev-util/valgrind )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-PDEPEND="gnome-base/libgnome-keyring"
-
-# tests fail in several ways, they should be fixed in the next cycle (bug #340283),
-# revisit then.
-RESTRICT="test"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=${EPREFIX}/usr/share/ca-certificates/
-		--enable-acl-prompts
-		--enable-ssh-agent
-		--enable-gpg-agent
-		--with-gtk=2.0"
-#		$(use_enable valgrind)
-
-	epatch "${FILESDIR}/${P}-glib-2.32.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
-	# Fix undefined type in egg-asn1x.c
-	epatch "${FILESDIR}/${PN}-2.32.1-fix-undefined.patch"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "emake check failed!"
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
deleted file mode 100644
index d57fa58e5028..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.13 2014/06/23 04:06:56 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-
-inherit fcaps gnome2 pam versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.32.0:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e '/g_test_add.*test_remove_file_abort/d' \
-		-e '/g_test_add.*test_write_file/d' \
-		-e '/g_test_add.*write_large_file/,+2 c\ {}; \ ' \
-		-e '/g_test_add.*test_write_file_abort_.*/d' \
-		-e '/g_test_add.*test_unique_file_conflict.*/d' \
-		-i pkcs11/gkm/tests/test-transaction.c || die
-	sed -e '/g_test_add.*test_create_assertion_complete_on_token/d' \
-		-i pkcs11/xdg-store/tests/test-xdg-trust.c || die
-	sed -e '/g_test_add.*gnome2-store.import.pkcs12/,+1 d' \
-		-i pkcs11/gnome2-store/tests/test-import.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		--enable-doc \
-		--enable-ssh-agent \
-		--enable-gpg-agent
-}
-
-src_test() {
-	 # FIXME: this should be handled at eclass level
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-
-	 unset DBUS_SESSION_BUS_ADDRESS
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
-}
-
-pkg_postinst() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
deleted file mode 100644
index 9232fe2d4fe6..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v 1.2 2014/06/23 04:06:56 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
-	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-timer.c || die
-	# For some reason all pam tests make the testsuite retun 77
-	# which is considered an error but the test framework,
-	# but all tests are successful
-	# FIXME: this is only for overlay, report upstream, make a patch !!!
-	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		--enable-doc \
-		--enable-ssh-agent \
-		--enable-gpg-agent
-}
-
-src_test() {
-	 # FIXME: this should be handled at eclass level
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-
-	 unset DBUS_SESSION_BUS_ADDRESS
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
-}
-
-pkg_postinst() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild
deleted file mode 100644
index 96e3d30b8200..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.3 2014/06/23 04:06:56 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes" # Not gnome macro but similar
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps debug pam selinux +ssh-agent"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=sys-apps/dbus-1.1.1
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	# FIXME: some tests write to /tmp (instead of TMPDIR)
-	# Disable failing tests
-	sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
-	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
-		-i "${S}"/pkcs11/gkm/test-timer.c || die
-	# For some reason all pam tests make the testsuite retun 77
-	# which is considered an error but the test framework,
-	# but all tests are successful, upstream bug #731030
-	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc \
-		--enable-gpg-agent
-}
-
-src_test() {
-	 # FIXME: this should be handled at eclass level
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-
-	 unset DBUS_SESSION_BUS_ADDRESS
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
-}
-
-pkg_postinst() {
-	fcaps cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index 0415af176119..8af417f7b34c 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-light
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.180 2014/07/23 15:16:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.181 2014/11/13 11:25:21 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -gnome-light-2.32.1-r2.ebuild,
+  -gnome-light-3.10.0.ebuild, metadata.xml:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-light-3.12.0.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
index 5d65d0960af7..a3b0ee04cc0d 100644
--- a/gnome-base/gnome-light/Manifest
+++ b/gnome-base/gnome-light/Manifest
@@ -1,25 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD gnome-light-2.32.1-r2.ebuild 2651 SHA256 60a3f708146b1055923966636c47c2db05e597e15f33732367fb993ece7a7133 SHA512 008acfacbc8a4e4682a4cfd7429b3b449a5335e90297abb8a5f5d23b31429dd9560d92eb2fa3d29a6080379b707f0207c3e3385b338911c6dde727d787f42ef3 WHIRLPOOL 2841ca88226dccb66215888ce0d5851680918f1fec090da065db6f717480644fb6c0f6b355eab77057aa675d4835a9815a4e138c7e014592fb1d27ee82274a57
-EBUILD gnome-light-3.10.0.ebuild 1602 SHA256 6a78b7617a874b074d073728cc09e57018d4061ae5e8fc15a149b6491d6b0746 SHA512 f01c3aa925a1d91d5be68564977ff93b0595d3db67af3819fa498d2f07f06a045e14a225557b392c708335735c9f780f1abf33920024e1b62773a64501e52275 WHIRLPOOL e7b6bac50a8222f375faf0b20ddaef315f4d4a32acf19946dceb303033f60eb72ca09dbfa725c26dcaefd2467b843e51abf9c593c788e3f32564932dbdd1b9f5
 EBUILD gnome-light-3.12.0.ebuild 1601 SHA256 ae9e80bdf2d4698018e3fc4f9ce89e2c9ba04055904e5805d7e020dedeb9c79b SHA512 81219f87ff16405b2ebce7a61d3cb9d7d0c67ae76a88c802c02225c281ca61c48cd10197266a60eb91c9a813b0daf02af6d3fad37aa12bde9986e9fb4d35f9ae WHIRLPOOL 2145e3c0ad60d74ecf6bbf1b9f800e013256aa222ed15325076317f1f788fbcdce2cc122379bdc8c801dc3879188077e68ee538b3912728afaaa1e9a8b2193a8
-MISC ChangeLog 23878 SHA256 fd182ae24195a8f0ed3404910ed890ee4fa3f697263f65b3a5bccb059e49ff66 SHA512 1759e0043edc250cd63ebd6919d866f96543620b722398e78b13cd6f925e60a40867ba3fef92ab62fb337b756bb24a0b6dbfbe129340e389f7e2d26ff79774d7 WHIRLPOOL b0d404c32b78e9c18969f898062c47a6826da4c64c52e37b00b783033660bac03343ff94f36a019e50fcecac9b08f3f1dc1f83a3a06c441dc65947e9c949c483
-MISC metadata.xml 423 SHA256 bf89dbc2920323de237190f96bb180b532f16a35c786ec654c787f166ac29efb SHA512 8e42c2bf00f7e0a271d347c405f35d2dbb0c6b4f710f77589f5230ab075d8843f2475af514e7765ce5cc0bd563aad31ad9359c339728b13d6180c7d049b66b39 WHIRLPOOL 4b947360cd772ede604fd2781b40f1b5fe0a3597dfacaad7d16d73082aff65991d5d4342b5e65a10d2f1bca2e9d31442734ebc4e2406e110bb4d5a234c24df7a
+MISC ChangeLog 24023 SHA256 930044d4acb54049dadd445e402e678e43e8910f886fbb05b1980daa61b8acd2 SHA512 2a01c9a2c5d40acf1abb5007185b4e7671c50ba8c2810e950bc337ded1dbc1c291ac71246ff5a9329e6eda1faaf25f1072a71fdb0c1c902521103f43fe78a174 WHIRLPOOL e7604e673d560a8504de05afa8f636505fc7c2339c405d1b001df5e6460f246a32af6f40834ac48e161c6a9887566f7741018a9dfc7096f92b31f98bbc045b63
+MISC metadata.xml 315 SHA256 c5d74e1807042e28df733a852c79fb5b2966922e409b7c82071cd4e7aa6f2c93 SHA512 63316a98a1bf1f4cfa87c9fa1cbd9c10e8731a4e9f45d04a0fa171776baab8207c5fef57fd4fcdb168d599564e966808d89eff89bbfaf245f3dd766423df6635 WHIRLPOOL a3f45190ea36232174d4051c6b154e5bb4458998768a28585c092b9247ad09db63920f364c4bb3d739d06604a5c941772b02604404a418a1e1c9f4ca9719e0a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9HsAAoJELp701BxlEWf2dcQAJdG4Tw1H7ZClKW+qmN1/EvS
-mnC/31tDK1IHcZZRt+nSnP6CLvIN52JJ4lv+k9QPzS+lOutducmJURzLiwLYhycH
-eztTzkvfXnTAUvoE2pfepuXrj5hPu1NUb0oSazHjiFiZDe8qFk1xdJPEvZivflNN
-lMWvLiiYzHuMAVLf61NyVUtZwwRjsJhlWneHRAXnQR4mqyTsIEuH8hjd1ZbGsg9q
-MPTFTGIlkDX4XQ8geBWc5Aoh1hfqTfSOGdEvZh0h7EunZ1DhGV9CTglSScRMfEh8
-oK2i3DqZpj/hpCEziMQsZ5ZSU/6Lt0BsxObYDDvn6it6sVHyLLOOYhwQ8/DuNoVY
-fHGcoJiwzLIMu8p/XpGnKfGNBgznc5fetov+aNalNjopP8sfeM2KUGSDoQefXdbj
-NLwQ8rdOZ+FUuDKWzI+AMJlXyWuwLil5U3KitDpGOQ5g0HzvFDzu5tBs4LrkNQoX
-FqYYVEB2wwW6XII7jJITAsDlkbSct48+Le6yhBgmKBMn3jt8N5uUIUx1U8Gftcw8
-uDoUrJ5wJxRI0/ZCAdf+bjN1D6/wPoBOHs1tsepO7584Nhs9Nx6GfBvAM2fiFvyl
-V9yRG3GmLb3KuS6OqK5REACK3uV90WZBUVqm1YG8hqT2qHjXe4WsEcRxBovVilt/
-RZlbqaVMJ1gBgtMEWtR7
-=6qiz
+iEUEAREIAAYFAlRklSIACgkQCaWpQKGI+9S5egCfYDL46DRkAjOFtSBeCUwI7DZm
+CDIAmPHm13Xg/9ApFsYIW/EenXfuBLg=
+=rTwI
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild b/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
deleted file mode 100644
index e5b7e61d7874..000000000000
--- a/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.32.1-r2.ebuild,v 1.10 2012/11/05 21:38:52 ulm Exp $
-
-EAPI="4"
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="+automount"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-#  Note to developers:
-#  This is a wrapper for the 'light' Gnome2 desktop,
-#  This should only consist of the bare minimum of libs/apps needed
-#  It is basicly the gnome-base/gnome without all extra apps
-
-#  This is currently in it's test phase, if you feel like some dep
-#  should be added or removed from this pack file a bug to
-#  gnome@gentoo.org on bugs.gentoo.org
-
-#	>=media-gfx/eog-2.30.2
-
-RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
-	!gnome-base/gnome
-
-	>=dev-libs/glib-2.26.1:2
-	>=x11-libs/gtk+-2.22.1-r1:2
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=dev-libs/atk-1.32.0
-	>=x11-libs/pango-1.28.3
-
-	>=gnome-base/orbit-2.14.19:2
-
-	>=x11-libs/libwnck-2.30.6:1
-	>=x11-wm/metacity-2.30.3
-
-	>=gnome-base/gconf-2.32.0-r1:2
-	>=gnome-base/dconf-0.5.1-r2
-
-	>=gnome-base/libbonobo-2.24.3
-	>=gnome-base/libbonoboui-2.24.4
-	>=gnome-base/libgnome-2.32.0
-	>=gnome-base/libgnomecanvas-2.30.2
-	>=gnome-base/libglade-2.6.4:2.0
-
-	>=gnome-base/gnome-settings-daemon-2.32.1
-	>=gnome-base/gnome-control-center-2.32.0
-
-	>=gnome-base/nautilus-2.32.1
-
-	>=gnome-base/gnome-desktop-2.32.1:2
-	>=gnome-base/gnome-session-2.32.1
-	>=gnome-base/gnome-panel-2.32.1
-
-	>=x11-themes/gnome-icon-theme-2.31.0
-	>=x11-themes/gnome-themes-2.32.1-r1
-	>=x11-themes/gnome-themes-standard-3.0.2
-
-	>=x11-terms/gnome-terminal-2.32.1
-
-	>=gnome-base/librsvg-2.32.1:2
-
-	>=gnome-extra/yelp-2.30.2"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.6.6
-	automount? ( || ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] ) )"
-
-pkg_postinst () {
-# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
-# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
-# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
-#	elog "Note that to change windowmanager to metacity do: "
-#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-#	elog "of course this works for all other window managers as well"
-#	elog
-
-	elog
-	elog "Use gnome-base/gnome for the full GNOME Desktop"
-	elog "as released by the GNOME team."
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.10.0.ebuild b/gnome-base/gnome-light/gnome-light-3.10.0.ebuild
deleted file mode 100644
index 0b85c5f30c3f..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.10.0.ebuild,v 1.3 2014/03/09 11:58:38 pacho Exp $
-
-EAPI="5"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-${PV}:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	>=x11-themes/gnome-icon-theme-${PV}
-	>=x11-themes/gnome-icon-theme-symbolic-${PV}
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	>=x11-terms/gnome-terminal-${PV}
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.18.0"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
index 917c1a91fe39..bda1c5424569 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="automount">Use <pkg>gnome-base/gvfs[gdu]</pkg> for automounting
-		of drives in nautilus</flag>
 	<flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
 		<pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag>
 </use>
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index ab48b2896b6b..e679d9bae7ad 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.213 2014/10/11 12:00:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.214 2014/11/13 11:27:41 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/10-xdg-menu-gnome,
+  -files/10-xdg-menu-gnome-r1,
+  -files/gnome-menus-2.18.3-ignore_kde_standalone.patch,
+  -files/gnome-menus-3.0.0-ignore_kde_standalone.patch,
+  -files/gnome-menus-3.0.1-applications-merged.patch,
+  -files/gnome-menus-3.0.2-library-only.patch,
+  -files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch,
+  -files/gnome-menus-3.8.0-gnome-calculator.patch,
+  -gnome-menus-2.30.5-r1.ebuild, -gnome-menus-3.0.1-r2.ebuild,
+  -gnome-menus-3.10.1.ebuild:
+  Drop old (#508854)
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> gnome-menus-3.10.1-r1.ebuild:
   arm stable, bug #512012
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 8a41caa71f40..cba8f2890e9a 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,29 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10-xdg-menu-gnome 115 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b SHA512 b975bd56983597569b06eaefb356bcdbe85414e21b17f1f5349c7cdfc5f30c9385a92230aa00a369c79a4156ed34256132e96463c308e82300e414df1df8c586 WHIRLPOOL 7eedbb2b33960516115dee8d42a7ebbdcac1d81e1a3ec28f6900f1e063f75039871fbee87bdcd02a6887c269c4366b726819fc91bc9e919bf6f977c22f98e9bd
-AUX 10-xdg-menu-gnome-r1 159 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378 SHA512 144cdcf8210e0225fd39c4ea48960e2400b2b23aaa83e385965e229ae30c1ee0ebc750c693ad1ad8599ecd60f38354b8752a08ba7ed04ceaba670c1416648f58 WHIRLPOOL 8de8a1a1332bfe554e079306ca9896c7833a0e58a3dd76cb8feb851a61dabdc0872d93d3c8b7413f1d4d0173497bcc82c7dc82fcb05f5d7ad9c87a819ade16ad
-AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8 SHA512 0544bface504a9431ca8343be035f567146f05478a0ee9ea33ff4a74efe176962f735f15d08e5559585d654729e75fd3a5f92ae3a98900a8e7466d5ad1580bcc WHIRLPOOL 1ef2214533e6a108e026ec91e493cf3de009f1bfae38e8711068160b7f817f60f276c9548207b95ee6295cb8b6b64d5ab4fbd78b772939954db5355690d05711
-AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe SHA512 3880e4d288c77bba24be30e5cf7f3297458c9fdc5125b7d1837f7ceb1eec95cf6d3475b94f14c8ae476ad77740cf6300a6e84132d382fbf4620faf01eb51dcd5 WHIRLPOOL 0b68c591c02fd9ec34376fb170ea14a11d2a35bf2527d31d64925886fb07d35598a0d4ab6e4fefe02bfdaf33c7cbb6725126b8eb08eba80ce8ed4a50f0cdeb94
-AUX gnome-menus-3.0.1-applications-merged.patch 3376 SHA256 a42786fa1b3631c649a58c3680ecb102ba450e5bb165cbb11a5d5f27b7e82ca1 SHA512 ca7c17ff68412195d52b7d82351f319403a1d02f0a4a93388bac4034bc0f93ba09fd4d30515d0b05f089a8fd2ea2df3d10ecf51ce340092ec5389d5b1f048444 WHIRLPOOL f157f2e8c78dd3351dee360854e3139927aa274019b0d695242aa54bd353f5ed68a2833db4309a682ad2eea9b0373c50850523d6399e392e0509eb9fdce3adac
-AUX gnome-menus-3.0.2-library-only.patch 641 SHA256 ec729f28aafceeb1a8b61142ce511190ab762bf432356aa7bddf814ee1b556e9 SHA512 2133d3c638f0a7cfddbba17e726c7dc647e469ec716331de95be36c017c3aec86af3d47246836da58743e181fc0d32c869ac80e24a73403970a0d6e16406e1f9 WHIRLPOOL cd5c8694ab3c5f6ec10f573ff22af244185722be86482f45f1182223e4914182fd5143e0f27b0b33abd9e3610ca617f17d90ce6334b77c81d7c36f0f73af177d
-AUX gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch 11274 SHA256 19d50cd2fbe318fe0e83d487fc635360cd2eeffeca53da8fbc8ae49e19b6cba1 SHA512 55cd1b3b20ba0c853f58f29749b148faeadffb390eccd7aab56cabf132a45908969e77594071587510e68bb94465dacc10eb192e16fd8a69c10348a7fc46baca WHIRLPOOL c671580b5fa58e36798fe5d003a736be1b8bf6c7651c553904e871f2af4696add80a5a82f426ea64882ff34ef23fbb5bc259de0d5d8bd7a33119f709a90535cb
-AUX gnome-menus-3.8.0-gnome-calculator.patch 1765 SHA256 fa6134f15df7add10fc25fcf28b0cde9f3a8133e7bdfe3634a2bd9d404af6e62 SHA512 bcc36c9b44ffd7991f2dbc8b779d80c33dba0ec07ab6cc22084a6a1ebd555b2837017feeb0514c30ea2edb34858a2ef382c8f4fba4e3f0047dabeeb9ffaf3782 WHIRLPOOL dc18c21e1a6efd5158d65722b13c376f01734f632295d8da53059084c8442a98e0e2f9633dc34f775609f99602c6771a2ae4723436c94b822ed9f7c483446d81
 AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 SHA256 5b27f8f02786db7383287bb233cc990934524e152778802e4c815307424e5d48 SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 WHIRLPOOL 5661aa027bcad2e380ca46f94143b043f43adc3ebe6ddcd9d21d951b3ab2a7d28167aa9faca183dd39d707428514b09fbe736dc0fa8bf72972230da5ab83f84e
-DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf
-DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
 DIST gnome-menus-3.10.1-patches.tar.xz 5708 SHA256 fd97cd902aac72ca8aa783c65ae1664842bcf2227262848662e93e1c44e9f6ac SHA512 bfdca2ba70525b71059262d4d19a2567c3d74c7f255ff823e5c24e631b764ab05be954ec16630729220a22f2425f8d2a8ecb1b22641346f53d5af9d9f90feebc WHIRLPOOL 01942eb7cf017ffa42d1c4189320ec7be9a8e25127074151b0a929b22f8d66b43a257f7c96506cdcf28aee35ffdf009f4f20f30ac38faa0aee59b99149618a8e
 DIST gnome-menus-3.10.1.tar.xz 423052 SHA256 46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71 SHA512 e6f0fe223e60f6c33a2ed2cd958035e5560d4063fbe7485263c4ad0eba82e18948d19f7dbe84dd0db5c339e94366759a0f98da533e2798c3ed9cc9a87f73c7e0 WHIRLPOOL f4d4266c7d3d06a4551b3a4aaa987c5e3d8ecf867afa5ea6c7c41de4675d4973e2a87dd80a604acfbcc29f14c0f1e70156faa93d13429f33218bf5e790eee1d0
-EBUILD gnome-menus-2.30.5-r1.ebuild 2668 SHA256 5e2b7b9552469aca78c3dce9112d6b6867a922f84074814f224e8384f36671a4 SHA512 f98647ec8aadd2d28f523b215019c8f830cc419414ccee8f405b910019e2558c8c9c06a429d15e1eb838262b1cc501e1c6665bf9cfb8c64f26e8ed8798e26f37 WHIRLPOOL 9cfc8809793240e53e76c59085399b3517dcb42f91a7a9797e15381912838516ab89a140d27fc042c5a34ce8ccc472dd21942ef6777d26e91746e206de66fa0e
-EBUILD gnome-menus-3.0.1-r2.ebuild 2200 SHA256 f08a93f384a07140e4a6ef53ddeb8d1775ce25e831597c4443a5e09664fd4ff7 SHA512 f9c88333af33430b2185a0b5927d9b0ba7678b5c7cc073e30c952d1433954b278838e8773ffe6be4b7b47408e5780c1575809fea509375ba0473396b98c64dde WHIRLPOOL 68120a9fc1af89333a790aba5a203a5122799c75a70e41f1e37de4fb35f4a53f16cc0e36a8d1c177ec0ce580ccfee6976f81be58a617d5390f9241e56d4d2ba6
 EBUILD gnome-menus-3.10.1-r1.ebuild 1655 SHA256 ffe3d87b9d25e31a043dce0e19e718def5ac1685cb312171a0db31361f0a1344 SHA512 b28d277b4c915fb7d652ad6592fe09e69ce7ffe4343f8bf957e6792bead86464e3732903a1262635e15cfe1808cfb97fbf3e2b36af489de29ec7390c63716cc1 WHIRLPOOL 805bd3868d83862a6b5b29582965ede291a86b8f3ff1a5c6b6ce1d9d5f5460c7c8969d533927debba0954ba1f3f94651f99f090e8abea6ac9f3a43fe5e30e978
-EBUILD gnome-menus-3.10.1.ebuild 1445 SHA256 de5abe983a0714e12b1d09d7df5acbd9e06c74aa459b8493d3ab37752279cc40 SHA512 244ea331a6015e669d6b2c2405986406bff78f7548d12192693f2fea2bbf8f674a574da070da6a692005db619cddfcf3d0111122a873b351336f0a700c8b287e WHIRLPOOL ac8cbbb61d8a8e0668475a32262b219d4cde696ac62a83ccb729fa71f154569b070ff3adfd4879d33e91cf0026f54e9ca0cbb088c8132aae01aef71374b7a071
-MISC ChangeLog 31083 SHA256 76b45f3dba25d4506ab53ec83c0c02f4282daede17de3b4c02ff58e4efe682d8 SHA512 fa082ebcbd138958f7c7b1ccc32ca669688507c3e3848677a1384a81ec2557babd035d530b2810f3e859e44ec3ed8266f37d7f4ad80523573048577eb5b68daf WHIRLPOOL fce113e21a0c3429dd6738ff2e29989aac73f4916917a64c0adca1959f16e03ae976e7b16c9cabc77a73c6b3b1d0c5b3c586eccdff3c4b12a0249cb0dbb53f45
+MISC ChangeLog 31637 SHA256 151e559d8165c79f5ef763e94f768d6e96fd58c95dc374a67e1997f4a17799fd SHA512 bfa29e4cc6a1c9d3f31a53532a4caf4f002b53df20f687e0ffcd458bcc5ccdd28964e5f65f898200d2544bff106d4cd0bb71a9bc4f57ccec99920d1e071634a1 WHIRLPOOL ac8a0e332db21d05f4e0524382d49925d64dda755efa079265d74e0bbeefb368eb84d4e5274ed07263fb8d33f6c91d7942c2b4e49c9f0f644833f17304a8d48c
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5G/YACgkQkKaRLQcq0GJ0JwCeK2A7tjm67uO5J6Hboue3XCTm
-tOgAn21I68Vl76mrv4D4YMisByFrMZe0
-=HrsP
+iEYEAREIAAYFAlRkla8ACgkQCaWpQKGI+9TyhgCfS0of1JicZ2QW498qpz+6IDiF
+SDkAn3x0o6S1+kfBtuopppYjgByeTBf2
+=XNRY
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome b/gnome-base/gnome-menus/files/10-xdg-menu-gnome
deleted file mode 100644
index b12a712eb45f..000000000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "gnome" ]
-then
-	export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1 b/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
deleted file mode 100644
index 4bbf86381083..000000000000
--- a/gnome-base/gnome-menus/files/10-xdg-menu-gnome-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && { [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "cinnamon" ]; }
-then
-	export XDG_MENU_PREFIX=gnome-
-fi
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch
deleted file mode 100644
index 895f5f2ca525..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Settings</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
-+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+        <Not><Category>X-KDE-settings-components</Category></Not>
-+        <Not><Category>X-KDE-settings-desktop</Category></Not>
-+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+        <Not><Category>X-KDE-settings-network</Category></Not>
-+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+        <Not><Category>X-KDE-settings-hardware</Category></Not>
-+        <Not><Category>X-KDE-settings-power</Category></Not>
-+        <Not><Category>X-KDE-settings-security</Category></Not>
-+        <Not><Category>X-KDE-settings-sound</Category></Not>
-+        <Not><Category>X-KDE-settings-system</Category></Not>
-+        <Not><Category>X-KDE-information</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
deleted file mode 100644
index 5f5f8b2703e6..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
-+++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
-@@ -146,6 +146,19 @@
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
-         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
-+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+        <Not><Category>X-KDE-settings-components</Category></Not>
-+        <Not><Category>X-KDE-settings-desktop</Category></Not>
-+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+        <Not><Category>X-KDE-settings-network</Category></Not>
-+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+        <Not><Category>X-KDE-settings-hardware</Category></Not>
-+        <Not><Category>X-KDE-settings-power</Category></Not>
-+        <Not><Category>X-KDE-settings-security</Category></Not>
-+        <Not><Category>X-KDE-settings-sound</Category></Not>
-+        <Not><Category>X-KDE-settings-system</Category></Not>
-+        <Not><Category>X-KDE-information</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
deleted file mode 100644
index f5255cc5466e..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.1-applications-merged.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 15baddac6c5343eaa103ecd27c625f5a415d24f3 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 24 Nov 2012 15:24:50 -0500
-Subject: [PATCH] libmenu: always call menu_layout_load() with
- non_prefixed_name parameter
-
-We must ensure that when loading "${XDG_MENU_PREFIX}applications.menu",
-the root layout node's name is set to "applications", not
-"${XDG_MENU_PREFIX}applications", because the menu spec states that the
-default merge directory for "${XDG_MENU_PREFIX}applications.menu" is
-"applications-merged", not "${XDG_MENU_PREFIX}applications-merged".
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688972
----
- libmenu/gmenu-tree.c | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
-index 0cb9645..a0d85d6 100644
---- a/libmenu/gmenu-tree.c
-+++ b/libmenu/gmenu-tree.c
-@@ -47,6 +47,7 @@ struct GMenuTree
-   guint         refcount;
- 
-   char *basename;
-+  char *non_prefixed_basename;
-   char *absolute_path;
-   char *canonical_path;
- 
-@@ -630,6 +631,24 @@ gmenu_tree_lookup (const char     *menu_file,
-   return retval;
- }
- 
-+static void
-+gmenu_tree_update_non_prefixed_basename (GMenuTree   *tree,
-+                                         const gchar *filename)
-+{
-+  gchar *s, *basename;
-+
-+  g_free (tree->non_prefixed_basename);
-+  tree->non_prefixed_basename = NULL;
-+  if (filename == NULL)
-+    return;
-+  s = g_strdup_printf ("%sapplications.menu", g_getenv ("XDG_MENU_PREFIX"));
-+  basename = g_path_get_basename (filename);
-+  if (!g_strcmp0 (basename, "applications.menu") || !g_strcmp0 (basename, s))
-+    tree->non_prefixed_basename = g_strdup ("applications.menu");
-+  g_free (s);
-+  g_free (basename);
-+}
-+
- static GMenuTree *
- gmenu_tree_new (GMenuTreeType   type,
- 		const char     *menu_file,
-@@ -650,11 +669,13 @@ gmenu_tree_new (GMenuTreeType   type,
-     {
-       g_assert (canonical == FALSE);
-       tree->basename = g_strdup (menu_file);
-+      gmenu_tree_update_non_prefixed_basename (tree, tree->basename);
-     }
-   else
-     {
-       tree->canonical     = canonical != FALSE;
-       tree->absolute_path = g_strdup (menu_file);
-+      gmenu_tree_update_non_prefixed_basename (tree, tree->absolute_path);
- 
-       if (tree->canonical)
- 	{
-@@ -709,6 +730,9 @@ gmenu_tree_unref (GMenuTree *tree)
-     g_free (tree->basename);
-   tree->basename = NULL;
- 
-+  g_free (tree->non_prefixed_basename);
-+  tree->non_prefixed_basename = NULL;
-+
-   if (tree->absolute_path != NULL)
-     g_free (tree->absolute_path);
-   tree->absolute_path = NULL;
-@@ -1768,7 +1792,7 @@ load_merge_file (GMenuTree      *tree,
- 
-   menu_verbose ("Merging file \"%s\"\n", canonical);
- 
--  to_merge = menu_layout_load (canonical, NULL, NULL);
-+  to_merge = menu_layout_load (canonical, tree->non_prefixed_basename, NULL);
-   if (to_merge == NULL)
-     {
-       menu_verbose ("No menu for file \"%s\" found when merging\n",
-@@ -2926,8 +2950,7 @@ gmenu_tree_load_layout (GMenuTree *tree)
- 
-   error = NULL;
-   tree->layout = menu_layout_load (tree->canonical_path,
--                                   tree->type == GMENU_TREE_BASENAME ?
--                                        tree->basename : NULL,
-+                                   tree->non_prefixed_basename,
-                                    &error);
-   if (tree->layout == NULL)
-     {
--- 
-1.8.0
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
deleted file mode 100644
index b55ed7edd9f2..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Thu, 18 Aug 2011 20:05:56 -0400
-Subject: [PATCH 2/2] Do not install anything other than the library
-
----
- Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 565ab87..65c059a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
--SUBDIRS = libmenu desktop-directories layout util po
-+SUBDIRS = libmenu util po
- 
- if HAVE_PYTHON
--SUBDIRS += python simple-editor
-+SUBDIRS += python
- endif
- 
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--- 
-1.7.6
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch
deleted file mode 100644
index 611415cb10f6..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-dont-use-OnlyUnallocated-for-sections.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-From 6e7790b5451bbb8a44b736ed402964d1bb432247 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagn@redhat.com>
-Date: Mon, 26 Aug 2013 15:59:18 +0200
-Subject: [PATCH] layout: don't use OnlyUnallocated for sections different than
- Other
-
-We used to have OnlyUnallocated on all non-folder sections, as
-a quick way to enforce the whitelist, but that broke the Other
-section.
-Instead, we need a whitelist in the two folders, and a blacklist
-in each category the application would normally be in (accessories
-or system tools usually).
-Ideally, apps in the Utilities category would expose the special
-X-GNOME-Utilities desktop category, which we now recognize, but
-the whitelist is kept to avoid patching all of them.
-For the sundry category, ideally it should not be there at all.
-
-In the process, a number of .desktop files were removed, as they're
-not provided by any packages (checked jhbuild and Fedora 19). They
-are:
-* caribou
-* fedora-im-chooser
-* fedora-abrt
-* gnome-orca
-* gnome-user-share-properties
-* ibus
-* ibus-daemon
-
-Distributions that are changing .desktop file names should take
-care of patching gnome-menus appropriately.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=706763
----
- layout/gnome-applications.menu | 137 ++++++++++++++++++++++++-----------------
- 1 file changed, 82 insertions(+), 55 deletions(-)
-
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 503f9ca..db56f71 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -21,44 +21,49 @@
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
--    <OnlyUnallocated/>
-     <Directory>Utility.directory</Directory>
-     <Include>
-       <And>
-         <Category>Utility</Category>
--       <!-- Accessibility spec must have either the Utility or Settings
--            category, and we display an accessibility submenu already for
--            the ones that do not have Settings, so don't display accessibility
--            applications here -->
-+	<!-- Accessibility spec must have either the Utility or Settings
-+             category, and we display an accessibility submenu already for
-+             the ones that do not have Settings, so don't display accessibility
-+             applications here -->
-         <Not><Category>Accessibility</Category></Not>
-         <Not><Category>System</Category></Not>
--
--        <!-- Also exclude everything we put in the X-GNOME-Utilities
--             whitelist -->
--        <Not><Filename>file-roller.desktop</Filename></Not>
--        <Not><Filename>gnome-file-roller.desktop</Filename></Not>
--        <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
--        <Not><Filename>gucharmap.desktop</Filename></Not>
--        <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gnome-font-viewer.desktop</Filename></Not>
--        <Not><Filename>seahorse.desktop</Filename></Not>
--        <Not><Filename>gnome-terminal.desktop</Filename></Not>
--        <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>
--        <Not><Filename>gnome-disks.desktop</Filename></Not>
--        <Not><Filename>gnome-screenshot.desktop</Filename></Not>
--        <Not><Filename>gnome-yelp.desktop</Filename></Not>
--        <Not><Filename>yelp.desktop</Filename></Not>
--        <Not><Filename>gnome-control-center.desktop</Filename></Not>
-+        <Not><Category>X-GNOME-Utilities</Category></Not>
-       </And>
-     </Include>
-+    <Exclude>
-+      <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
-+
-+           Please keep the list alphabetically sorted! -->
-+      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>eog.desktop</Filename>
-+      <Filename>evince.desktop</Filename>
-+      <Filename>file-roller.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-+      <Filename>gnome-control-center.desktop</Filename>
-+      <Filename>gnome-dictionary.desktop</Filename>
-+      <Filename>gnome-disks.desktop</Filename>
-+      <Filename>gnome-font-viewer.desktop</Filename>
-+      <Filename>gnome-screenshot.desktop</Filename>
-+      <Filename>gnome-terminal.desktop</Filename>
-+      <Filename>gnome-tweak-tool.desktop</Filename>
-+      <Filename>gucharmap.desktop</Filename>
-+      <Filename>seahorse.desktop</Filename>
-+      <Filename>vinagre.desktop</Filename>
-+      <Filename>yelp.desktop</Filename>
-+
-+      <!-- Exclude Sundry items -->
-+      <Filename>alacarte.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Accessories -->
-
-
-   <!-- Accessibility submenu -->
-   <Menu>
-     <Name>Universal Access</Name>
--    <OnlyUnallocated/>
-     <Directory>Utility-Accessibility.directory</Directory>
-     <Include>
-       <And>
-@@ -66,12 +71,16 @@
-         <Not><Category>Settings</Category></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Sundry exclusions -->
-+      <Filename>orca.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Accessibility -->
-
-   <!-- Development Tools -->
-   <Menu>
-     <Name>Development</Name>
--    <OnlyUnallocated/>
-     <Directory>Development.directory</Directory>
-     <Include>
-       <And>
-@@ -79,6 +88,15 @@
-       </And>
-       <Filename>emacs.desktop</Filename>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Sundry exclusions -->
-+      <Filename>jhbuild.desktop</Filename>
-+      <Filename>java-1.7.0-openjdk-jconsole.desktop</Filename>
-+      <Filename>java-1.7.0-openjdk-policytool.desktop</Filename>
-+      <Filename>log4j-chainsaw.desktop</Filename>
-+      <Filename>log4j-logfactor5.desktop</Filename>
-+    </Exclude>
-   </Menu> <!-- End Development Tools -->
-
-   <!-- Education -->
-@@ -106,7 +124,6 @@
-   <!-- Graphics -->
-   <Menu>
-     <Name>Graphics</Name>
--    <OnlyUnallocated/>
-     <Directory>Graphics.directory</Directory>
-     <Include>
-       <And>
-@@ -121,15 +138,21 @@
-   <!-- Internet -->
-   <Menu>
-     <Name>Internet</Name>
--    <OnlyUnallocated/>
-     <Directory>Network.directory</Directory>
-     <Include>
-       <And>
-         <Category>Network</Category>
- 	<Not><Category>X-GNOME-WebApplication</Category></Not>
--        <Not><Filename>vinagre.desktop</Filename></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Utilities exclusions -->
-+      <Filename>vinagre.desktop</Filename>
-+
-+      <!-- Sundry exclusions -->
-+      <Filename>javaws.desktop</Filename>
-+    </Exclude>
-   </Menu>   <!-- End Internet -->
-
-   <!-- Web Applications -->
-@@ -147,7 +170,6 @@
-   <!-- Multimedia -->
-   <Menu>
-     <Name>Multimedia</Name>
--    <OnlyUnallocated/>
-     <Directory>AudioVideo.directory</Directory>
-     <Include>
-       <And>
-@@ -159,7 +181,6 @@
-   <!-- Office -->
-   <Menu>
-     <Name>Office</Name>
--    <OnlyUnallocated/>
-     <Directory>Office.directory</Directory>
-     <Include>
-       <And>
-@@ -176,20 +197,14 @@
-     <Directory>X-GNOME-Sundry.directory</Directory>
-     <Include>
-       <Filename>alacarte.desktop</Filename>
--      <Filename>caribou.desktop</Filename>
-+      <Filename>authconfig.desktop</Filename>
-       <Filename>dconf-editor.desktop</Filename>
--      <Filename>fedora-im-chooser.desktop</Filename>
-       <Filename>fedora-release-notes.desktop</Filename>
-       <Filename>firewall-config.desktop</Filename>
-       <Filename>flash-player-properties.desktop</Filename>
-       <Filename>gconf-editor.desktop</Filename>
-       <Filename>gnome-abrt.desktop</Filename>
--      <Filename>fedora-abrt.desktop</Filename>
--      <Filename>gnome-orca.desktop</Filename>
-       <Filename>gnome-power-statistics.desktop</Filename>
--      <Filename>gnome-user-share-properties.desktop</Filename>
--      <Filename>ibus.desktop</Filename>
--      <Filename>ibus-daemon.desktop</Filename>
-       <Filename>ibus-setup-anthy.desktop</Filename>
-       <Filename>ibus-setup.desktop</Filename>
-       <Filename>ibus-setup-hangul.desktop</Filename>
-@@ -208,7 +223,6 @@
-       <Filename>nm-connection-editor.desktop</Filename>
-       <Filename>orca.desktop</Filename>
-       <Filename>setroubleshoot.desktop</Filename>
--      <Filename>authconfig.desktop</Filename>
-       <Filename>system-config-date.desktop</Filename>
-       <Filename>system-config-firewall.desktop</Filename>
-       <Filename>system-config-keyboard.desktop</Filename>
-@@ -222,17 +236,30 @@
-   <!-- System Tools-->
-   <Menu>
-     <Name>System</Name>
--    <OnlyUnallocated/>
-     <Directory>System-Tools.directory</Directory>
-     <Include>
-       <And>
-         <Category>System</Category>
-         <Not><Category>Settings</Category></Not>
--        <Not><Filename>baobab.desktop</Filename></Not>
--        <Not><Filename>gnome-system-log.desktop</Filename></Not>
--        <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
-+        <Not><Category>X-GNOME-Utilities</Category></Not>
-       </And>
-     </Include>
-+
-+    <Exclude>
-+      <!-- Utilities exclusions -->
-+      <Filename>baobab.desktop</Filename>
-+      <Filename>gnome-system-log.desktop</Filename>
-+      <Filename>gnome-system-monitor.desktop</Filename>
-+
-+      <!-- Sundry exclusions -->
-+      <Filename>dconf-editor.desktop</Filename>
-+      <Filename>fedora-release-notes.desktop</Filename>
-+      <Filename>gconf-editor.desktop</Filename>
-+      <Filename>gnome-abrt.desktop</Filename>
-+      <Filename>gnome-power-statistics.desktop</Filename>
-+      <Filename>dconf-editor.desktop</Filename>
-+      <Filename>setroubleshoot.desktop</Filename>
-+    </Exclude>
-   </Menu>   <!-- End System Tools -->
-
-   <!-- System Settings -->
-@@ -249,26 +276,26 @@
-     <Name>Utilities</Name>
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-+      <Category>X-GNOME-Utilities</Category>
-+      <Filename>baobab.desktop</Filename>
-+      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>eog.desktop</Filename>
-+      <Filename>evince.desktop</Filename>
-       <Filename>file-roller.desktop</Filename>
-       <Filename>gcalctool.desktop</Filename>
--      <Filename>gnome-font-viewer.desktop</Filename>
--      <Filename>gucharmap.desktop</Filename>
--      <Filename>seahorse.desktop</Filename>
--      <Filename>gnome-terminal.desktop</Filename>
--      <Filename>deja-dup-preferences.desktop</Filename>
-+      <Filename>gnome-control-center.desktop</Filename>
-       <Filename>gnome-dictionary.desktop</Filename>
--      <Filename>evince.desktop</Filename>
--      <Filename>eog.desktop</Filename>
--      <Filename>baobab.desktop</Filename>
-+      <Filename>gnome-disks.desktop</Filename>
-+      <Filename>gnome-font-viewer.desktop</Filename>
-+      <Filename>gnome-screenshot.desktop</Filename>
-       <Filename>gnome-system-log.desktop</Filename>
-       <Filename>gnome-system-monitor.desktop</Filename>
--      <Filename>vinagre.desktop</Filename>
-+      <Filename>gnome-terminal.desktop</Filename>
-       <Filename>gnome-tweak-tool.desktop</Filename>
--      <Filename>gnome-disks.desktop</Filename>
--      <Filename>gnome-screenshot.desktop</Filename>
--      <Filename>gnome-yelp.desktop</Filename>
-+      <Filename>gucharmap.desktop</Filename>
-+      <Filename>seahorse.desktop</Filename>
-+      <Filename>vinagre.desktop</Filename>
-       <Filename>yelp.desktop</Filename>
--      <Filename>gnome-control-center.desktop</Filename>
-     </Include>
-   </Menu>
-
---
-1.8.3.1
\ No newline at end of file
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
deleted file mode 100644
index 83a4a83d60bc..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-gnome-calculator.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Thu, 28 Mar 2013 21:54:34 +0000
-Subject: Adapt for gnome-calculator -> gcalctool desktop file rename
-
-gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
-very last minute before the 3.8.0 release.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696816
----
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 84d13ed..503f9ca 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -38,7 +38,6 @@
-         <Not><Filename>file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
--        <Not><Filename>gnome-calculator.desktop</Filename></Not>
-         <Not><Filename>gcalctool.desktop</Filename></Not>
-         <Not><Filename>gucharmap.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
-@@ -251,7 +250,7 @@
-     <Directory>X-GNOME-Utilities.directory</Directory>
-     <Include>
-       <Filename>file-roller.desktop</Filename>
--      <Filename>gnome-calculator.desktop</Filename>
-+      <Filename>gcalctool.desktop</Filename>
-       <Filename>gnome-font-viewer.desktop</Filename>
-       <Filename>gucharmap.desktop</Filename>
-       <Filename>seahorse.desktop</Filename>
-@@ -287,7 +286,6 @@
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
-         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
--        <Not><Filename>gcalctool.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
deleted file mode 100644
index a8a245f59990..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.11 2013/04/09 16:43:03 ago Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug +introspection python"
-
-RDEPEND=">=dev-libs/glib-2.18
-	python? ( dev-python/pygtk )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	# Prefix menu, bug #256614
-	mv "${ED}"/etc/xdg/menus/applications.menu \
-		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
-
-	use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_mod_optimize GMenuSimpleEditor
-	fi
-
-	ewarn "Due to bug #256614, you might lose icons in applications menus."
-	ewarn "If you use a login manager, please re-select your session."
-	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
-	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
deleted file mode 100644
index 3d821cedfd52..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild,v 1.5 2014/02/22 21:43:41 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug python +introspection"
-
-RDEPEND=">=dev-libs/glib-2.18
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-
-	gnome-base/gnome-common
-	dev-libs/gobject-introspection-common"
-# eautoreconf requires gnome-common
-# The actual menus are provided by slot 3
-PDEPEND="gnome-base/gnome-menus:3"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Only build the library (everything else is coming from slot 3)
-	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
-	epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
-	eautoreconf
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
deleted file mode 100644
index 78d3a8a3e377..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.10.1.ebuild,v 1.4 2014/03/09 11:58:42 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug +introspection test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes --enable-debug=minimum) \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
index 7f39dda35056..a5cbad50d8bb 100644
--- a/gnome-base/gnome-session/ChangeLog
+++ b/gnome-base/gnome-session/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gnome-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.341 2014/09/22 13:10:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/ChangeLog,v 1.342 2014/11/13 11:30:56 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -files/10-user-dirs-update-gnome,
+  -files/15-xdg-data-gnome, -files/defaults.list,
+  -files/gnome-session-2.32.0-session-saving-button.patch,
+  -files/gnome-session-2.32.1-dialog-size.patch,
+  -files/gnome-session-2.32.1-dialog-size2.patch,
+  -files/gnome-session-2.32.1-gnome3-conditions.patch,
+  -files/gnome-session-2.32.1-gsettings-conditions.patch,
+  -files/gnome-session-2.32.1-idle-transition.patch,
+  -files/gnome-session-3.8.4-blacklist-nv25.patch,
+  -files/gnome-session-3.8.4-presence-crash.patch,
+  -gnome-session-2.32.1-r3.ebuild:
+  Drop old (#508854)
 
 *gnome-session-3.12.1-r1 (22 Sep 2014)
 
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index e681e5aa5a41..720e23747bc0 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1,33 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 10-user-dirs-update-gnome 264 SHA256 f060f401bf0e3f7dad91ce675666853de062d8523a3749f1040c4895bc3db931 SHA512 57ffafeaba34ed4102ba7fc7b1ac91db8fce4ee5d122daebe1bff28f4dc2da45bc85b825ea9fae22f70de4f7941ab602b42da661e632c692350f1d3d589c62c2 WHIRLPOOL 3435353ef4be7e32ff3c5842a54f8fad7b705c248e8ddf1a19151dba3ab55c452c45db5e3f53c128a3e165986d44c366297adc7abf3e4d890c4df3847286e88f
 AUX 10-user-dirs-update-gnome-r1 299 SHA256 4baf3771a18f87db323580d868f232bf33830f72dcc54b4b3aa3d9bc9cce05e5 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a WHIRLPOOL 0dca330c2bedd4cfb056d162550680f4fcf89b94598ace9e02d0289d9e6a4414aa184b2444ce768e8f757ee9ce492fa9288616c25ca8885dbe92dffec28fd9f6
-AUX 15-xdg-data-gnome 227 SHA256 dca4022749bd9a7657dc077546ce0bc65312e87054e6f98761a7f1dd5f6a88cd SHA512 f6039b3640b69f468f47eeeb3bd0116b470930cbfab93630c065b17355b3686eda00007311b2b8d0f5c24dfb902e1175aae11a8f930a9e039ca6945e84af4e8f WHIRLPOOL 4a0eccdd48ea38a3edcbae80c665ff1126c4356dff47910ebe1b2fa428649887d073f0d7d7ea44c632a6e06308d0b7c04c5d6b9796e9b39dc78a568e73882669
 AUX 15-xdg-data-gnome-r1 262 SHA256 860767c9ee4fc9e0d29c20cd8143311db7d0981ed4f590069d0d9edf46ec0b24 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc WHIRLPOOL dbf53f428300ec213eb7397f88cdb54a7c4c4f6bf9d45a07e84894db83e95906cb45a217d437db1e875c000c77c5658b97b6f21050c8d89d20b0750a102aac2e
 AUX Gnome 2391 SHA256 ffc912945278c88ef854c8988b0042675ffa78525592f34580ee76c1f25309d3 SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6 WHIRLPOOL 7c3d492309bd3916b24ab48e0fc31a7924ce1ce6661f27770e6b8cc3c902fd06c1f22f6950d46dcac97b8d82a9f95f0b5cc12235dd0e78bc34b4cb2a5f0a7da0
-AUX defaults.list 14505 SHA256 efe30d8f5be448661870fec6a5e49ae98ecfb73f06ee4ab0926990cb15223354 SHA512 8f343fff8ad08bf98e2c96157c04a6c3253d719455293e8296a8c8c383c94bea3666b4936ae5687d1d5de2d04a599271e3520aff5e52474eb63a87d1fc5c24e8 WHIRLPOOL ee81a0a72b87c3f10b7dc9a1479d296d1d885eb10ec06cc517969a9c4fb3f7229e70f5a8c470152492bc52730afde4f06068289f09981555e06a2a6635bdd92f
 AUX defaults.list-r1 16386 SHA256 e98a66ad71c7e2233334ec5484b768cfd91e38fa428ec376c0ef1a3d8ca7116f SHA512 bf98a58dbcd0673f2cd157ed867a0bb282108a28466347524f7dadcf6d1c791404d642b5373a9d4eb50a965beafc1c278edfb0423b3112e65f56227561429939 WHIRLPOOL 84c8c32b8f45be1120e50c6e497a8c723b954e6da34c13a85ac3420c6c7cb4cb7eb2f93a83cb05598f5b3c22fe5530ff4db5c65a872d71a620ce1418ee8cb317
 AUX defaults.list-r2 16773 SHA256 ebb1be82f7a24e2e3a82ccb93ca5a19a348f1d00330b03bbba27124dffa816bf SHA512 2e761609871e1508136ef9a324a506ac4318d53727445dbcc8ddcf8e7b44f8f6172834dda3aa5e8f9c2ab7fc186c6c674adddef8c3bf6b4e9467e7570867ee65 WHIRLPOOL 0d42647906e882936db706488ede69bfed824ca91af63d08f9dc5b9f3ffe1b2e076f6c0f210e24da173b06c1e793827118c8248f506eff89b95e083678ae7396
-AUX gnome-session-2.32.0-session-saving-button.patch 21424 SHA256 7a2dd8771180bc460fdc034ad95d61ed83b14952b16b17c3cb9a10aade8a1a97 SHA512 e9d506fbb690a560c362f4e16e4bd7353aaa437faa2e36673456fab294e555ad61d4774821acc976a44894a81a42b34c867e64e1aad27eb5fa946bf5880ac8d3 WHIRLPOOL 493a0fe84f8d755ec843cc6e86215eec1a788dda1d494a58e7048747c995ad666ed06932a2cf788e1c5458bd9c245251232ef9f6fc2e78d0182dfd8be4f51edf
-AUX gnome-session-2.32.1-dialog-size.patch 953 SHA256 8f96daba40ae19223d54aa271f79e0a6541e4c936771815a4599077533c6948b SHA512 0ffcbeba40449c1ed0741e0d988b87504741d371b1ce897b013ec4dbdf813f0d632b88f41ffdbd080a50a752e58bce63c17cc80b6550853f01fe8cdb2dd6785c WHIRLPOOL 2f78f956521ee65d0b4e9b3cdfe8b151172d8553c071edc8230363e1cc366866c04e866da7a1a1b56b0363c3aad22b7fcbb3a9e7e9540ede87e2e56fc9724040
-AUX gnome-session-2.32.1-dialog-size2.patch 1114 SHA256 fefa53adb80c531fecc4fa4e67f5faff7ee5cfd33a290c689dca9f2267525f6e SHA512 6fb6d6214051d61470fe50bbb4db4d4f7c0b7475a28f72c485f16dba7a885fde7d7bfc2375b11fc82b5da1a3e0fd6e5d609a6ac70fe6a25a72a3cca2c1bce3c8 WHIRLPOOL 225f5b0ca3fa341c8bf591f66e257fad080f0fcf920625271a395331f3c89d1b1607f7ae13f18796bc8f62bcac7973c24901c9396939b257c5f70fa9a8568eff
-AUX gnome-session-2.32.1-gnome3-conditions.patch 4552 SHA256 88482711f19399b766ed562c43511d8a6db1e1df2790945cd1819d7f616af42e SHA512 c6547805cdb8619b0cb27e8f450ca4688bbfc83925f4ad76dadacf33983293a9cea7ab3db587547de38dd4794286dc66996ee4d75aecdace3cd5dc74226ad787 WHIRLPOOL bb58874a45be0202ddfbec6d875c951a3bfde8138250667ce19b6c73e1924497e217acb8182f56c6da40b59790347b603527ee90fe4e6f63f3c851cf29a0de4b
-AUX gnome-session-2.32.1-gsettings-conditions.patch 5085 SHA256 a57d614d533a54d0d3c186d521c53caad7150d4dc19863b9171472b1a48c01b0 SHA512 289592081a1f9fb44cb0d21566cbca9e649db8588a1bf23628f1d3c01283e6d2c9bd0141ed3803399ab1f61e71c1b540145a061f25428adbd3efad1916e1ff99 WHIRLPOOL c49000b4237f7451f42463e870112939079a9fa4f80e4856be51df9b08c0f33628b004dc0c44e70066fb9d3099e7c0e7b73dc55cf54e807da84596c8b5665072
-AUX gnome-session-2.32.1-idle-transition.patch 1802 SHA256 6e80574672ff9e4b9a63796959d1e83af0f184eb4ad507bcbe6589c364b63038 SHA512 c09e0df938d46cc95f0b997142e63c109e8fd4b52dc07c36b1642f0688b3e2faf5627c88a6d0cb81b672d714354cc1f3d19c5c2d6cbcfdd889aadd638bda6958 WHIRLPOOL 1fab4d3c7b9785125d8f8540500941d1f897f8a20e16e16e113b0a9b7a28324c42e1976a49328fb8c7c6337a519fa5c917463da5ba7a360d1ae459261a61f850
-AUX gnome-session-3.8.4-blacklist-nv25.patch 592 SHA256 2c0894db69a13678d12047f14eae213c6ebf1c2b940e9e46a9297ef4ad1e2b8d SHA512 d112f286256f0dc94daf887cf40153a76fccd5684cd9f638510cd1caeeb5de2f51ffe2e298e992a6dab6d7a5ea11e12d0372365ecb2e29d0c2759f7ccc25ed94 WHIRLPOOL 40e1bb37592199fa25a188a8868d83116d336db12db29a7de7ecf611eaf92c239c35233c38f85f45b251e8a974f330ae0bdce4e28854b6a8ad651b261eecd24c
-AUX gnome-session-3.8.4-presence-crash.patch 2036 SHA256 14e24caadd8ed2056b00b0bd4eef0dec61b07fa9e72d8ca990e64bcfa42dabcb SHA512 dff7f096d562f8b7b661b6eda1d65a3f9a992cd4cd22604034f44ea77ca72b1282b9bced4702ca24e89185f97de54b4a554877b7cbc8a1ca9f55ef15030f3ac9 WHIRLPOOL faa03513c86fec3f313c3a1a14e40d86d2d35b636d5ad8aa70f17ae51424e205ae99dd00670ac41aaa2465e7281c63bc48574a41d5978ca78bf832a51a574ad0
-DIST gnome-session-2.32.1.tar.bz2 774842 SHA256 22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a SHA512 5d688e971ff440d33c7fff86db7b11d06aa39e9f6b4654a54ef6f4b608fe39c24b13be04726c69dbca4600fa91dc21b2f12415499367ec6045212828674bed99 WHIRLPOOL e03c121c5c644975deae06590828ce84a66e583838fc7de28752026e6c798b6fa4eaa4d6cdfa4975930c7ead730568e051c4dc280e5c7c80ab2bd4e64ffe9ca0
 DIST gnome-session-3.12.1.tar.xz 718380 SHA256 fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3 SHA512 ee435aa31e2971f4d7246c748cace17a67f5697cbf016084aea4c263b2b2c096590b50920bc70ab45fb11e1470558f9c5b8864a37ae838f4a306ddc49acc5f2b WHIRLPOOL 41677526ad3323c7177ae592525f64d969004c475e9f17bddfb285a4d117a7cfc188c0b378b33f242be9a5d522441868b55f6c0a4f5029eb1949d195fef26517
-EBUILD gnome-session-2.32.1-r3.ebuild 2999 SHA256 8aa4a5faf11e1bf7f268cf9388eacfbbff017fa7eea3b58f23a4ce8d5f1a83d4 SHA512 e820a1bac84f06f9db5a4eb66ce58fe36d590a0c485483eb39920561f0249eefe20a0e5a08bb3dc0866ea8496c3cfba99e6d5bd2a8e77a732f415d939edd9246 WHIRLPOOL f294df3f7a16f871f60103dad6f7e50e4dc68e1416399054a793c325ffc11de3dd0a5b2d601f2f4934bdeba53e75c643fa97b8fa5c837dac9ed17c728138fb6f
 EBUILD gnome-session-3.12.1-r1.ebuild 3393 SHA256 e4f396153f6f47b17fbfd628bc3a4172dc8144511d3ac6158bd5a905c8fc77cd SHA512 6ed9c230feb87b9ef79927afe48dab236babb7f09630fb102b95eab89f09d6158c5cd1a651b779fa91eda6b1ab593a432cf918f4432d3399afca0ea30381647a WHIRLPOOL 1e53c3358acfa048db78f83f13e53ed5eb596af6b204a609dbbc8e636832ab793396d6961de61bcec191a81f70b020e3f1aba5c54787a5a34a65207a69ccf925
 EBUILD gnome-session-3.12.1.ebuild 3441 SHA256 b61ea04691a542561ff1f9d1b5f498739e9f8728dd6231df435082f0ccfdab75 SHA512 7e0af6166c61b04f26ee8257dfc95994b076fa41c03888bc9ea57da022f42fdfc8c032832bf64e8826aac4dc66f63a7a6b502f0803fbe305066cddbf187ba895 WHIRLPOOL 9c750e398c7f3b7f2e3d97c8918c683cd212d67d82778021d55552d525285c5c4ac67879bfa227cf7c8e8a26d551cc0b97e7445e1e394d69e8a5c713bce5c656
-MISC ChangeLog 51463 SHA256 2f5bcd261628ec9a06805c0f80cc3bb7c2dbeab0ab1c06a48a10abba1480d157 SHA512 5a8cb47cd1feed40428bc49839e7b1060d6acd71a296e42ecaea2c9f1e4d0cb214f59bff1669b4fb85023e2c841d8c658d722d7d63914bef97e0ca9e5b4563b6 WHIRLPOOL 44902172ff25997f4441b4a47c3fefe1fd8c34ba3397eafa8ff0b346acb39fe66dc6be4c23e25299cf7c74feee3e816366b853dea5b84b4c5b581941897ad826
+MISC ChangeLog 52076 SHA256 1000a147f8b9173c8f2eb39467c32a00da7533c58e87a8545aecf6f3283ae501 SHA512 9d9518095896f90e8ff64023009865277abf8efabe2c0133c23856a01cc5312f29b502734758d2052d00eafcad531d632704f2df2f976c67a5b1400563d3e146 WHIRLPOOL 8a04cd4694b1d1ed1ebc8d2e57bd451eca6a5b796798017d6fbea29fdf6b14899a71ea82679097e87b1f5218bfaf8ca1d1ae494263de2b818d8df35f951ebb8c
 MISC metadata.xml 278 SHA256 4b6d5cc443e75f79675a992f133fdcf809fc528ca0e53bdbaf96a69383323c1d SHA512 32c59f5a0898ec7378ad33ac5a3f885f9b825633dfc0373603d413e8bf36b264c4efe03b8c0f4813237474ad858f929a74643869b7604c128e1ac5a5d1875b60 WHIRLPOOL 5552633b5518f886a89fa3a7b69ca5e8e7b81cc3436dc573e10990a4dea1e40ef14731a756501266449bbde0d9211145f9dccf3e3b728036645d6de1a6995295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQgH7UACgkQCaWpQKGI+9T0vACeMpevaoaNJHMOnFSyzPEAmf/j
-KpkAn0NnkukLJyBuklcRDdKlvburNfl7
-=P/sl
+iEYEAREIAAYFAlRklnIACgkQCaWpQKGI+9QohQCeNwQPAJS+yp/+it8ladQSluNn
+KgYAn3YvZEZYDdsOG3jBIZhy02a/qsaV
+=9dUL
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome
deleted file mode 100755
index f909d44dacdf..000000000000
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
-	if type xdg-user-dirs-update &>/dev/null; then
-		xdg-user-dirs-update
-	fi
-fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome
deleted file mode 100644
index e62f3e1c6baa..000000000000
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
-	if [ -z "$XDG_DATA_DIRS" ]; then
-		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
-	else
-		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
-	fi
-fi
diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list
deleted file mode 100644
index 572b5407002c..000000000000
--- a/gnome-base/gnome-session/files/defaults.list
+++ /dev/null
@@ -1,333 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop
-application/x-abiword=abiword.desktop
-text/abiword=abiword.desktop
-text/richtext=abiword.desktop
-text/rtf=abiword.desktop
-text/x-abiword=abiword.desktop
-text/x-xml-abiword=abiword.desktop
-x-content/blank-bd=brasero-nautilus.desktop
-x-content/blank-dvd=brasero-nautilus.desktop
-x-content/blank-cd=brasero-nautilus.desktop
-x-content/blank-hddvd=brasero-nautilus.desktop
-application/x-dia-diagram=dia.desktop
-image/bmp=eog.desktop
-image/gif=eog.desktop
-image/jpeg=eog.desktop
-image/jpg=eog.desktop
-image/pjpeg=eog.desktop
-image/png=eog.desktop
-image/svg+xml=eog.desktop
-image/svg+xml-compressed=eog.desktop
-image/x-bmp=eog.desktop
-image/x-gray=eog.desktop
-image/x-icb=eog.desktop
-image/x-ico=eog.desktop
-image/x-pcx=eog.desktop
-image/x-png=eog.desktop
-image/x-portable-anymap=eog.desktop
-image/x-portable-bitmap=eog.desktop
-image/x-portable-graymap=eog.desktop
-image/x-portable-pixmap=eog.desktop
-image/x-xbitmap=eog.desktop
-image/x-xpixmap=eog.desktop
-image/vnd.wap.wbmp=eog.desktop
-image/g3fax=gimp.desktop
-image/x-compressed-xcf=gimp.desktop
-image/x-fits=gimp.desktop
-image/x-icon=gimp.desktop
-image/x-psd=gimp.desktop
-image/x-sgi=gimp.desktop
-image/x-sun-raster=gimp.desktop
-image/x-tga=gimp.desktop
-image/x-xcf=gimp.desktop
-image/x-xwindowdump=gimp.desktop
-application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-application/pdf=evince.desktop
-application/x-bzpdf=evince.desktop
-application/x-gzpdf=evince.desktop
-application/postscript=evince.desktop
-application/x-bzpostscript=evince.desktop
-application/x-gzpostscript=evince.desktop
-image/x-eps=evince.desktop
-image/x-bzeps=evince.desktop
-image/x-gzeps=evince.desktop
-application/x-dvi=evince.desktop
-application/x-bzdvi=evince.desktop
-application/x-gzdvi=evince.desktop
-image/vnd.djvu=evince.desktop
-image/tiff=evince.desktop
-application/x-cbr=evince.desktop
-application/x-cbz=evince.desktop
-application/x-cb7=evince.desktop
-application/x-7z-compressed=file-roller.desktop
-application/x-7z-compressed-tar=file-roller.desktop
-application/x-ace=file-roller.desktop
-application/x-alz=file-roller.desktop
-application/x-ar=file-roller.desktop
-application/x-arj=file-roller.desktop
-application/x-bzip=file-roller.desktop
-application/x-bzip-compressed-tar=file-roller.desktop
-application/x-bzip1=file-roller.desktop
-application/x-bzip1-compressed-tar=file-roller.desktop
-application/x-cabinet=file-roller.desktop
-application/x-cd-image=file-roller.desktop
-application/x-compress=file-roller.desktop
-application/x-compressed-tar=file-roller.desktop
-application/x-cpio=file-roller.desktop
-application/x-deb=file-roller.desktop
-application/x-ear=file-roller.desktop
-application/x-gtar=file-roller.desktop
-application/x-gzip=file-roller.desktop
-application/x-java-archive=file-roller.desktop
-application/x-lha=file-roller.desktop
-application/x-lhz=file-roller.desktop
-application/x-lzip=file-roller.desktop
-application/x-lzip-compressed-tar=file-roller.desktop
-application/x-lzma=file-roller.desktop
-application/x-lzma-compressed-tar=file-roller.desktop
-application/x-lzop=file-roller.desktop
-application/x-lzop-compressed-tar=file-roller.desktop
-application/x-rar=file-roller.desktop
-application/x-rar-compressed=file-roller.desktop
-application/x-rpm=file-roller.desktop
-application/x-rzip=file-roller.desktop
-application/x-tar=file-roller.desktop
-application/x-tarz=file-roller.desktop
-application/x-stuffit=file-roller.desktop
-application/x-war=file-roller.desktop
-application/x-xz=file-roller.desktop
-application/x-xz-compressed-tar=file-roller.desktop
-application/x-zip=file-roller.desktop
-application/x-zip-compressed=file-roller.desktop
-application/x-zoo=file-roller.desktop
-application/zip=file-roller.desktop
-multipart/x-zip=file-roller.desktop
-text/plain=gedit.desktop
-text/css=gedit.desktop
-text/javascript=gedit.desktop
-text/mathml=gedit.desktop
-text/x-csrc=gedit.desktop
-text/x-chdr=gedit.desktop
-text/x-dtd=gedit.desktop
-text/x-java=gedit.desktop
-text/x-javascript=gedit.desktop
-text/x-patch=gedit.desktop
-text/x-perl=gedit.destkop
-text/x-php=gedit.destkop
-text/x-python=gedit.destkop
-text/x-sql=gedit.desktop
-text/xml=gedit.desktop
-application/javascript=gedit.destkop
-application/x-cgi=gedit.desktop
-application/x-javascript=gedit.desktop
-application/x-perl=gedit.desktop
-application/x-php=gedit.desktop
-application/x-python=gedit.desktop
-application/xml=gedit.desktop
-application/xml-dtd=gedit.desktop
-application/x-font-ttf=gnome-font-viewer.desktop
-application/x-font-pcf=gnome-font-viewer.desktop
-application/x-font-type1=gnome-font-viewer.desktop
-application/x-font-otf=gnome-font-viewer.desktop
-application/csv=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
-application/tab-separated-values=gnumeric.desktop
-application/vnd.lotus-1-2-3=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
-application/x-123=gnumeric.desktop
-application/x-applix-spreadsheet=gnumeric.desktop
-application/x-dbase=gnumeric.desktop
-application/x-dbf=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
-application/x-mps=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
-application/x-oleo=gnumeric.desktop
-application/x-planperfect=gnumeric.desktop
-application/x-quattropro=gnumeric.desktop
-application/x-sc=gnumeric.desktop
-application/x-sylk=gnumeric.desktop
-application/x-xbase=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-application/xls=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-text/csv=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-text/x-csv=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-x-content/software=nautilus-autorun-software.desktop
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop
-x-directory/normal=nautilus-folder-handler.desktop
-inode/directory=nautilus-folder-handler.desktop
-application/x-gnome-saved-search=nautilus-folder-handler.desktop
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-x-content/audio-player=rhythmbox.desktop
-x-content/audio-cdda=sound-juicer.desktop
-application/x-shockwave-flash=swfdec-player.desktop
-application/futuresplash=swfdec-player.desktop
-application/mxf=totem.desktop
-application/ogg=totem.desktop
-application/ram=totem.desktop
-application/sdp=totem.desktop
-application/smil=totem.desktop
-application/smil+xml=totem.desktop
-application/vnd.ms-wpl=totem.desktop
-application/vnd.rn-realmedia=totem.desktop
-application/x-extension-m4a=totem.desktop
-application/x-extension-mp4=totem.desktop
-application/x-flac=totem.desktop
-application/x-flash-video=totem.desktop
-application/x-matroska=totem.desktop
-application/x-netshow-channel=totem.desktop
-application/x-ogg=totem.desktop
-application/x-quicktime-media-link=totem.desktop
-application/x-quicktimeplayer=totem.desktop
-application/x-shorten=totem.desktop
-application/x-smil=totem.desktop
-application/xspf+xml=totem.desktop
-audio/3gpp=totem.desktop
-audio/ac3=totem.desktop
-audio/AMR=totem.desktop
-audio/AMR-WB=totem.desktop
-audio/basic=totem.desktop
-audio/midi=totem.desktop
-audio/mp4=totem.desktop
-audio/mpeg=totem.desktop
-audio/mpegurl=totem.desktop
-audio/ogg=totem.desktop
-audio/prs.sid=totem.desktop
-audio/vnd.rn-realaudio=totem.desktop
-audio/x-ape=totem.desktop
-audio/x-flac=totem.desktop
-audio/x-gsm=totem.desktop
-audio/x-it=totem.desktop
-audio/x-m4a=totem.desktop
-audio/x-matroska=totem.desktop
-audio/x-mod=totem.desktop
-audio/x-mp3=totem.desktop
-audio/x-mpeg=totem.desktop
-audio/x-mpegurl=totem.desktop
-audio/x-ms-asf=totem.desktop
-audio/x-ms-asx=totem.desktop
-audio/x-ms-wax=totem.desktop
-audio/x-ms-wma=totem.desktop
-audio/x-musepack=totem.desktop
-audio/x-pn-aiff=totem.desktop
-audio/x-pn-au=totem.desktop
-audio/x-pn-realaudio=totem.desktop
-audio/x-pn-realaudio-plugin=totem.desktop
-audio/x-pn-wav=totem.desktop
-audio/x-pn-windows-acm=totem.desktop
-audio/x-realaudio=totem.desktop
-audio/x-real-audio=totem.desktop
-audio/x-sbc=totem.desktop
-audio/x-scpls=totem.desktop
-audio/x-speex=totem.desktop
-audio/x-tta=totem.desktop
-audio/x-vorbis=totem.desktop
-audio/x-vorbis+ogg=totem.desktop
-audio/x-wav=totem.desktop
-audio/x-wavpack=totem.desktop
-audio/x-xm=totem.desktop
-image/vnd.rn-realpix=totem.desktop
-image/x-pict=totem.desktop
-misc/ultravox=totem.desktop
-text/google-video-pointer=totem.desktop
-text/x-google-video-pointer=totem.desktop
-video/3gpp=totem.desktop
-video/dv=totem.desktop
-video/fli=totem.desktop
-video/flv=totem.desktop
-video/mp2t=totem.desktop
-video/mp4=totem.desktop
-video/mp4v-es=totem.desktop
-video/mpeg=totem.desktop
-video/msvideo=totem.desktop
-video/ogg=totem.desktop
-video/quicktime=totem.desktop
-video/vivo=totem.desktop
-video/vnd.divx=totem.desktop
-video/vnd.rn-realvideo=totem.desktop
-video/vnd.vivo=totem.desktop
-video/webm=totem.desktop
-video/x-anim=totem.desktop
-video/x-avi=totem.desktop
-video/x-flc=totem.desktop
-video/x-fli=totem.desktop
-video/x-flic=totem.desktop
-video/x-flv=totem.desktop
-video/x-m4v=totem.desktop
-video/x-matroska=totem.desktop
-video/x-mpeg=totem.desktop
-video/x-ms-asf=totem.desktop
-video/x-ms-asx=totem.desktop
-video/x-msvideo=totem.desktop
-video/x-ms-wm=totem.desktop
-video/x-ms-wmv=totem.desktop
-video/x-ms-wmx=totem.desktop
-video/x-ms-wvx=totem.desktop
-video/x-nsv=totem.desktop
-video/x-ogm+ogg=totem.desktop
-video/x-theora+ogg=totem.desktop
-video/x-totem-stream=totem.desktop
-x-content/video-dvd=totem.desktop
-x-content/video-vcd=totem.desktop
-x-content/video-svcd=totem.desktop
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;epiphany.desktop
-x-scheme-handler/https=firefox.desktop;epiphany.desktop
-x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch b/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch
deleted file mode 100644
index b407f9a4d880..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch
+++ /dev/null
@@ -1,559 +0,0 @@
-From c56898dcc1a73af37333b5df28f3b298a0c0669d Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 9 Sep 2010 15:38:37 +0300
-Subject: [PATCH] Implement session saving UI in gnome-session-properties
-
-Original patch by Ghee Teo and Josselin Mouette
-
-https://bugzilla.gnome.org/show_bug.cgi?id=575544
----
- capplet/gsm-properties-dialog.c            |   63 ++++++++++++-
- configure.ac                               |    1 +
- data/session-properties.ui                 |   12 ++
- gnome-session/gsm-client.c                 |   10 ++
- gnome-session/gsm-client.h                 |    6 +
- gnome-session/gsm-dbus-client.c            |   14 +++
- gnome-session/gsm-manager.c                |  150 +++++++++++++++++++++++++++-
- gnome-session/gsm-manager.h                |    3 +
- gnome-session/gsm-xsmp-client.c            |   37 +++++++
- gnome-session/gsm-xsmp-client.h            |    3 +-
- gnome-session/org.gnome.SessionManager.xml |    8 ++
- 11 files changed, 303 insertions(+), 4 deletions(-)
-
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 84ef910..f54656e 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -35,6 +35,12 @@
- #include "gsm-util.h"
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+
-+#define GSM_SERVICE_DBUS   "org.gnome.SessionManager"
-+#define GSM_PATH_DBUS      "/org/gnome/SessionManager"
-+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
- 
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
- 
-@@ -50,6 +56,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME        "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME          "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME          "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME      "session_properties_remember_toggle"
- 
- #define STARTUP_APP_ICON     "system-run"
-@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButton     *button,
- }
- 
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+                       const char *msg,
-+                       gboolean is_error)
-+{
-+        GtkLabel *label;
-+        gchar *markup;
-+        label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+        if (is_error)
-+                markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+        else
-+                markup = g_markup_escape_text (msg, -1);
-+        gtk_label_set_markup (label, markup);
-+        g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+                  DBusGProxyCall *call_id,
-+                  void *user_data)
-+{
-+        gboolean res;
-+        GsmPropertiesDialog *dialog = user_data;
-+
-+        res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+        if (res)
-+                session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+        else
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+        g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget           *widget,
-                          GsmPropertiesDialog *dialog)
- {
--        g_debug ("Session saving is not implemented yet!");
-+        DBusGConnection *conn;
-+        DBusGProxy *proxy;
-+        DBusGProxyCall *call;
-+
-+        conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+        if (conn == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+                return;
-+        }
-+
-+        proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+        if (proxy == NULL) {
-+                session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+                return;
-+        }
-+
-+        call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+        if (call == NULL) {
-+                session_saved_message (dialog, _("Failed to save session"), TRUE);
-+                g_object_unref (proxy);
-+                return;
-+        }
- }
- 
- static void
-diff --git a/configure.ac b/configure.ac
-index 3988b4a..b2b96b8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
-         glib-2.0 >= $GLIB_REQUIRED
-         gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-+        dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
- 
- PKG_CHECK_MODULES(SM, sm)
-diff --git a/data/session-properties.ui b/data/session-properties.ui
-index 24f721d..3083fc1 100644
---- a/data/session-properties.ui
-+++ b/data/session-properties.ui
-@@ -148,6 +148,7 @@
-             <property name="visible">True</property>
-             <child>
-               <object class="GtkButton" id="session_properties_save_button">
-+                <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="receives_default">True</property>
-                 <child>
-@@ -191,6 +192,17 @@
-             <property name="position">1</property>
-           </packing>
-         </child>
-+        <child>
-+          <object class="GtkLabel" id="session_properties_session_saved_label">
-+            <property name="visible">True</property>
-+            <property name="wrap">True</property>
-+          </object>
-+          <packing>
-+            <property name="expand">False</property>
-+            <property name="fill">False</property>
-+            <property name="position">2</property>
-+          </packing>
-+        </child>
-       </object>
-       <packing>
-         <property name="position">1</property>
-diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c
-index b1c3c02..b063aca 100644
---- a/gnome-session/gsm-client.c
-+++ b/gnome-session/gsm-client.c
-@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *client)
-         g_signal_emit (client, signals[DISCONNECTED], 0);
- }
- 
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+                         guint      flags,
-+                         GError   **error)
-+{
-+        g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+        return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
-                  GError   **error)
-diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h
-index 8fa28ad..a191e1d 100644
---- a/gnome-session/gsm-client.h
-+++ b/gnome-session/gsm-client.h
-@@ -92,6 +92,9 @@ struct _GsmClientClass
-                                                               GError   **error);
-         gboolean              (*impl_stop)                   (GsmClient *client,
-                                                               GError   **error);
-+        gboolean              (*impl_request_save)           (GsmClient *client,
-+                                                              guint      flags,
-+                                                              GError   **error);
-         GKeyFile *            (*impl_save)                   (GsmClient *client,
-                                                               GError   **error);
- };
-@@ -137,6 +140,9 @@ gboolean              gsm_client_cancel_end_session         (GsmClient  *client,
- 
- void                  gsm_client_disconnected               (GsmClient  *client);
- 
-+gboolean              gsm_client_request_save               (GsmClient  *client,
-+                                                             guint       flags,
-+                                                             GError    **error);
- GKeyFile             *gsm_client_save                       (GsmClient  *client,
-                                                              GError    **error);
- /* exported to bus */
-diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c
-index e0aaf3d..a6ab43a 100644
---- a/gnome-session/gsm-dbus-client.c
-+++ b/gnome-session/gsm-dbus-client.c
-@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *object)
-         G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
- 
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+                          guint      flags,
-+                          GError   **error)
-+{
-+        g_debug ("GsmDBusClient: sending save request to client with id %s",
-+                 gsm_client_peek_id (client));
-+
-+        /* FIXME: The protocol does not support this */
-+
-+        return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
-                   GError   **error)
-@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClientClass *klass)
-         object_class->set_property         = gsm_dbus_client_set_property;
-         object_class->dispose              = gsm_dbus_client_dispose;
- 
-+        client_class->impl_request_save           = dbus_client_request_save;
-         client_class->impl_save                   = dbus_client_save;
-         client_class->impl_stop                   = dbus_client_stop;
-         client_class->impl_query_end_session      = dbus_client_query_end_session;
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index c85cea6..ca1a0ae 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -68,6 +68,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
- 
- #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
- #define GDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1153,6 +1154,69 @@ query_end_session_complete (GsmManager *manager)
- 
- }
- 
-+static gboolean
-+_client_request_save (GsmClient            *client,
-+                      ClientEndSessionData *data)
-+{
-+        gboolean ret;
-+        GError  *error;
-+
-+        error = NULL;
-+        ret = gsm_client_request_save (client, data->flags, &error);
-+        if (ret) {
-+                g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+                data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+                                                                      client);
-+        } else if (error) {
-+                g_debug ("GsmManager: unable to query client: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char           *id,
-+                             GsmClient            *client,
-+                             ClientEndSessionData *data)
-+{
-+        return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+        GError *error = NULL;
-+
-+        if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+                ClientEndSessionData data;
-+
-+                data.manager = manager;
-+                data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+                g_slist_foreach (manager->priv->next_query_clients,
-+                                 (GFunc)_client_request_save,
-+                                 &data);
-+
-+                g_slist_free (manager->priv->next_query_clients);
-+                manager->priv->next_query_clients = NULL;
-+
-+                return;
-+        }
-+
-+        if (manager->priv->query_timeout_id > 0) {
-+                g_source_remove (manager->priv->query_timeout_id);
-+                manager->priv->query_timeout_id = 0;
-+        }
-+
-+        gsm_session_save (manager->priv->clients, &error);
-+
-+        if (error) {
-+                g_warning ("Error saving session: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1227,6 +1291,21 @@ _on_query_end_session_timeout (GsmManager *manager)
-         return FALSE;
- }
- 
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+        manager->priv->query_timeout_id = 0;
-+
-+        g_debug ("GsmManager: query to save session timed out");
-+
-+        g_slist_free (manager->priv->query_clients);
-+        manager->priv->query_clients = NULL;
-+
-+        query_save_session_complete (manager);
-+
-+        return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -1863,13 +1942,32 @@ on_client_end_session_response (GsmClient  *client,
-                                 const char *reason,
-                                 GsmManager *manager)
- {
--        /* just ignore if received outside of shutdown */
--        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        /* just ignore if we are not yet running */
-+        if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
-                 return;
-         }
- 
-         g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
- 
-+        if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+                /* Ignore responses when no requests were sent */
-+                if (manager->priv->query_clients == NULL) {
-+                        return;
-+                }
-+
-+                manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+                if (do_last) {
-+                        manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+                                                                             client);
-+                }
-+
-+                if (manager->priv->query_clients == NULL) {
-+                        query_save_session_complete (manager);
-+                }
-+                return;
-+        }
-+
-         if (cancel) {
-                 cancel_end_session (manager);
-                 return;
-@@ -1968,6 +2066,15 @@ on_xsmp_client_logout_request (GsmXSMPClient *client,
- }
- 
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+                             gboolean       show_dialog,
-+                             GsmManager    *manager)
-+{
-+        g_debug ("GsmManager: save_request");
-+        gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore   *store,
-                        const char *id,
-                        GsmManager *manager)
-@@ -1988,6 +2095,10 @@ on_store_client_added (GsmStore   *store,
-                                   "logout-request",
-                                   G_CALLBACK (on_xsmp_client_logout_request),
-                                   manager);
-+		g_signal_connect (client,
-+				  "save-request",
-+				  G_CALLBACK (on_xsmp_client_save_request),
-+				  manager);
-         }
- 
-         g_signal_connect (client,
-@@ -2945,6 +3056,41 @@ gsm_manager_shutdown (GsmManager *manager,
- }
- 
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+                          GError     **error)
-+{
-+        ClientEndSessionData data;
-+
-+        g_debug ("GsmManager: SaveSession called");
-+
-+        g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+        if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+                g_set_error (error,
-+                             GSM_MANAGER_ERROR,
-+                             GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+                             "SaveSession interface is only available during the Running phase");
-+                return FALSE;
-+        }
-+
-+        data.manager = manager;
-+        data.flags = 0;
-+        gsm_store_foreach (manager->priv->clients,
-+                           (GsmStoreFunc)_client_request_save_helper,
-+                           &data);
-+
-+        if (manager->priv->query_clients) {
-+                manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+                                                                         (GSourceFunc)_on_query_save_session_timeout,
-+                                                                         manager);
-+                return TRUE;
-+        } else {
-+                g_debug ("GsmManager: Nothing to save");
-+                return FALSE;
-+        }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
-                           gboolean   *shutdown_available,
-                           GError    **error)
-diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h
-index 17c70b3..dd6f198 100644
---- a/gnome-session/gsm-manager.h
-+++ b/gnome-session/gsm-manager.h
-@@ -152,6 +152,9 @@ gboolean            gsm_manager_is_inhibited                   (GsmManager
- gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
-                                                                 GError        **error);
- 
-+gboolean            gsm_manager_save_session                   (GsmManager     *manager,
-+                                                                GError        **error);
-+
- gboolean            gsm_manager_can_shutdown                   (GsmManager     *manager,
-                                                                 gboolean       *shutdown_available,
-                                                                 GError        **error);
-diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c
-index ce22ed9..ed55406 100644
---- a/gnome-session/gsm-xsmp-client.c
-+++ b/gnome-session/gsm-xsmp-client.c
-@@ -69,6 +69,7 @@ enum {
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+	SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *client,
-         return TRUE;
- }
- 
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+                   guint      flags,
-+                   GError   **error)
-+{
-+        GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+        g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+        if (xsmp->priv->conn == NULL) {
-+                g_set_error (error,
-+                             GSM_CLIENT_ERROR,
-+                             GSM_CLIENT_ERROR_NOT_REGISTERED,
-+                             "Client is not registered");
-+                return FALSE;
-+        }
-+
-+        if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+                xsmp_save_yourself_phase2 (client);
-+        else
-+                do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+        return TRUE;
-+}
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
-         object_class->get_property         = gsm_xsmp_client_get_property;
-         object_class->set_property         = gsm_xsmp_client_set_property;
- 
-+        client_class->impl_request_save           = xsmp_request_save;
-         client_class->impl_save                   = xsmp_save;
-         client_class->impl_stop                   = xsmp_stop;
-         client_class->impl_query_end_session      = xsmp_query_end_session;
-@@ -1006,6 +1032,17 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
-                               G_TYPE_NONE,
-                               1, G_TYPE_BOOLEAN);
- 
-+	signals[SAVE_REQUEST] =
-+		g_signal_new ("save-request",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+                              NULL,
-+                              NULL,
-+                              g_cclosure_marshal_VOID__BOOLEAN,
-+                              G_TYPE_NONE,
-+                              1, G_TYPE_BOOLEAN);
-+
-         g_object_class_install_property (object_class,
-                                          PROP_ICE_CONNECTION,
-                                          g_param_spec_pointer ("ice-connection",
-diff --git a/gnome-session/gsm-xsmp-client.h b/gnome-session/gsm-xsmp-client.h
-index b80f933..4fa24fb 100644
---- a/gnome-session/gsm-xsmp-client.h
-+++ b/gnome-session/gsm-xsmp-client.h
-@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
-                                           char          **client_id);
-         gboolean (*logout_request)       (GsmXSMPClient  *client,
-                                           gboolean        prompt);
--
-+	gboolean (*save_request)	 (GsmXSMPClient  *client,
-+                                          gboolean        prompt);
- 
-         void     (*saved_state)          (GsmXSMPClient  *client);
- 
-diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/org.gnome.SessionManager.xml
-index b8bec4e..bece3f5 100644
---- a/gnome-session/org.gnome.SessionManager.xml
-+++ b/gnome-session/org.gnome.SessionManager.xml
-@@ -256,6 +256,14 @@
-       </doc:doc>
-     </method>
- 
-+    <method name="SaveSession">
-+      <doc:doc>
-+	<doc:description>
-+	  <doc:para>Request to save session</doc:para>
-+	</doc:description>
-+      </doc:doc>
-+    </method>
-+
-     <method name="CanShutdown">
-       <arg name="is_available" direction="out" type="b">
-         <doc:doc>
--- 
-1.7.2.2
-
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch
deleted file mode 100644
index c5cfcebbfd8b..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 8c4cdd5304929d19a27f876eb9cb5bbb67a4d59f Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Mon, 29 Nov 2010 21:44:03 +0000
-Subject: capplet: Give the dialog a reasonable default height
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635891
----
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 4432b09..8b51169 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -784,6 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog)
-                                                      "main-notebook"));
-         gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
- 
-+        gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450);
-         gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
-         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-         gtk_box_set_spacing (GTK_BOX (content_area), 2);
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch
deleted file mode 100644
index 39a02806d599..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.1-dialog-size2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6fd301895a39fc32f302ea3fced74fc03e5c75c9 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Mon, 29 Nov 2010 21:47:00 +0000
-Subject: capplet: Also give the dialog a reasonable width
-
-We don't want to depend on the natural size, which depends on the length
-of strings for this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635891
----
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 8b51169..487250e 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -784,7 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog)
-                                                      "main-notebook"));
-         gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0);
- 
--        gtk_window_set_default_size (GTK_WINDOW (dialog), -1, 450);
-+        gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450);
-         gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
-         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
-         gtk_box_set_spacing (GTK_BOX (content_area), 2);
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch
deleted file mode 100644
index a4c220732503..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gnome3-conditions.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From d27c9dfb07e0d69ff37d029e5647bd68e7db7e95 Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Mon, 4 Apr 2011 18:07:09 +0530
-Subject: [PATCH] Don't reject GNOME 3 session autostart conditions
-
-gnome-session-3.0 introduced a new AutostartCondition=GNOME3 directive.
-See commit 58ebdfac for details on that.
-
-This commit adds detection for that directive instead of disabling .desktop
-files with that. Now, apps are autostarted if they contain:
-
- AutostartCondition=GNOME3 is-session gnome-fallback
-or
- AutostartCondition=GNOME3 unless-session [something other than gnome-fallback]
-
-And are disabled for all other cases.
----
- gnome-session/gsm-autostart-app.c |   45 +++++++++++++++++++++++++++++++-----
- 1 files changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
-index 529a346..abc918f 100644
---- a/gnome-session/gsm-autostart-app.c
-+++ b/gnome-session/gsm-autostart-app.c
-@@ -40,11 +40,14 @@ enum {
- };
- 
- enum {
--        GSM_CONDITION_NONE          = 0,
--        GSM_CONDITION_IF_EXISTS     = 1,
--        GSM_CONDITION_UNLESS_EXISTS = 2,
--        GSM_CONDITION_GNOME         = 3,
--        GSM_CONDITION_UNKNOWN       = 4
-+        GSM_CONDITION_NONE           = 0,
-+        GSM_CONDITION_IF_EXISTS      = 1,
-+        GSM_CONDITION_UNLESS_EXISTS  = 2,
-+        GSM_CONDITION_GNOME          = 3,
-+        GSM_CONDITION_GSETTINGS      = 4,
-+        GSM_CONDITION_IF_SESSION     = 5,
-+        GSM_CONDITION_UNLESS_SESSION = 6,
-+        GSM_CONDITION_UNKNOWN        = 7
- };
- 
- #define GSM_SESSION_CLIENT_DBUS_INTERFACE "org.gnome.SessionClient"
-@@ -153,15 +156,31 @@ parse_condition_string (const char *condition_string,
-                 key++;
-         }
- 
-+        kind = GSM_CONDITION_UNKNOWN;
-+
-         if (!g_ascii_strncasecmp (condition_string, "if-exists", len) && key) {
-                 kind = GSM_CONDITION_IF_EXISTS;
-         } else if (!g_ascii_strncasecmp (condition_string, "unless-exists", len) && key) {
-                 kind = GSM_CONDITION_UNLESS_EXISTS;
-         } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) {
-                 kind = GSM_CONDITION_GNOME;
--        } else {
-+        } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) {
-+                condition_string = key;
-+                space = condition_string + strcspn (condition_string, " ");
-+                len = space - condition_string;
-+                key = space;
-+                while (isspace ((unsigned char)*key)) {
-+                        key++;
-+                }
-+                if (!g_ascii_strncasecmp (condition_string, "if-session", len) && key) {
-+                        kind = GSM_CONDITION_IF_SESSION;
-+                } else if (!g_ascii_strncasecmp (condition_string, "unless-session", len) && key) {
-+                        kind = GSM_CONDITION_UNLESS_SESSION;
-+                }
-+        }
-+
-+        if (kind == GSM_CONDITION_UNKNOWN) {
-                 key = NULL;
--                kind = GSM_CONDITION_UNKNOWN;
-         }
- 
-         if (keyp != NULL) {
-@@ -364,6 +383,12 @@ setup_condition_monitor (GsmAutostartApp *app)
-                                                                           gconf_condition_cb,
-                                                                           app, NULL, NULL);
-                 g_object_unref (client);
-+        } else if (kind == GSM_CONDITION_IF_SESSION) {
-+                /* We treat GNOME 2.32 as the same as gnome-fallback */
-+                disabled = strcmp ("gnome-fallback", key) != 0;
-+        } else if (kind == GSM_CONDITION_UNLESS_SESSION) {
-+                /* We treat GNOME 2.32 as the same as gnome-fallback */
-+                disabled = strcmp ("gnome-fallback", key) == 0;
-         } else {
-                 disabled = TRUE;
-         }
-@@ -647,6 +672,12 @@ is_conditionally_disabled (GsmApp *app)
-                 g_assert (GCONF_IS_CLIENT (client));
-                 disabled = !gconf_client_get_bool (client, key, NULL);
-                 g_object_unref (client);
-+        } else if (kind == GSM_CONDITION_IF_SESSION) {
-+                /* We treat GNOME 2.32 as the same as gnome-fallback */
-+                disabled = strcmp ("gnome-fallback", key) != 0;
-+        } else if (kind == GSM_CONDITION_UNLESS_SESSION) {
-+                /* We treat GNOME 2.32 as the same as gnome-fallback */
-+                disabled = strcmp ("gnome-fallback", key) == 0;
-         } else {
-                 disabled = TRUE;
-         }
--- 
-1.7.3.4
-
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch
deleted file mode 100644
index 9c272375e3eb..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.1-gsettings-conditions.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- gnome-session/gsm-autostart-app.c.old	2011-09-12 11:06:20.552420744 +0200
-+++ gnome-session/gsm-autostart-app.c	2011-09-12 11:18:39.934966203 +0200
-@@ -66,6 +66,7 @@
- 
-         GFileMonitor         *condition_monitor;
-         guint                 condition_notify_id;
-+        GSettings            *condition_settings;
- 
-         int                   launch_type;
-         GPid                  pid;
-@@ -164,6 +165,8 @@
-                 kind = GSM_CONDITION_UNLESS_EXISTS;
-         } else if (!g_ascii_strncasecmp (condition_string, "GNOME", len)) {
-                 kind = GSM_CONDITION_GNOME;
-+        } else if (!g_ascii_strncasecmp (condition_string, "GSettings", len)) {
-+                kind = GSM_CONDITION_GSETTINGS;
-         } else if (!g_ascii_strncasecmp (condition_string, "GNOME3", len)) {
-                 condition_string = key;
-                 space = condition_string + strcspn (condition_string, " ");
-@@ -289,6 +292,81 @@
- }
- 
- static void
-+gsettings_condition_cb (GSettings  *settings,
-+                        const char *key,
-+                        gpointer    user_data)
-+{
-+        GsmApp                 *app;
-+        GsmAutostartAppPrivate *priv;
-+        gboolean                condition;
-+        
-+        g_return_if_fail (GSM_IS_APP (user_data));
-+        
-+        app = GSM_APP (user_data);
-+        
-+        priv = GSM_AUTOSTART_APP (app)->priv;
-+        
-+        condition = g_settings_get_boolean (settings, key);
-+        
-+        g_debug ("GsmAutostartApp: app:%s condition changed condition:%d",
-+                gsm_app_peek_id (app),
-+                condition);
-+                
-+        /* Emit only if the condition actually changed */
-+        if (condition != priv->condition) {
-+                priv->condition = condition;
-+                g_signal_emit (app, signals[CONDITION_CHANGED], 0, condition);
-+        }
-+}
-+
-+static gboolean
-+setup_gsettings_condition_monitor (GsmAutostartApp *app,
-+                                  const char      *key)
-+{
-+        GSettings *settings;
-+        const char * const *schemas;
-+        char **elems;
-+        gboolean schema_exists;
-+        guint i;
-+        gboolean retval;
-+        char *signal;
-+        
-+        elems = g_strsplit (key, " ", 2);
-+        if (elems == NULL)
-+                return FALSE;
-+        if (elems[0] == NULL || elems[1] == NULL) {
-+                g_strfreev (elems);
-+                return FALSE;
-+        }
-+        
-+        schemas = g_settings_list_schemas ();
-+        schema_exists = FALSE;
-+        for (i = 0; schemas[i] != NULL; i++) {
-+                if (g_str_equal (schemas[i], elems[0])) {
-+                        schema_exists = TRUE;
-+                        break;
-+                }
-+        }
-+        
-+        if (schema_exists == FALSE)
-+                return FALSE;
-+                
-+        settings = g_settings_new (elems[0]);
-+        retval = g_settings_get_boolean (settings, elems[1]);
-+        
-+        signal = g_strdup_printf ("changed::%s", elems[1]);
-+        g_signal_connect (G_OBJECT (settings), signal,
-+                          G_CALLBACK (gsettings_condition_cb), app);
-+        g_free (signal);
-+        
-+        app->priv->condition_settings = settings;
-+        
-+        g_strfreev (elems);
-+        
-+        return retval;
-+}
-+
-+static void
- setup_condition_monitor (GsmAutostartApp *app)
- {
-         guint    kind;
-@@ -383,6 +461,8 @@
-                                                                           gconf_condition_cb,
-                                                                           app, NULL, NULL);
-                 g_object_unref (client);
-+        } else if (kind == GSM_CONDITION_GSETTINGS) {
-+                disabled = !setup_gsettings_condition_monitor (app, key);
-         } else if (kind == GSM_CONDITION_IF_SESSION) {
-                 /* We treat GNOME 2.32 as the same as gnome-fallback */
-                 disabled = strcmp ("gnome-fallback", key) != 0;
-@@ -578,6 +658,11 @@
-                 priv->condition_string = NULL;
-         }
- 
-+        if (priv->condition_settings) {
-+                g_object_unref (priv->condition_settings);
-+                priv->condition_settings = NULL;
-+        }
-+        
-         if (priv->desktop_file) {
-                 egg_desktop_file_free (priv->desktop_file);
-                 priv->desktop_file = NULL;
-@@ -672,6 +757,12 @@
-                 g_assert (GCONF_IS_CLIENT (client));
-                 disabled = !gconf_client_get_bool (client, key, NULL);
-                 g_object_unref (client);
-+        } else if (kind == GSM_CONDITION_GSETTINGS &&
-+                   priv->condition_settings != NULL) {
-+                char **elems;
-+                elems = g_strsplit (key, " ", 2);
-+                disabled = !g_settings_get_boolean (priv->condition_settings, elems[1]);
-+                g_strfreev (elems);
-         } else if (kind == GSM_CONDITION_IF_SESSION) {
-                 /* We treat GNOME 2.32 as the same as gnome-fallback */
-                 disabled = strcmp ("gnome-fallback", key) != 0;
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch b/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch
deleted file mode 100644
index 4fb215151d12..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.1-idle-transition.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 861313503a741f0129611ca005cf6d7c27124b54 Mon Sep 17 00:00:00 2001
-From: Christopher Halse Rogers <chalserogers@gmail.com>
-Date: Thu, 26 May 2011 09:09:14 +0000
-Subject: gsm: Fix race condition in idle monitor
-
-In _xsync_alarm_set(), the positive and negative transition intervals
-are set to the same value. However, the SYNC extension defines the
-positive transition as set when the counter goes from strictly below the
-threshold to greater than or equal to the threshold and similarly a
-negative transition is triggered when the counter goes form strictly
-greater than the threshold to less than or equal to the threshold.
-
-Thus in the current set up there's a chance that the positive transition
-can trigger, marking the session as idle, and some user input occur on
-the same click so the IDLETIME count will hit the threshold but not go
-above so the negative transition will not trigger. Thus the session will
-not be marked as active.
-
-The negative transition threshold should be set to 1ms less than the
-positive transition to ensure that it always fires.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=627903
----
-diff --git a/gnome-session/gs-idle-monitor.c b/gnome-session/gs-idle-monitor.c
-index cd38dcb..d25144f 100644
---- a/gnome-session/gs-idle-monitor.c
-+++ b/gnome-session/gs-idle-monitor.c
-@@ -463,6 +463,7 @@ _xsync_alarm_set (GSIdleMonitor      *monitor,
-                 watch->xalarm_positive = XSyncCreateAlarm (monitor->priv->display, flags, &attr);
-         }
- 
-+        attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1);
-         attr.trigger.test_type = XSyncNegativeTransition;
-         if (watch->xalarm_negative != None) {
-                 g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld",
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
deleted file mode 100644
index 3f28c2b2a60d..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 12 Nov 2013 13:32:45 +0000
-Subject: data: blacklist nv25
-
-It doesn't work very well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711347
----
-diff --git a/data/hardware-compatibility b/data/hardware-compatibility
-index 927ba8b..48b7946 100644
---- a/data/hardware-compatibility
-+++ b/data/hardware-compatibility
-@@ -27,3 +27,6 @@
- 
- # Gallium has softpipe; we explicitly enable llvmpipe
- -softpipe
-+
-+# nouveau vieux NV25 doesn't work too well
-+-Mesa DRI nv25
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch
deleted file mode 100644
index e76f433a9c1b..000000000000
--- a/gnome-base/gnome-session/files/gnome-session-3.8.4-presence-crash.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 90714db611d6ced5202421ef3ba99334f1e9e6ec Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 01 Nov 2013 20:30:06 +0000
-Subject: Fix a possible crash in the presence interface
-
-Improper error handling in gsm_presence_set_status_text() would
-lead to a double free on the next call to that function.
-Found using the dfuzzer tool,
-https://github.com/matusmarhefka/dfuzzer
----
-diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c
-index f6a022f..93ca1a0 100644
---- a/gnome-session/gsm-presence.c
-+++ b/gnome-session/gsm-presence.c
-@@ -365,6 +365,7 @@ gsm_presence_set_status_text (GsmPresence  *presence,
-         g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE);
- 
-         g_free (presence->priv->status_text);
-+	presence->priv->status_text = NULL;
- 
-         /* check length */
-         if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) {
-@@ -377,11 +378,11 @@ gsm_presence_set_status_text (GsmPresence  *presence,
- 
-         if (status_text != NULL) {
-                 presence->priv->status_text = g_strdup (status_text);
--        } else {
--                presence->priv->status_text = g_strdup ("");
-         }
-+
-         g_object_notify (G_OBJECT (presence), "status-text");
--        g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, presence->priv->status_text);
-+        g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0,
-+                       presence->priv->status_text ? presence->priv->status_text : "");
-         return TRUE;
- }
- 
-@@ -457,7 +458,7 @@ gsm_presence_get_property (GObject    *object,
-                 g_value_set_uint (value, self->priv->status);
-                 break;
-         case PROP_STATUS_TEXT:
--                g_value_set_string (value, self->priv->status_text);
-+                g_value_set_string (value, self->priv->status_text ? self->priv->status_text : "");
-                 break;
-         case PROP_IDLE_ENABLED:
-                 g_value_set_boolean (value, self->priv->idle_enabled);
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild b/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
deleted file mode 100644
index d87475aa2e45..000000000000
--- a/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1-r3.ebuild,v 1.13 2014/06/01 08:03:47 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 elibc_FreeBSD"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# >=gconf-3.2.6 no longer provides gconf-sanity-check-2
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.22.0:2
-	>=dev-libs/dbus-glib-0.76
-	>=gnome-base/gconf-2:2[gtk(+)]
-	<gnome-base/gconf-3.2.6
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXtst
-	x11-apps/xdpyinfo
-
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-pkg_setup() {
-	# TODO: convert libnotify to a configure option
-	G2CONF="${G2CONF}
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--with-default-wm=gnome-wm
-		--with-gtk=2.0
-		$(use_enable doc docbook-docs)
-		$(use_enable ipv6)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	# Add "session saving" button back, upstream bug #575544
-	epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch"
-
-	# Fix support for GNOME3 conditions, bug #XXXXXX
-	epatch "${FILESDIR}/${PN}-2.32.1-gnome3-conditions.patch"
-
-	# Also support Gsettings conditions to work with libcanberra
-	epatch "${FILESDIR}/${PN}-2.32.1-gsettings-conditions.patch"
-
-	# gsm: Fix race condition in idle monitor
-	epatch "${FILESDIR}/${PN}-2.32.1-idle-transition.patch"
-
-	# Fix dialog size
-	epatch "${FILESDIR}/${PN}-2.32.1-dialog-size.patch"
-	epatch "${FILESDIR}/${PN}-2.32.1-dialog-size2.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	dodir /usr/share/gnome/applications/
-	insinto /usr/share/gnome/applications/
-	doins "${FILESDIR}/defaults.list"
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/15-xdg-data-gnome"
-
-	# This should be done here as discussed in bug #270852
-	doexe "${FILESDIR}/10-user-dirs-update-gnome"
-}
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 84f71e7eced9..e97c76526fa3 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.146 2014/10/01 12:21:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.147 2014/11/13 11:34:49 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-settings-daemon-2.32.1-lcdfilter.patch,
+  -files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch,
+  -files/gnome-settings-daemon-2.32.1-libnotify-init.patch,
+  -files/gnome-settings-daemon-2.32.1-media-keys-react.patch,
+  -files/gnome-settings-daemon-2.32.1-netfs-monitor.patch,
+  -files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch,
+  -gnome-settings-daemon-2.32.1-r2.ebuild:
+  Drop old (#508854)
 
 *gnome-settings-daemon-3.12.3 (01 Oct 2014)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 8ebc2dc71732..c718dbf1b0d5 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,27 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnome-settings-daemon-2.32.1-lcdfilter.patch 1749 SHA256 6aaf4fe50034de4c403850df25a93e371a94486af9629f4d3cc70863abbfb3ae SHA512 7ef482265b6eea94e742cb4f0c5b39e92ce9186fd9e80073feceddae1a48a8812ce4abc58d8fd20755e0aeccf5b9dcfbedf1e3d17c83b9fb87637793a1d2e1e6 WHIRLPOOL 2372b8a3026bcbdce3b4f78c836f4157746942275b5bc43ed1429a298d02cc3f4c7608bad6052a170526666aa8b3fec2d6795c04f2fd6cd163e726609caa8c21
-AUX gnome-settings-daemon-2.32.1-libnotify-0.7.patch 3490 SHA256 da836e61ddaea8b3a90692951296a28c4533e1e117412a0602f6c76e564e837d SHA512 b78bc5055457bf929f6f74da68d4df2873f985bb2d016d26092be6e61d9f53d20d4fbca1a4454a8e32a5879e41c754108120113ba4afbaac1a40712bc939a745 WHIRLPOOL cb56b2920659174fd942737094ba8046596524f15e9a65ec80b25a0d73a96edff06a92121a7a7e7dde1ccadd05e4e77b54774b75a8f045c3cb705f3c44c88a16
-AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 SHA256 3f81b1bf76b4e01fe6264be0de987fe9d346eee305a898dca630dea7d77b61f3 SHA512 4286162da82f669d9141861a9ae13b770aaa0228a4fa89dbdb250f4a901c9f2f3280519b1efbc74454f36c6c1567465bf04f0d355b7648ca437bb17ae6fe8a7b WHIRLPOOL 75d8bdc9f6fe3eff26b4148a8ea68edfd4d752512635ef1d939810f9ebb82863a8fd0a0123cf963b24ec942d33e93535c96b061cb18103f298e3db32be4e0e43
-AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 SHA256 9d56379de2c2cc83ffd4c40f7ab4c913647fefc54a1978ca0c5a4300bf3abec2 SHA512 88feac8fc90905f733734cbd82b3bdd6313a14b90f5c0cb116ec2edf243b9fd6a54bba41eb11f8e14c167b8be4b38904053f23e2d4c9c1a4adb8d099340170f0 WHIRLPOOL 9251a06f67908ed4b54b816b431c6b0d63dcc85b007b4fa7beeb26f04aa6ab727eb24846eafb7d15ec075f9df9b689fc0a042b7209540536e7a75a4ba4267a2e
-AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9 SHA512 20e4a503241204986c784e1a35287900025734af8a17ed81447f8c71b03def83e90e485f1f3e73ce86e73f6f2a913d262bf14b1a0a4cd67609ebfadd862eb11f WHIRLPOOL 9aa94447bf256f9262f793ababc4ab057b388344857aa3ead252a79486e157e15973609cccc2500861fb1975ae626b19eba4b0ce55d41df6833a56f45340063f
-AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0 SHA512 86f8baa39280bce8ae586bc31ad67e730589a6d56c51c85608df562e034faa64725798637ab2ec04ef416d8a9f23c136c0605a0941783900fcfdffa2bae530e9 WHIRLPOOL f99c386c75376808c3fbaefbe77cf719a8f9ca5b05fa41458e7db4c39d927c40400aa3cc998bc945d3a3b75d707063434e5160705d0914bef71ac06f7067cb64
 AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe
 AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
-DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
-DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 SHA512 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a WHIRLPOOL 6608a9470666d943e0f39a4cadb36a1ccffbe8b40bcdae97d93b3d9b676da0c3efb33d5be1accaf2066760de6a4a36db16c94a093965f2f8da29511464ec2071
 DIST gnome-settings-daemon-3.12.2.tar.xz 1672512 SHA256 e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f SHA512 d8063933ace4dfc9943991b5e6d29811546dec362cd3e26ec3c1c355ee2bbb854fb6fcc37ebaee78d70342ea2f6ae46325712dc6e20e6404ed54b0ee81c4bb8c WHIRLPOOL 977b689616645329dddeb515e0353927d901c8abf0f8033dd1fca245c77b71477249c5fd1abf82cb8ada25ec0d37a97eaf3af1f9d972f7d983d9e16aee4cd2c5
 DIST gnome-settings-daemon-3.12.3.tar.xz 1632208 SHA256 4a92ad7090e76d621be181a48ede75a8da310e86e85d16cd82a9f5cf20297dbc SHA512 0e1f7a61c449ba0785f0d26cc681fe412c57b555aea4d4ac47f83c85147c4d1940c5a563b88e947728543822366703c7939bceaecc0b5f68817d87950a0de09d WHIRLPOOL bb9393e71d64f5b221082cff04b29c2b4eace0d0e56f547d1bafa4098d9dcfd9c953d73defaa8e3da1b060992c14717f06675a192e46dc7d262522331f8c0f2c
-EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
 EBUILD gnome-settings-daemon-3.12.2.ebuild 4315 SHA256 e5678387e248c37a401097c471c84260caf512a66dc49dedab1dd3f9a79b21b0 SHA512 0ce16e3777c9ddea09fb1f75ec61d7e575ebb9b3403e78389406f7ac686dfdd12f0641b60f33a64ecb1d24cfa48a57eff9147afa88f4574f94ec7f8f24742ee4 WHIRLPOOL ffcc3d1072cae660e6e789a79424a0d9df12739a9c8267161e3c7ed53ebc7e0b1ecd3fac784472db4236b50066903a352dc52f2ca773076820e6692ec75a382f
 EBUILD gnome-settings-daemon-3.12.3.ebuild 4317 SHA256 a3703c73dd06cf99478ebc857b81350154ae7f03744268e77b0a2480b1ac3603 SHA512 939b68775fabf72a4eb548cfe5ed0461a98319267890f7272dc0601183f93bb66a9c697f81a12930a40fba80374e85f4b2b5c732245ffcc284a7c0c82aa2afe4 WHIRLPOOL 1c9fcdd5d938f250b990018319787cab8d5f1992d5eedb12136ddaa202db674d10dfa506ad2792d71c61151196fbb85d22df123270fab5439a716a7e5d7d96d6
-MISC ChangeLog 30043 SHA256 ee9b1240c92671c002888e5e2cc744e13410281fbf33fc0d242f30380698fd35 SHA512 877dbc36e00796be19bea7aed1f8f419adf52dad8429700b3f4e9c5216991fcf54174030ff7336dc96200fac5aad8b0260a367836dc45189125e9cba1535ad34 WHIRLPOOL 309b4d274e6909138b7bc0153b83bc8d6d51795ab1140677c623d93e106194b8bad649c92ecec570bd96c6dc47ae15b71da143de56eee15759a4aaef92c6995f
+MISC ChangeLog 30509 SHA256 fff799b83170373acff014a2e664d732aee5a036ac960957314b0d3b07bb6a39 SHA512 9a3180b276c394480d15052a77c291bc274781d5c417a05035c9f68c456a07ac42c101a74951e951364c78f21c957d709cf09272cea08c12d7c91801ec3dca90 WHIRLPOOL dc06adeacff89eed89d28b7cb9c318f454f538e00119f00807f5353ea8f77b0029a5a9899b61ec7bae4f7f239a9e31b69ae206f859d23e9b2db77ea1f00a177d
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQr8dsACgkQCaWpQKGI+9SIZgCfS7Eoudk9dPk7lkJ+FQl3/Ecg
-L7EAn1ZUFTegxKpB2Zep6pMVHlaFT0K2
-=qpdE
+iEYEAREIAAYFAlRkl1sACgkQCaWpQKGI+9TT8gCdFQ/dH1CYLT5qWz6btJVzXzIe
+OA8An2YC0P0GBAKu5Vap4nsdvK2qgZBP
+=i9AV
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch
deleted file mode 100644
index 0b01f8434eeb..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6cf315249ab27d4396b0f5b5edb1e689a5cafc68 Mon Sep 17 00:00:00 2001
-From: Chris Coleman <chrsclmn@gmail.com>
-Date: Sat, 16 Oct 2010 00:44:12 +0000
-Subject: xsettings: Export Xft.lcdfilter for OO.o's benefit
-
-Export Xft.lcdfilter legacy setting for the benefit of OpenOffice.org
-which doesn't follow the other fontconfig settings.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631924
----
-diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
-index 0d9df70..8798a9e 100644
---- a/plugins/xsettings/gsd-xsettings-manager.c
-+++ b/plugins/xsettings/gsd-xsettings-manager.c
-@@ -357,6 +357,8 @@ xft_settings_set_xsettings (GnomeXSettingsManager *manager,
-                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/HintStyle", settings->hintstyle);
-                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->dpi);
-                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba);
-+                xsettings_manager_set_string (manager->priv->managers [i], "Xft/lcdfilter",
-+                                              g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none");
-         }
-         gnome_settings_profile_end (NULL);
- }
-@@ -416,6 +418,8 @@ xft_settings_set_xresources (GnomeXftSettings *settings)
-                                 settings->hintstyle);
-         update_property (add_string, "Xft.rgba",
-                                 settings->rgba);
-+        update_property (add_string, "Xft.lcdfilter",
-+                         g_str_equal (settings->rgba, "rgb") ? "lcddefault" : "none");
- 
-         g_debug("xft_settings_set_xresources: new res '%s'", add_string->str);
- 
---
-cgit v0.8.3.1
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index f755f24acddf..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -48,6 +48,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif /* HAVE_LIBNOTIFY */
- 
- #include "gnome-settings-profile.h"
-@@ -608,9 +611,13 @@
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
-+                                                               "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                               );
-+#else
-+                                                               , NULL);
-         notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +754,13 @@
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
-+                                                               "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                               );
-+#else
-+                                                               , NULL);
-         notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -48,6 +48,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "gnome-settings-profile.h"
-@@ -1086,6 +1089,11 @@
- 
-         g_assert (error_to_display == NULL || secondary_text == NULL);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notification = notify_notification_new (primary_text,
-+							error_to_display ? error_to_display->message : secondary_text,
-+							GSD_XRANDR_ICON_NAME);
-+#else
-         if (priv->status_icon)
-                 notification = notify_notification_new_with_status_icon (primary_text,
-                                                                          error_to_display ? error_to_display->message : secondary_text,
-@@ -1096,6 +1104,7 @@
-                                                         error_to_display ? error_to_display->message : secondary_text,
-                                                         GSD_XRANDR_ICON_NAME,
-                                                         NULL);
-+#endif
- 
-         notify_notification_show (notification, NULL); /* NULL-GError */
- #else
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch
deleted file mode 100644
index b1e644f5d51b..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c
---- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2010-11-15 05:11:00.000000000 -0800
-+++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c	2011-03-17 11:52:57.516694024 -0700
-@@ -2530,6 +2530,10 @@
- 
-         manager->priv->current_fn_f7_config = -1;
-         manager->priv->fn_f7_configs = NULL;
-+
-+#ifdef HAVE_LIBNOTIFY
-+        notify_init ("gnome-settings-daemon");
-+#endif /* HAVE_LIBNOTIFY */
- }
- 
- static void
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch
deleted file mode 100644
index 5a2c04555f2d..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c9a6a27aa766b31d9f32d182b1de5886793e906b Mon Sep 17 00:00:00 2001
-From: Rodrigo Moya <rodrigo@gnome-db.org>
-Date: Tue, 19 Apr 2011 13:59:35 +0000
-Subject: media-keys: React to stream-removed signal from GvcMixerControl
-
----
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index b563f73..1f18074 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -794,6 +794,19 @@ on_control_default_sink_changed (GvcMixerControl     *control,
-         update_default_sink (manager);
- }
- 
-+static void
-+on_control_stream_removed (GvcMixerControl     *control,
-+                           guint                id,
-+                           GsdMediaKeysManager *manager)
-+{
-+        if (manager->priv->stream != NULL) {
-+		if (gvc_mixer_stream_get_id (manager->priv->stream) == id) {
-+	                g_object_unref (manager->priv->stream);
-+			manager->priv->stream = NULL;
-+		}
-+        }
-+}
-+
- #endif /* HAVE_PULSE */
- 
- static gint
-@@ -1118,6 +1131,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
-                           "default-sink-changed",
-                           G_CALLBACK (on_control_default_sink_changed),
-                           manager);
-+        g_signal_connect (manager->priv->volume,
-+                          "stream-removed",
-+                          G_CALLBACK (on_control_stream_removed),
-+                          manager);
- 
-         gvc_mixer_control_open (manager->priv->volume);
- 
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch
deleted file mode 100644
index 58150e56dd17..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 54ce24f4947256e1991970eed40bafd1b7028cf6 Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@debian.org>
-Date: Tue, 12 Oct 2010 19:19:44 +0000
-Subject: housekeeping: More network filesystems not to monitor
-
-https://bugzilla.gnome.org/show_bug.cgi?id=606421
----
-diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
-index e1385ea..2fcc523 100644
---- a/plugins/housekeeping/gsd-disk-space.c
-+++ b/plugins/housekeeping/gsd-disk-space.c
-@@ -304,25 +304,41 @@ ldsm_mount_should_ignore (GUnixMountEntry *mount)
-          * expose this in a way that allows it to be used for this
-          * purpose
-          */
-+         
-+         /* We also ignore network filesystems */
-                  
-         const gchar *ignore_fs[] = {
-+                "adfs",
-+                "afs",
-                 "auto",
-                 "autofs",
-+                "autofs4",
-+                "cifs",
-+                "cxfs",
-                 "devfs",
-                 "devpts",
-                 "ecryptfs",
-+                "gfs",
-+                "gfs2",
-                 "kernfs",
-                 "linprocfs",
-+                "linsysfs",
-+                "lustre",
-+                "lustre_lite",
-+                "ncpfs",
-+                "nfs",
-+                "nfs4",
-+                "nfsd",
-+                "ocfs2",
-                 "proc",
-                 "procfs",
-                 "ptyfs",
-+                "rpc_pipefs",
-                 "selinuxfs",
--                "linsysfs",
-+                "smbfs",
-                 "sysfs",
-                 "tmpfs",
-                 "usbfs",
--                "nfsd",
--                "rpc_pipefs",
-                 "zfs",
-                 NULL
-         };
---
-cgit v0.8.3.1
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch
deleted file mode 100644
index 3476a9d0f286..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f7071bf1f9941f0ba5fe23c645656e70fb2dd699 Mon Sep 17 00:00:00 2001
-From: Pauli Nieminen <suokkos@gmail.com>
-Date: Sat, 15 Jan 2011 19:46:34 +0000
-Subject: mouse: Use event driven mode for syndaemon
-
-In default polling mode syndaemon wakeups 5 times per second. That
-is pretty bad for power consumption with hungry laptop CPUs.
-
-If syndaemon was compiled to include XRecord extension -R parameter
-can be used to select even driven mode. Event driven mode wakeups
-only when there is KeyPress or KeyRelease event. In that time CPU
-is already running so impact for power consumption is lesser.
-
-Signed-off-by: Pauli Nieminen <suokkos@gmail.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639623
----
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
-index 44df57f..0a9c179 100644
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -555,7 +555,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
- {
-         if (state && touchpad_is_present ()) {
-                 GError *error = NULL;
--                char *args[5];
-+                char *args[6];
- 
-                 if (manager->priv->syndaemon_spawned)
-                         return 0;
-@@ -564,7 +564,8 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
-                 args[1] = "-i";
-                 args[2] = "2.0";
-                 args[3] = "-k";
--                args[4] = NULL;
-+                args[4] = "-R";
-+                args[5] = NULL;
- 
-                 if (!g_find_program_in_path (args[0]))
-                         return 0;
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
deleted file mode 100644
index 9aa88ae3bbe5..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild,v 1.10 2013/01/22 07:37:37 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch"
-
-# Old patches:
-# 	mirror://gentoo/${PN}-2.30.0-gst-vol-control-support.patch" -> this causes bug #327609
-# 	mirror://gentoo/${PN}-2.30.2-gst-vol-control-support.patch.bz2" -> this patch has worse problems like bug #339732
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify policykit pulseaudio smartcard"
-
-# libgnomekbd-2.91 breaks API/ABI
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.21.2:2
-	>=gnome-base/gconf-2.6.1:2
-	>=gnome-base/libgnomekbd-2.32.0-r1
-	<gnome-base/libgnomekbd-2.91.0
-	>=gnome-base/gnome-desktop-2.29.92:2
-
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	media-libs/fontconfig
-
-	libnotify? ( >=x11-libs/libnotify-0.4.3 )
-	policykit? (
-		>=sys-auth/polkit-0.91
-		>=dev-libs/dbus-glib-0.71
-		>=sys-apps/dbus-1.1.2 )
-	pulseaudio? (
-		>=media-sound/pulseaudio-0.9.15
-		media-libs/libcanberra[gtk] )
-	!pulseaudio? (
-		>=media-libs/gstreamer-0.10.1.2:0.10
-		>=media-libs/gst-plugins-base-0.10.1.2:0.10 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )"
-
-# 50-accessibility.xml moved to gnome-control-center in gnome-3
-RDEPEND="${COMMON_DEPEND}
-	!>=gnome-base/gnome-control-center-2.91.90"
-
-DEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-control-center-2.22
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		$(use_with libnotify)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable !pulseaudio gstreamer)
-		$(use_enable smartcard smartcard-support)"
-
-	if use pulseaudio; then
-		elog "Building volume media keys using Pulseaudio"
-	else
-		elog "Building volume media keys using GStreamer"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# libnotify-0.7.1 compatibility patches
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-0.7.patch
-	epatch "${FILESDIR}"/${PN}-2.32.1-libnotify-init.patch
-
-	# Restore gstreamer volume control support, upstream bug #571145
-	# Keep using old patch as it doesn't cause problems like bug #339732
-#	epatch "${WORKDIR}/${PN}-2.30.2-gst-vol-control-support.patch"
-#	echo "plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c" >> po/POTFILES.in
-	# We use now debian patch as looks to fix bug #327609
-#	epatch "${DISTDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
-	epatch "${DISTDIR}/${PN}-2.32.1-gst-vol-control-support.patch"
-
-	# More network filesystems not to monitor, upstream bug #606421
-	epatch "${FILESDIR}/${PN}-2.32.1-netfs-monitor.patch"
-
-	# xsettings: Export Xft.lcdfilter for OO.o's benefit, upstream bug #631924
-	epatch "${FILESDIR}/${PN}-2.32.1-lcdfilter.patch"
-
-	# media-keys: React to stream-removed signal from GvcMixerControl
-	epatch "${FILESDIR}/${PN}-2.32.1-media-keys-react.patch"
-
-	# mouse: Use event driven mode for syndaemon
-	epatch "${FILESDIR}/${PN}-2.32.1-syndaemon-mode.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! use pulseaudio; then
-		elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
-		elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
-	fi
-}
diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 2661fbb8e301..e2b2cd8332b6 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.479 2014/07/23 15:16:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.480 2014/11/13 11:35:39 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -gnome-2.32.1-r2.ebuild,
+  -gnome-3.10.0.ebuild:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-3.12.0.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index d71303130d15..82274665b144 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,25 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD gnome-2.32.1-r2.ebuild 5605 SHA256 546ec04fee53bbc1d2df1e65d8e1e4f9b3ae2b3c38fcc9579ac34b51d7c4769f SHA512 a6190bb69584390dcd2c5477172f2f5b7fc7efca59bdab138611fcfb69ccb0d969dd504cd1a6d12cb5f0e9fe53b2636fecf3f750ebc542809981f9d51e3263e3 WHIRLPOOL 16bf5d85a3d4ecb132b2376167bc27f59912eca212614ef84887c0a0f6b68b7292fd3751ee668f890e6e6058e23318c01141664eaf344e65eecc5d3040f9b72e
-EBUILD gnome-3.10.0.ebuild 2503 SHA256 1155b153745d1f1a5cb5668a6190217547a1c91e935a201f5d50981203f45747 SHA512 2f7e22f8d4098f6753676439a55fb9184f88d38d78432a4ef3a3bff6f19aa4dc0f069b1a941a2217239c352f4b1eb4a5a488e3256e383e5ebbfc914524407f85 WHIRLPOOL 65edcd3249d6cbc61c854c9cf6c15c6a6786d433c2ea3ff4b2ee621b8f9918595edee5ec2ab7ff9f17082d1ce44576538008e1ab779f783e529dec94ec466fbe
 EBUILD gnome-3.12.0.ebuild 1400 SHA256 6dc6f5d65c4d7ead44d07640417a0ac71a79c08c6f191e3d85b1ad7b035af6e7 SHA512 fb7823777a645d3617e097799a5daf28ba7807fc5c2a29cc67cbdd5d322a5f7470757b06661e84f9d6d3661ffb607fa16f9c42b44d858a0fd43466e572b17b4c WHIRLPOOL 8f24f723774c6c44da54a47945b060f5f5498b9666b5ab7a3e031b7c562ccf1cafd9a32b98802ecd5c075534e6302fb029a633a1fb34203a1bc1d4cec5e453a9
-MISC ChangeLog 64461 SHA256 5d3a341092b8b1d5b6d6411f7a0bd06e72e6ff8b8174c13d58efc6745bf98769 SHA512 7d259e99bb2ed156e1ef22e654e3415a4730956c9a2af286ee1ce6bb8b7e0850af138952240fadc26cfe7ad80738bb7384a53b523b559fb55a19f299ca909fb1 WHIRLPOOL 25f635512ac544a91f61b85ec280ec5c43f5bddad0d6b99c102ccb31d75803d84d57785f4551255f5fba030aec58b2379b3a840aeef62447f28efd1e3d8e07cc
+MISC ChangeLog 64580 SHA256 125e5afbf713f666a0a29c2bce9eb452d939faaef47887f8c36434af8b5f643f SHA512 f6661289276daa530936bf1acc438f54813314161603545e39f79334cef8b0b89bfd8cacf23bb11df33ebb277a4187ab802c93b613168e2731e2ba4fea83cdc2 WHIRLPOOL 22e4996e5e49449eab5ecab2e4513ce5514297239a151d8fe1bf00aaee0bad012f937b77c04b01bc2aad25c87e3bf8412b720eaae5f00cba415c9c46f8de2cd8
 MISC metadata.xml 359 SHA256 a123b48931af960d6560ab073b93393c3dd546936190266e1444a20212d3e24e SHA512 171fc2c7bb6a9daedbe06e0f156df05e11dce9158977f0af6791690bfd0d8a167122166e13ecaf8d0e48091eb5f4d4f80d71a24215a67e78d0e275b1cdc51fdf WHIRLPOOL ac20ea9b7bfdc90e947b79b41c290e4f2277a1e5d26f63b2e0dea51e28fc0fe7d7b9f6088be5482b2e6d31c271ec97ac6b1b5b027e1a1a3935389dd0c6ee700d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9HcAAoJELp701BxlEWf8bIP/1oOy7daJvK2IoVIqO+qB89C
-F2+y8LHbGDuwQQiRbVfz8tOYeI2SpRSbgOn0eHMS0LeQbv8Vd19KvvHopPj5ltAs
-yn64SdNKuyEqq2Bg7gnrMp0Hff6DxWVcs8DyTRThgDngwRKEebcGxoUaLwG9t3As
-2+TKXewv80oSB6WAAkGAmbfE32p8hRTRRikMfQjLkNxOGhp/jQNOhUjqIiDkmZxo
-0yBu3LeEPikyqOmqP9drYpU1Qr0APDyxmGBMfyvyTL1k+Ztj88LfO5LcyQOUNT4C
-HKlTPWvBJYewrSppyqjTxYj8sGPI936fD1nqF1MNyZ/BMH5N2cIqUQOJ+c4C3LSq
-XTR0ES62IYulk3jcTBAmlLrEaqX/1aRztOAUO0bSKJIAAoVz0Nis4VLlh6YxGurs
-sCPhY6H4U15sRH1xsjH3vMHhO3yg2ex9iSHTp6RqbL7kjBstPAw1DvSqFeXbLzIV
-bk8WMfoTjggyo1UJyowGQcKJKr1ZL7cH1RCeftNebrvXnkLAfXrb6rJV7Sn94VuX
-8gd7fWvQ8e775TsIY7fcH4B88OSGdWXKi8HMpcSkgOyGpo87u/ctmhl33vaLOhBb
-EoMgl7JKoqQR5CeRwFm1/nOgohO4a0t3ZVIvE7Lye00edm9RuV0Qqg/Ysu5iUysR
-yY1fFJ76gY/rBGRRbqq6
-=N6PD
+iEYEAREIAAYFAlRkl4wACgkQCaWpQKGI+9T4yQCeNlx+r4V/y4N8xxsXoHlLb//m
+zaAAnRKudaCH9tDfja6MRsM7f6AGmMfm
+=CG1k
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome/gnome-2.32.1-r2.ebuild b/gnome-base/gnome/gnome-2.32.1-r2.ebuild
deleted file mode 100644
index 1984e3c84c67..000000000000
--- a/gnome-base/gnome/gnome-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.32.1-r2.ebuild,v 1.12 2013/10/04 15:03:09 tetromino Exp $
-
-EAPI="4"
-
-DESCRIPTION="Meta package for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-
-IUSE="accessibility cdr cups dvdr ldap mono policykit"
-
-S=${WORKDIR}
-
-# FIXME: bump gstreamer to 0.10.26
-# XXX: lower gdm to 2.20 since we still keep 2.28 masked
-# Lower epiphany to 2.26 since 2.28 is not ready to go stable
-RDEPEND="!<x11-libs/gtk+-3.2.4-r1:3
-	>=dev-libs/glib-2.26.1:2
-	>=x11-libs/gtk+-2.22.1-r1:2
-	>=x11-libs/gdk-pixbuf-2.22.1:2
-	>=dev-libs/atk-1.32.0
-	>=x11-libs/pango-1.28.3
-
-	>=dev-libs/libxml2-2.7.2:2
-	>=dev-libs/libxslt-1.1.22
-
-	>=media-libs/audiofile-0.2.7
-	>=x11-libs/libxklavier-5.0
-	>=media-libs/libart_lgpl-2.3.21
-
-	>=dev-libs/libIDL-0.8.14
-	>=gnome-base/orbit-2.14.19:2
-
-	>=x11-libs/libwnck-2.30.6:1
-	>=x11-wm/metacity-2.30.3
-
-	>=gnome-base/gnome-keyring-2.32.1
-	>=gnome-base/libgnome-keyring-2.32.0
-	>=app-crypt/seahorse-2.32.0
-
-	>=gnome-base/gconf-2.32.0-r1:2
-	>=net-libs/libsoup-2.32.1:2.4
-	>=gnome-base/dconf-0.5.1-r2
-
-	>=gnome-base/libbonobo-2.24.3
-	>=gnome-base/libbonoboui-2.24.4
-	>=gnome-base/libgnome-2.32.0
-	>=gnome-base/libgnomecanvas-2.30.2
-	>=gnome-base/libglade-2.6.4:2.0
-
-	>=gnome-extra/bug-buddy-2.32.0:2
-	>=gnome-base/libgnomekbd-2.32.0
-	>=gnome-base/gnome-settings-daemon-2.32.1
-	>=gnome-base/gnome-control-center-2.32.0:2
-
-	>=gnome-base/nautilus-2.32.1
-
-	>=media-libs/gstreamer-0.10.30.2:0.10
-	>=media-libs/gst-plugins-base-0.10.30.4:0.10
-	>=media-libs/gst-plugins-good-0.10.23:0.10
-	>=gnome-extra/gnome-media-2.32.0:2
-	<gnome-extra/gnome-media-2.91:2
-	>=media-sound/sound-juicer-2.32.0
-	>=dev-libs/totem-pl-parser-2.32.1
-	>=media-video/totem-2.32.0
-	>=media-video/cheese-2.32.0
-
-	>=media-gfx/eog-2.32.1:1
-
-	>=www-client/epiphany-2.30.6
-	>=app-arch/file-roller-2.32.1
-	>=gnome-extra/gcalctool-5.32.1
-
-	>=gnome-extra/gconf-editor-2.32.0
-	>=gnome-base/gdm-2.20.11
-	>=x11-libs/gtksourceview-2.10.5:2.0
-	>=app-editors/gedit-2.30.4
-
-	>=app-text/evince-2.32.0
-
-	>=gnome-base/gnome-desktop-2.32.1:2
-	>=gnome-base/gnome-session-2.32.1
-	>=dev-libs/libgweather-2.30.3:2
-	<dev-libs/libgweather-2.91:2
-	>=gnome-base/gnome-applets-2.32.0
-	>=gnome-base/gnome-panel-2.32.1
-	>=gnome-base/gnome-menus-2.30.5
-	>=x11-themes/gnome-icon-theme-2.31.0
-	>=x11-themes/gnome-themes-2.32.1-r1
-	>=x11-themes/gnome-themes-standard-3.0.2
-	>=gnome-extra/deskbar-applet-2.32.0
-	>=gnome-extra/hamster-applet-2.32.1
-
-	>=x11-themes/gtk-engines-2.20.2:2
-	>=x11-themes/gnome-backgrounds-2.32.0
-
-	>=x11-libs/vte-0.26.2:0
-	>=x11-terms/gnome-terminal-2.32.1
-
-	>=gnome-extra/gucharmap-2.32.1
-
-	>=gnome-extra/gnome-utils-2.32.0
-
-	>=gnome-extra/gnome-games-2.28.2
-	>=gnome-base/librsvg-2.32.1:2
-
-	>=gnome-extra/gnome-system-monitor-2.28.2
-	>=gnome-base/libgtop-2.28.2:2
-
-	>=x11-libs/startup-notification-0.10
-
-	>=gnome-extra/gnome-user-docs-2.32.0
-	>=gnome-extra/yelp-2.30.2
-	>=gnome-extra/zenity-2.32.1
-
-	>=net-analyzer/gnome-netstatus-2.28.2
-	>=net-analyzer/gnome-nettool-2.32.0
-
-	cdr? ( >=app-cdr/brasero-2.32.1 )
-	dvdr? ( >=app-cdr/brasero-2.32.1 )
-
-	>=gnome-extra/gtkhtml-3.32.1:3.14
-	>=mail-client/evolution-2.32.1-r1:2.0
-	>=gnome-extra/evolution-data-server-2.32.1-r1
-	>=gnome-extra/evolution-webcal-2.32.0
-
-	>=net-misc/vino-2.32.0
-
-	>=app-admin/pessulus-2.30.4
-	ldap? (	>=app-admin/sabayon-2.30.1 )
-
-	>=gnome-extra/gnome-screensaver-2.30.2
-	>=x11-misc/alacarte-0.13.2
-	>=gnome-extra/gnome-power-manager-2.32.0
-
-	>=net-misc/vinagre-2.30.3
-
-	accessibility? (
-		>=gnome-extra/libgail-gnome-1.20.3
-		>=gnome-extra/at-spi-1.32.0:1
-		>=app-accessibility/dasher-4.11
-		>=app-accessibility/gnome-mag-0.16.3:1
-		>=app-accessibility/gnome-speech-0.4.25:1
-		>=app-accessibility/gok-2.30.1:1
-		>=app-accessibility/orca-2.32.1
-		>=gnome-extra/mousetweaks-2.32.1 )
-	cups? ( >=app-admin/system-config-printer-gnome-1.3.3 )
-
-	mono? (
-		>=dev-dotnet/gtk-sharp-2.12.10:2
-		>=app-misc/tomboy-1.4.2 )
-	policykit? ( gnome-extra/polkit-gnome )"
-DEPEND=""
-PDEPEND="|| ( >=gnome-base/gvfs-1.6.6[gdu] >=gnome-base/gvfs-1.6.6[udisks] )"
-# Broken from assumptions of gnome-vfs headers being included in nautilus headers,
-# which isn't the case with nautilus-2.22, bug #216019
-#	>=app-admin/gnome-system-tools-2.32.0
-#	>=app-admin/system-tools-backends-2.8
-
-# Development tools
-#   scrollkeeper
-#   pkgconfig
-#   intltool
-#   gtk-doc
-#   gnome-doc-utils
-
-pkg_postinst() {
-# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
-# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
-# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
-#	elog "Note that to change windowmanager to metacity do: "
-#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-#	elog "of course this works for all other window managers as well"
-
-	elog "The main file alteration monitoring functionality is"
-	elog "provided by >=glib-2.16. Note that on a modern Linux system"
-	elog "you do not need the USE=fam flag on it if you have inotify"
-	elog "support in your linux kernel ( >=2.6.13 ) enabled."
-	elog "USE=fam on glib is however useful for other situations,"
-	elog "such as Gentoo/FreeBSD systems. A global USE=fam can also"
-	elog "be useful for other packages that do not use the new file"
-	elog "monitoring API yet that the new glib provides."
-	elog
-}
diff --git a/gnome-base/gnome/gnome-3.10.0.ebuild b/gnome-base/gnome/gnome-3.10.0.ebuild
deleted file mode 100644
index b37210f79eba..000000000000
--- a/gnome-base/gnome/gnome-3.10.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.10.0.ebuild,v 1.6 2014/07/05 09:22:08 klausman Exp $
-
-EAPI="5"
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="accessibility +bluetooth +classic +cdr cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-# GDM-3.0 integrates very nicely with GNOME Shell
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
-
-	>=gnome-base/gdm-${PV}
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-
-	>=x11-themes/gnome-backgrounds-${PV}
-	>=x11-themes/gnome-icon-theme-extras-3.6.2
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.10
-		>=app-accessibility/at-spi2-core-2.10
-		>=app-accessibility/caribou-0.4.13
-		>=app-accessibility/orca-${PV}
-		>=gnome-extra/mousetweaks-${PV} )
-	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-
-DEPEND=""
-
-PDEPEND="|| ( >=gnome-base/gvfs-1.18[udisks] >=gnome-base/gvfs-1.18[gdu] )"
-
-# Broken from assumptions of gnome-vfs headers being included in nautilus headers,
-# which isn't the case with nautilus-2.22, bug #216019
-#	>=app-admin/gnome-system-tools-2.32.0
-#	>=app-admin/system-tools-backends-2.8
-
-# Not ported:
-#   bug-buddy-2.32
-#   sound-juicer-2.32
-#
-# Not ported, don't build:
-#	gnome-extra/evolution-webcal-2.32.0
-
-# These don't work with gsettings/dconf
-#	>=app-admin/pessulus-2.30.4
-#	ldap? (	>=app-admin/sabayon-2.30.1 )
-
-# I'm not sure what all is in a11y for GNOME 3 yet ~nirbheek
-#	accessibility? (
-#		>=gnome-extra/libgail-gnome-1.20.3
-#		>=gnome-extra/at-spi-1.32.0:1
-#		>=app-accessibility/dasher-4.11
-#		>=app-accessibility/gnome-mag-0.16.3:1
-#		>=app-accessibility/gnome-speech-0.4.25:1
-#		>=app-accessibility/gok-2.30.1:1
-#		>=app-accessibility/orca-2.32.1
-#		>=gnome-extra/mousetweaks-2.32.1 )
-
-# Useless with GNOME Shell
-#	>=gnome-extra/deskbar-applet-2.32.0
-#	>=gnome-extra/hamster-applet-2.32.1
-
-# Development tools
-#   scrollkeeper
-#   pkgconfig
-#   intltool
-#   gtk-doc
-#   gnome-doc-utils
-#   itstool
-#   yelp-tools
diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index 98e567033ebc..ea91e8bfc6fa 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.65 2014/10/14 07:51:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.66 2014/11/13 11:36:35 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libgnome-keyring-2.32.0-drop-test.patch,
+  -files/libgnome-keyring-2.32.0-hang-tests.patch,
+  -files/libgnome-keyring-2.32.0-run-test.patch,
+  -libgnome-keyring-2.32.0.ebuild:
+  Drop old (#508854)
 
   14 Oct 2014; Pacho Ramos <pacho@gentoo.org> -libgnome-keyring-3.10.1.ebuild,
   libgnome-keyring-3.12.0.ebuild:
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 33aaa15747a5..ab7482590818 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a82ff3cb6afa76a62bbba19312c417372b28eba89 SHA512 299ebf991a136483917a7739b3289e02c476e161991d13df7931fb7c2a8e742c1d8dc95540be919b4211a155303c29de00c80618f456fee2c05bf943751fa258 WHIRLPOOL c485ff391aa8d9d99e8f8431fb935d5eeca634e420c4b5c14ad4f36f742d7edf9ac61bc76a702c989d58f49b8b54ae7f58a6ec504eeb69be24bc76db3887cd29
-AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0 SHA512 6c842e018253841b5ea2138f19fae6a8cecafddb9b697f4ad8cdc287774d4db292f686e58ab0be47e66da72914a3205a3676819553ca5eda3708fee8a6b734ab WHIRLPOOL 3f7c92558aed3b013d7e8756c18be6e81756634dec7f9e4dde1b63e359e23929ed2f4177db259f352b97f2749e1f609fe69f32a194c3fe659678510a3d96b0ea
-AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
-DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
 DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
-EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
 EBUILD libgnome-keyring-3.12.0.ebuild 1553 SHA256 b99ba89b2d75c6d1f8cf2bf7e2a9c6a414c6c34584c4cc92b2539fa54fc3abe2 SHA512 e2855a35eaabf76ab972984745ae47f7b84904dd44b5d6bc6df32fedbc53cf96565dcd9587387fc73eea3ffd708ad690530c9ef92c13f563a551c45b316d9314 WHIRLPOOL 73bc222c4a8358c89fb2fa1d89e82fa769a2b86a23ab8d4cccfd16b2237d51027c5b2f97c5f054d87e9fa800f3655e61addf715a8371e8858b40e81693fc3403
-MISC ChangeLog 9935 SHA256 8537c19e388b91bfb723d7421ba0aa11c24f503978a6320daa0aeab71c99f029 SHA512 7b98f858a9da29b76ecbfeda7c43e62bc19157c58856d8d5819bd8921642f78755bb84ce0d321aa505ed5607342d5c07ca7d5976d3c1dcba4eb7d1adee1e39d2 WHIRLPOOL d6b9eb398959542ca9e7829bfb3a817610490207abd87a4a3c97daae061ce2997f69afb48a23bc8b1f24ec59ff1d33195403f28a469827566a9e91f4ec70c8d8
+MISC ChangeLog 10188 SHA256 4da76859eb799942e7b3946304285e3810b21fd5328b8731b7a31af3f42a573c SHA512 ffe92ae55f09acafcd9be9e081e0e2e511c2cb1714c7519876c163364a811216caf6f285a45c15c060d04dc63aa06983d6fbf93215d34b10b20394b678240759 WHIRLPOOL 9727f88ae6a084a11d7bb7f2c5317d077740434acce073378fa9ead3cd7696f9aa49cbee970b2f56e19a9aacfee9c8940c9e161806562c5b84178e781f15d361
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ81f8ACgkQCaWpQKGI+9SG1wCfSyLBOhpF5VScbMs4uTfHjhIc
-iW4AnjEs3b3uWzEzjWqQZ8LmZK26RxKv
-=XFoM
+iEYEAREIAAYFAlRkl8QACgkQCaWpQKGI+9RakwCcC2wh8eb0/40jkgxHx1cBtM04
++HQAn1PKYk4S8QVXgTYRz+7iqsfGZOve
+=ARVV
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch
deleted file mode 100644
index 9cbd156cfb54..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-drop-test.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 987f84c13bac6032164616b220289b5824bbd6a2 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef@memberwebs.com>
-Date: Wed, 19 Jan 2011 19:44:39 +0000
-Subject: Remove unneeded test file.
-
----
-diff --git a/library/tests/Makefile.am b/library/tests/Makefile.am
-index 9514c47..0a54cc7 100644
---- a/library/tests/Makefile.am
-+++ b/library/tests/Makefile.am
-@@ -2,16 +2,12 @@
- TEST_AUTO = \
- 	test-memory.c \
- 	test-keyrings.c \
--	test-other.c \
--	test-daemon-setup.c
-+	test-other.c
- 
- TEST_LIBS = \
- 	$(top_builddir)/egg/libegg.la \
- 	$(top_builddir)/library/libgnome-keyring.la
- 
--TEST_FLAGS = \
--	-DTEST_WITH_DAEMON
--
- include $(top_srcdir)/tests/gtest.make
- 
- # ------------------------------------------------------------------
-diff --git a/library/tests/test-daemon-setup.c b/library/tests/test-daemon-setup.c
-deleted file mode 100644
-index 077656d..0000000
---- a/library/tests/test-daemon-setup.c
-+++ b/dev/null
-@@ -1,86 +0,0 @@
--/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
--/* unit-test-daemon-setup.c: Start a gnome-keyring-daemon process for testing
--
--   Copyright (C) 2007 Stefan Walter
--
--   The Gnome Keyring Library is free software; you can redistribute it and/or
--   modify it under the terms of the GNU Library General Public License as
--   published by the Free Software Foundation; either version 2 of the
--   License, or (at your option) any later version.
--
--   The Gnome Keyring Library is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--   Library General Public License for more details.
--
--   You should have received a copy of the GNU Library General Public
--   License along with the Gnome Library; see the file COPYING.LIB.  If not,
--   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--   Boston, MA 02111-1307, USA.
--
--   Author: Stef Walter <stef@memberwebs.com>
--*/
--
--#include <stdlib.h>
--#include <stdio.h>
--#include <string.h>
--#include <signal.h>
--#include <unistd.h>
--
--#include "run-auto-test.h"
--
--#include "library/gnome-keyring.h"
--
--#if 0
--static GPid daemon_pid;
--#endif
--
--DEFINE_START(setup_daemon)
--{
--#if 0
--	GError *err = NULL;
--	gchar *args[3];
--	const gchar *outside, *path;
--	gboolean start = FALSE;
--	gchar *socket;
--
--	/* If already setup somewhere else, then don't start daemon here */
--	outside = g_getenv ("GNOME_KEYRING_OUTSIDE_TEST");
--	if (!outside || !outside[0])
--		start = TRUE;
--
--	path = g_getenv ("GNOME_KEYRING_TEST_PATH");
--	g_assert (path && path[0]);
--
--	socket = g_strdup_printf ("%s/socket", path);
--	g_setenv ("GNOME_KEYRING_SOCKET", socket, TRUE);
--
--	if (!start)
--		return;
--
--	g_printerr ("Starting gnome-keyring-daemon...\n");
--
--	args[0] = "../../daemon/gnome-keyring-daemon";
--	args[1] = "-f";
--	args[2] = NULL;
--
--	if (!g_spawn_async (NULL, args, NULL, G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD,
--	                    NULL, NULL, &daemon_pid, &err)) {
--		g_error ("couldn't start gnome-keyring-daemon for testing: %s",
--		         err && err->message ? err->message : "");
--		g_assert_not_reached ();
--	}
--
--	/* Let it startup properly */
--	sleep (2);
--#endif
--}
--
--DEFINE_STOP(setup_daemon)
--{
--#if 0
--	if (daemon_pid)
--		kill (daemon_pid, SIGTERM);
--	/* We're exiting soon anyway, no need to wait */
--#endif
--}
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch
deleted file mode 100644
index 405838913f85..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-hang-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libgnome-keyring-2.32.0/egg/tests/test-dh.c
-===================================================================
---- libgnome-keyring-2.32.0.orig/egg/tests/test-dh.c
-+++ libgnome-keyring-2.32.0/egg/tests/test-dh.c
-@@ -27,6 +27,7 @@
- 
- #include "run-auto-test.h"
- 
-+#include "egg-libgcrypt.h"
- #include "egg-dh.h"
- #include "egg-secure-memory.h"
- 
-@@ -39,7 +40,7 @@ DEFINE_TEST(dh_perform)
- 	gcry_mpi_t x2, X2;
- 	gpointer k1, k2;
- 	gboolean ret;
--
-+	egg_libgcrypt_initialize ();
- 	/* Load up the parameters */
- 	if (!egg_dh_default_params ("ietf-ike-grp-modp-768", &p, &g))
- 		g_assert_not_reached ();
diff --git a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch b/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch
deleted file mode 100644
index efc47df7f2e6..000000000000
--- a/gnome-base/libgnome-keyring/files/libgnome-keyring-2.32.0-run-test.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From ffbaa40603ed33646de10822983c9445d6c70d3a Mon Sep 17 00:00:00 2001
-From: Stef Walter <stef@memberwebs.com>
-Date: Wed, 19 Jan 2011 19:44:50 +0000
-Subject: Don't run tests if a testing enabled gnome-keyring-daemon is not enabled.
-
-This uses the 'gnome-keyring-daemon --version' output to determine
-whether testing is enabled or not.
----
-diff --git a/tests/gtest-helpers.c b/tests/gtest-helpers.c
-index fbdb5d7..e984f64 100644
---- a/tests/gtest-helpers.c
-+++ b/tests/gtest-helpers.c
-@@ -160,16 +160,17 @@ chdir_base_dir (char* argv0)
- 	g_free (dir);
- }
- 
--#ifdef TEST_WITH_DAEMON
--
- static pid_t daemon_pid = 0;
- 
- static gboolean
--daemon_start ()
-+daemon_start (void)
- {
- 	GError *err = NULL;
- 	gchar *args[5];
- 	const gchar *path, *service, *address;
-+	gchar *output = NULL;
-+	gint exit_status = 1;
-+	GError *error = NULL;
- 
- 	/* Need to have DBUS running */
- 	address = g_getenv ("DBUS_SESSION_BUS_ADDRESS");
-@@ -178,6 +179,23 @@ daemon_start ()
- 		return FALSE;
- 	}
- 
-+	/* Check if gnome-keyring-daemon has testing enabled */
-+	if (!g_spawn_command_line_sync (GNOME_KEYRING_DAEMON_PATH " --version",
-+	                                &output, NULL, &exit_status, &error)) {
-+		g_printerr ("Couldn't launch '%s': %s", GNOME_KEYRING_DAEMON_PATH,
-+		            error->message);
-+		return FALSE;
-+	}
-+
-+	/* For some reason --version failed */
-+	if (exit_status != 0 || strstr (output, "testing: enabled") == NULL) {
-+		g_printerr ("Skipping tests since no testing enabled gnome-keyring-daemin is available\n");
-+		g_free (output);
-+		return FALSE;
-+	}
-+
-+	g_free (output);
-+
- 	path = g_getenv ("GNOME_KEYRING_TEST_PATH");
- 	if (path && !path[0])
- 		path = NULL;
-@@ -221,8 +239,6 @@ daemon_stop (void)
- 	daemon_pid = 0;
- }
- 
--#endif /* TEST_WITH_DAEMON */
--
- int
- main (int argc, char* argv[])
- {
-@@ -239,18 +255,12 @@ main (int argc, char* argv[])
- 
- 	initialize_tests ();
- 
--#ifdef TEST_WITH_DAEMON
- 	if (daemon_start ()) {
--#endif
--
- 		start_tests ();
- 		ret = g_test_run ();
- 		stop_tests();
--
--#ifdef TEST_WITH_DAEMON
- 		daemon_stop();
- 	}
--#endif
- 
- 	return ret;
- }
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
deleted file mode 100644
index 99350bd31168..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-2.32.0.ebuild,v 1.17 2012/12/17 04:46:05 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="debug test"
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=gnome-base/gnome-keyring-2.29[test?]
-	!<gnome-base/gnome-keyring-2.29"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	# Remove unneeded test file.
-	epatch "${FILESDIR}/${P}-drop-test.patch"
-
-	# Don't run tests if a testing enabled gnome-keyring-daemon is not enabled.
-	epatch "${FILESDIR}/${P}-run-test.patch"
-
-	# Don't let tests to hang, bug #356141
-	epatch "${FILESDIR}/${PN}-2.32.0-hang-tests.patch"
-
-	# Remove silly CFLAGS
-	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
-		-i configure.in configure || die "sed failed"
-
-	# Remove DISABLE_DEPRECATED flags
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
-		-i configure.in configure || die "sed 2 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check
-}
diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index 5245899d983d..28467120c609 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.107 2014/02/22 21:47:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.108 2014/11/13 11:37:33 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/libgnomekbd-2.32.0-gdkdisplay-usage.patch,
+  -files/libgnomekbd-2.32.0-gdkkeyname-replace.patch,
+  -files/libgnomekbd-2.32.0-unneeded-casts.patch, -libgnomekbd-2.32.0-r1.ebuild:
+  Drop old (#508854)
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> libgnomekbd-3.6.0.ebuild:
   Fix wrong commit, bug 502160
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index f220b7a4aeca..e80ead28986e 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,19 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libgnomekbd-2.32.0-gdkdisplay-usage.patch 2563 SHA256 65ba86cc9386d6562cfc26175015943548f9efeeafe6a55e803e3398dcc1874c SHA512 2b9a90b03ab685a9a0745d0b9e950ae71837007218540226e13b5273e7fd5185c68a0bca7df15f7324a74cb8fca79cd9fdda2aaf84173b2b9cf19a561db6ce94 WHIRLPOOL b8c00f5d3b85324440274bfe0e575db68ac41843e6a3714098d01606a060b7a7acf4e56211680abb642e0f51b734b7f18218094188f98cf726fa998920d3d5dc
-AUX libgnomekbd-2.32.0-gdkkeyname-replace.patch 5628 SHA256 f65fbe70dd6fdaef0f8aa370471390a34bcb30b5b01da449139bf42f8da92ea6 SHA512 3b853280c612986b1ec1683a0adaa9e18f65fb188deedb204f8d72a592a826d81f9e98700e516ee262068592cbe247115a61bc917bffae996dbbcb7e0366add7 WHIRLPOOL 9f13b90e22fab6daa4c9cef931190c5489cd1d661dcb3fb6e7ae7b5c246f98f0c9aaf8d853fb785524bd6405fd75ad1efde311e480d845fbd7743ca798ee951d
-AUX libgnomekbd-2.32.0-unneeded-casts.patch 1630 SHA256 2b1b28aa84450a0ccd438f2d8a97918193dca1ddcf9dbe9e17e61d0b9e14e436 SHA512 1a948d5c0162924204d9eda9a390e49362e1eb99898c5b6b36fe6749e9a28a8391ac61e19b9fc50d1109c796c0e1266e9c220a3dbe2b0177809158dcd1f4ca02 WHIRLPOOL a536ee1588095d749401c45807cfd9263faa49d57c36acf275b2e3052624d0b6f37dae091987716b75d9ccb8340baf3efd9a3dca198ffa1ef98f56048838e60e
-DIST libgnomekbd-2.32.0.tar.bz2 410928 SHA256 ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256 SHA512 7e60a613d28735b478a7480b4a90505bfdfd6d98398860b9d1ad5074ad4fad7e39c9d5865add1d3efc324d0c4c2501531ddd1a281055e797a543b05fe815d3f4 WHIRLPOOL ffc558291d6b0d10081b2f95ac9f53653c5a10dcab564f4a115fde02834c5fe4ef479d53ac201dd9c8c8a230e65d5b6d0d7fd54ab6d5dbb71c8ae69ae316c906
 DIST libgnomekbd-3.6.0.tar.xz 373588 SHA256 c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09 SHA512 27d0711eeebba91ca0dbed079c17acfec97116153a01f4f6e78cb30044afc534c438f655c6836b74b377acb8116d3b70e1f09578f182bb4fc51d8d05e89c6f17 WHIRLPOOL d64b284471e1ba62f13c06c12a89ccc86548fe77f1ab85dfce6d97d5a4bacccb510f0f0181229a8c8f55e2142362148b7614036520305a1fcad444beaf8863df
-EBUILD libgnomekbd-2.32.0-r1.ebuild 1175 SHA256 c51d7ab023da64c6dba8e3694cbffcad362ad4d89f3652d7a35921634881d034 SHA512 e5229b2c6da37739496584628474fb207525d5423ee457456b325c3ecfafe53791fd6a39959ffc993e2dd19d6fc13287b2319ba665d8add10984d180e667975a WHIRLPOOL 93bafe6830dff0a88d3afd6e17262d80206654d4ae3b44072eaf28fde084c2432129717a05535338dee6ec6a437c0040697b7e454eebc0b21357efd9e4e97dce
 EBUILD libgnomekbd-3.6.0.ebuild 928 SHA256 62eec3f2347a47d0dd4d102dbf3bb43fde970a8c1058d84336cd61d741414992 SHA512 43401a5800400474335375eafb463d65a32cc3e93598b51876e1973d4d009a375a79af5a5f4173e81c62127c76753b8c6787c5fce93adc75542e609529c746ac WHIRLPOOL 05c1fc9c1114d373045691293aa272ee29af826ca6a7507a34750dcea7c218a1327e4b8e05fdeb325f94bb372971b1e7215f4e79b5d342b3fc784705098856c7
-MISC ChangeLog 14681 SHA256 bcd7c3f30e7f3ebb6e9a9ff7e5c8184a657c75320004c3c379c14b2064d98272 SHA512 6145675c784b598cefa370d5c8d5fc9b4ecfca38012cb98b613361a26011e02f3a2f3ba41f48250da512ed95c69db9fa843a14a749ed127dbcd05247a18e47fa WHIRLPOOL e81b2254ce8e8e76ce724c1ce76f0d8a6894f310f20aed4adabb0a357dc14c2c8fc68b1d7b623e9b006ae5d05f5e5b628b70297fe7ceb2cc35267937a854af1c
+MISC ChangeLog 14936 SHA256 0c8ed85053fa618a94463085f730005ceb7ffe59657d2fac679b93c91bff71ab SHA512 776e1a2b8ee8c4e5b8f52be94a67baa48485dffab372fba1336fd9bd3fbf726996e13b5381fdf8fe609a23d6be89ca226ad8ca825e21baee0ce6e2ead4031fe3 WHIRLPOOL d0088b48a49d4f7915ed5c917b3c18b6c06973f6a4d331b279fb2266efd6e9ce1705dea7bf98b0893ed59dcd469b821735978dd54e58c154bef415f459f82810
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlMJGw0ACgkQCaWpQKGI+9RSNACgh1dW9I9mQzpvTHwD2PfeNanv
-EaYAmwe5Dl7+j7hl2JTMZnBGZaqwInd6
-=rxCF
+iEYEAREIAAYFAlRkl/8ACgkQCaWpQKGI+9ROgACeMxqs3TexN7eJIZWCthJO+gRq
+GGsAnA1HCFV3E7JzwKRRbDPmoDk9r8cH
+=gTbm
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch
deleted file mode 100644
index 43b8b1a65e59..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkdisplay-usage.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8b62e545aa61111d8dd522ff62445b2827da3f25 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Thu, 30 Sep 2010 00:50:44 +0000
-Subject: Remove GDK_DISPLAY() usage
-
-https://bugzilla.gnome.org/show_bug.cgi?id=630974
----
-diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c
-index c232c98..752d28c 100644
---- a/capplet/gkbd-indicator-plugins-capplet.c
-+++ b/capplet/gkbd-indicator-plugins-capplet.c
-@@ -376,7 +376,7 @@ main (int argc, char **argv)
- 	}
- 	gconf_error = NULL;
- 	/*GkbdIndicatorInstallGlibLogAppender(  ); */
--	gipc.engine = xkl_engine_get_instance (GDK_DISPLAY ());
-+	gipc.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- 	gipc.config_registry =
- 	    xkl_config_registry_get_instance (gipc.engine);
- 
-diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
-index cb2ed56..4fd42d8 100644
---- a/libgnomekbd/gkbd-indicator.c
-+++ b/libgnomekbd/gkbd-indicator.c
-@@ -817,7 +817,7 @@ gkbd_indicator_global_init (void)
- 	GConfClient *gconf_client;
- 	XklConfigRec *xklrec = xkl_config_rec_new ();
- 
--	globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
-+	globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- 	if (globals.engine == NULL) {
- 		xkl_debug (0, "Libxklavier initialization error");
- 		return;
-diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
-index 7e3c3e8..e31dc94 100644
---- a/libgnomekbd/gkbd-keyboard-drawing.c
-+++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -2524,7 +2524,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
- 	GdkRectangle *rect;
- 	GError *error = NULL;
- 	char title[128] = "";
--	XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY ());
-+	XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- 
- 	builder = gtk_builder_new ();
- 	gtk_builder_add_from_file (builder, UIDIR "/show-layout.ui",
-diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
-index 83a5d47..c6ac2d6 100644
---- a/libgnomekbd/gkbd-status.c
-+++ b/libgnomekbd/gkbd-status.c
-@@ -771,7 +771,7 @@ gkbd_status_global_init (void)
- 	GConfClient *gconf_client;
- 	XklConfigRec *xklrec = xkl_config_rec_new ();
- 
--	globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
-+	globals.engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- 	if (globals.engine == NULL) {
- 		xkl_debug (0, "Libxklavier initialization error");
- 		return;
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch
deleted file mode 100644
index 3a9070ade1b4..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-gdkkeyname-replace.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From f05774eace6d681b0fc59b2abee650b847fff8a1 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Thu, 30 Sep 2010 00:46:20 +0000
-Subject: Replace GDK_keyname with GDK_KEY_keyname
-
-https://bugzilla.gnome.org/show_bug.cgi?id=630974
----
-diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
-index 4fd42d8..89ed92a 100644
---- a/libgnomekbd/gkbd-indicator.c
-+++ b/libgnomekbd/gkbd-indicator.c
-@@ -233,12 +233,12 @@ gkbd_indicator_key_pressed (GtkWidget *
- 			    GkbdIndicator * gki)
- {
- 	switch (event->keyval) {
--	case GDK_KP_Enter:
--	case GDK_ISO_Enter:
--	case GDK_3270_Enter:
--	case GDK_Return:
--	case GDK_space:
--	case GDK_KP_Space:
-+	case GDK_KEY_KP_Enter:
-+	case GDK_KEY_ISO_Enter:
-+	case GDK_KEY_3270_Enter:
-+	case GDK_KEY_Return:
-+	case GDK_KEY_space:
-+	case GDK_KEY_KP_Space:
- 		gkbd_desktop_config_lock_next_group (&globals.cfg);
- 		return TRUE;
- 	default:
-diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
-index e31dc94..3de2125 100644
---- a/libgnomekbd/gkbd-keyboard-drawing.c
-+++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -620,147 +620,147 @@ set_key_label_in_layout (GkbdKeyboardDrawingRenderContext * context,
- 	PangoLayout *layout = context->layout;
- 
- 	switch (keyval) {
--	case GDK_Scroll_Lock:
-+	case GDK_KEY_Scroll_Lock:
- 		pango_layout_set_text (layout, "Scroll\nLock", -1);
- 		break;
- 
--	case GDK_space:
-+	case GDK_KEY_space:
- 		pango_layout_set_text (layout, "", -1);
- 		break;
- 
--	case GDK_Sys_Req:
-+	case GDK_KEY_Sys_Req:
- 		pango_layout_set_text (layout, "Sys Rq", -1);
- 		break;
- 
--	case GDK_Page_Up:
-+	case GDK_KEY_Page_Up:
- 		pango_layout_set_text (layout, "Page\nUp", -1);
- 		break;
- 
--	case GDK_Page_Down:
-+	case GDK_KEY_Page_Down:
- 		pango_layout_set_text (layout, "Page\nDown", -1);
- 		break;
- 
--	case GDK_Num_Lock:
-+	case GDK_KEY_Num_Lock:
- 		pango_layout_set_text (layout, "Num\nLock", -1);
- 		break;
- 
--	case GDK_KP_Page_Up:
-+	case GDK_KEY_KP_Page_Up:
- 		pango_layout_set_text (layout, "Pg Up", -1);
- 		break;
- 
--	case GDK_KP_Page_Down:
-+	case GDK_KEY_KP_Page_Down:
- 		pango_layout_set_text (layout, "Pg Dn", -1);
- 		break;
- 
--	case GDK_KP_Home:
-+	case GDK_KEY_KP_Home:
- 		pango_layout_set_text (layout, "Home", -1);
- 		break;
- 
--	case GDK_KP_Left:
-+	case GDK_KEY_KP_Left:
- 		pango_layout_set_text (layout, "Left", -1);
- 		break;
- 
--	case GDK_KP_End:
-+	case GDK_KEY_KP_End:
- 		pango_layout_set_text (layout, "End", -1);
- 		break;
- 
--	case GDK_KP_Up:
-+	case GDK_KEY_KP_Up:
- 		pango_layout_set_text (layout, "Up", -1);
- 		break;
- 
--	case GDK_KP_Begin:
-+	case GDK_KEY_KP_Begin:
- 		pango_layout_set_text (layout, "Begin", -1);
- 		break;
- 
--	case GDK_KP_Right:
-+	case GDK_KEY_KP_Right:
- 		pango_layout_set_text (layout, "Right", -1);
- 		break;
- 
--	case GDK_KP_Enter:
-+	case GDK_KEY_KP_Enter:
- 		pango_layout_set_text (layout, "Enter", -1);
- 		break;
- 
--	case GDK_KP_Down:
-+	case GDK_KEY_KP_Down:
- 		pango_layout_set_text (layout, "Down", -1);
- 		break;
- 
--	case GDK_KP_Insert:
-+	case GDK_KEY_KP_Insert:
- 		pango_layout_set_text (layout, "Ins", -1);
- 		break;
- 
--	case GDK_KP_Delete:
-+	case GDK_KEY_KP_Delete:
- 		pango_layout_set_text (layout, "Del", -1);
- 		break;
- 
--	case GDK_dead_grave:
-+	case GDK_KEY_dead_grave:
- 		pango_layout_set_text (layout, "ˋ", -1);
- 		break;
- 
--	case GDK_dead_acute:
-+	case GDK_KEY_dead_acute:
- 		pango_layout_set_text (layout, "ˊ", -1);
- 		break;
- 
--	case GDK_dead_circumflex:
-+	case GDK_KEY_dead_circumflex:
- 		pango_layout_set_text (layout, "ˆ", -1);
- 		break;
- 
--	case GDK_dead_tilde:
-+	case GDK_KEY_dead_tilde:
- 		pango_layout_set_text (layout, "~", -1);
- 		break;
- 
--	case GDK_dead_macron:
-+	case GDK_KEY_dead_macron:
- 		pango_layout_set_text (layout, "ˉ", -1);
- 		break;
- 
--	case GDK_dead_breve:
-+	case GDK_KEY_dead_breve:
- 		pango_layout_set_text (layout, "˘", -1);
- 		break;
- 
--	case GDK_dead_abovedot:
-+	case GDK_KEY_dead_abovedot:
- 		pango_layout_set_text (layout, "˙", -1);
- 		break;
- 
--	case GDK_dead_diaeresis:
-+	case GDK_KEY_dead_diaeresis:
- 		pango_layout_set_text (layout, "¨", -1);
- 		break;
- 
--	case GDK_dead_abovering:
-+	case GDK_KEY_dead_abovering:
- 		pango_layout_set_text (layout, "˚", -1);
- 		break;
- 
--	case GDK_dead_doubleacute:
-+	case GDK_KEY_dead_doubleacute:
- 		pango_layout_set_text (layout, "˝", -1);
- 		break;
- 
--	case GDK_dead_caron:
-+	case GDK_KEY_dead_caron:
- 		pango_layout_set_text (layout, "ˇ", -1);
- 		break;
- 
--	case GDK_dead_cedilla:
-+	case GDK_KEY_dead_cedilla:
- 		pango_layout_set_text (layout, "¸", -1);
- 		break;
- 
--	case GDK_dead_ogonek:
-+	case GDK_KEY_dead_ogonek:
- 		pango_layout_set_text (layout, "˛", -1);
- 		break;
- 
--		/* case GDK_dead_iota:
--		 * case GDK_dead_voiced_sound:
--		 * case GDK_dead_semivoiced_sound: */
-+		/* case GDK_KEY_dead_iota:
-+		 * case GDK_KEY_dead_voiced_sound:
-+		 * case GDK_KEY_dead_semivoiced_sound: */
- 
--	case GDK_dead_belowdot:
-+	case GDK_KEY_dead_belowdot:
- 		pango_layout_set_text (layout, " ̣", -1);
- 		break;
- 
--	case GDK_horizconnector:
-+	case GDK_KEY_horizconnector:
- 		pango_layout_set_text (layout, "horiz\nconn", -1);
- 		break;
- 
--	case GDK_Mode_switch:
-+	case GDK_KEY_Mode_switch:
- 		pango_layout_set_text (layout, "AltGr", -1);
- 		break;
- 
--	case GDK_Multi_key:
-+	case GDK_KEY_Multi_key:
- 		pango_layout_set_text (layout, "Compose", -1);
- 		break;
- 
-@@ -2037,7 +2037,7 @@ gkbd_keyboard_drawing_init (GkbdKeyboardDrawing * drawing)
- 
- 	XkbGetNames (drawing->display, XkbAllNamesMask, drawing->xkb);
- 	drawing->l3mod = XkbKeysymToModifiers (drawing->display,
--					       GDK_ISO_Level3_Shift);
-+					       GDK_KEY_ISO_Level3_Shift);
- 
- 	drawing->xkbOnDisplay = TRUE;
- 
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch
deleted file mode 100644
index 44bc3a972bd1..000000000000
--- a/gnome-base/libgnomekbd/files/libgnomekbd-2.32.0-unneeded-casts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b1079544e9585ee01b31b6e882afceb4aac938da Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Thu, 30 Sep 2010 07:21:27 +0000
-Subject: Unneeded casts removed
-
----
-diff --git a/capplet/gkbd-indicator-plugins-capplet.c b/capplet/gkbd-indicator-plugins-capplet.c
-index 9058fbc..c232c98 100644
---- a/capplet/gkbd-indicator-plugins-capplet.c
-+++ b/capplet/gkbd-indicator-plugins-capplet.c
-@@ -305,13 +305,13 @@ CappletSetup (GkbdIndicatorPluginsCapplet * gipc)
- 	gtk_builder_connect_signals (builder, NULL);
- 
- 	g_object_set_data (G_OBJECT (capplet), "uiData", builder);
--	g_signal_connect_swapped (GTK_OBJECT (capplet),
-+	g_signal_connect_swapped (capplet,
- 				  "destroy", G_CALLBACK (g_object_unref),
- 				  builder);
- 	g_signal_connect_swapped (G_OBJECT (capplet), "unrealize",
- 				  G_CALLBACK (g_main_loop_quit), loop);
- 
--	g_signal_connect (GTK_OBJECT (capplet),
-+	g_signal_connect (capplet,
- 			  "response", G_CALLBACK (CappletResponse), NULL);
- 
- 	button = GTK_WIDGET (gtk_builder_get_object (builder, "btnUp"));
-diff --git a/libgnomekbd/gkbd-keyboard-drawing.c b/libgnomekbd/gkbd-keyboard-drawing.c
-index 909930b..7e3c3e8 100644
---- a/libgnomekbd/gkbd-keyboard-drawing.c
-+++ b/libgnomekbd/gkbd-keyboard-drawing.c
-@@ -2614,7 +2614,7 @@ gkbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
- 
- 	g_object_set_data (G_OBJECT (dialog), "kbdraw", kbdraw);
- 
--	g_signal_connect_swapped (GTK_OBJECT (dialog), "destroy",
-+	g_signal_connect_swapped (dialog, "destroy",
- 				  G_CALLBACK (g_object_unref),
- 				  g_object_get_data (G_OBJECT (dialog),
- 						     "builderData"));
---
-cgit v0.9.0.2
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild
deleted file mode 100644
index b66fc01fc04c..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.32.0-r1.ebuild,v 1.4 2012/05/21 18:57:27 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-# gtk+-2.20 needed for tests
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=gnome-base/gconf-2.14:2
-	>=x11-libs/gtk+-2.20:2
-	>=x11-libs/libxklavier-5.0"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable test tests) --disable-static"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Unneeded casts removed
-	epatch "${FILESDIR}/${P}-unneeded-casts.patch"
-
-	# Remove GDK_DISPLAY() usage
-	epatch "${FILESDIR}/${P}-gdkdisplay-usage.patch"
-
-	# Replace GDK_keyname with GDK_KEY_keyname
-	epatch "${FILESDIR}/${P}-gdkkeyname-replace.patch"
-}
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 25a49cb23808..530c17193f06 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.422 2014/07/23 15:17:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.423 2014/11/13 11:38:36 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/nautilus-2.32.2.1-gold-glib2.32.patch, -nautilus-2.32.2.1-r2.ebuild,
+  -nautilus-3.10.1.ebuild, -nautilus-3.12.0.ebuild:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> nautilus-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 82162f915bbf..ab6eea1e36d0 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,33 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX nautilus-2.32.2.1-gold-glib2.32.patch 698 SHA256 a9da048e66d4f326fbfa6b916dfb29e88a766b3c00e9da10df78a2e05d3382b1 SHA512 fe39cd441dbb38e13b9a0ee075b7a82b6681e77209d3386ab563adad3ddde9cf2642a98fcfa7584975388eb255578edeb138a56bede35f3c77bb50efd03bf7cb WHIRLPOOL 9ecab7b759cde6ab73b0409814f1570fcb442e893bc2b6d12f5a5241cd33457e28d1ccee05042fd2126c58e4889fa3fd86003d929a19e5194de5a23813995f6a
 AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf972aaacdf8cfbe091d8debd24f937a SHA512 807fb309cf217225396bfee5e60856245671a75058c95bd96dffe796e4c27c311aac603afba90c7660595611fe227de0951201e92e5e4da905b01c5ea3ca2460 WHIRLPOOL b6b8a1e69c4a4ec9ddfa437f611bea5711a41b8bc37c0f2701cc210063ec7eee93f92ccb9ca0b70ba5f7abc9fe128e44ad34582d077f4ebddce62e0222e9a025
-DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b
-DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
-DIST nautilus-3.10.1.tar.xz 3334432 SHA256 f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727 SHA512 a201d661104025b4b5ef4d0aa8ba7d083bb60e164c948e9932a78967f4046cc6e3afe7dcd5d20cfb99f500c4561555022cce4c39f2acc72370a515141798e90c WHIRLPOOL f9ab9305ea528233f1e318b2b96323d4568ac2c7880921a4700b01fc7510bd447bcfb90091655dd02f850cf508211d8abbaea5321c16ea62d2876175726900f8
-DIST nautilus-3.12.0.tar.xz 3350956 SHA256 c19af20ab1fadf04bebee7ec8d3375c5efbe27bb6e0b7d3a60369523baf5e4df SHA512 e42eef48564c8b1fd0cb1cadee285be0c8b1e0840527498f4e4e2d25719d31d3dc1c780cd09e521f187ed98502e0b223aaac589ca22bdc6a4e3bd4c3495feb7d WHIRLPOOL a6a41a4134874efc5b36f992f00b6d0aca14659ad6747dd0ce760ee20458982094b3cf525d83c6df8376a93b3d4ef8667d2f03abb2f9f91097312804a024724a
 DIST nautilus-3.12.2.tar.xz 4975580 SHA256 969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1 SHA512 59a80fef3cedff5393061aeead552eec80bbd920ae71b918bb21ca6fc59ba1c4e85c641885a12dde5208345b8659f9d4a6e1ddf865f4cb94afd5a3a339839c01 WHIRLPOOL cc9369b606ee4c6727aba89240a17ef007e26c1c5c6cc54a92cb83d098a51ac1424431462125ba56564cad9e26023c489ada96ff5e6037eaf49537b9e76e49fe
-EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
-EBUILD nautilus-3.10.1.ebuild 3473 SHA256 0c4b3d63c50ace22a686b81f4481c7d676839abf20825a442abdcf48d2631a8c SHA512 ea6dc7f54f9dff3ead3830f3849f6fa341b3f0e21ee0622bdd510416964a50f9c52cc1326ba0975880fcd34ca25b50988435e248b96d837f8790110f52888997 WHIRLPOOL 9a19f32a13faa3e6654baa428a9f5996fa3216fc1810d52448c99f25d3065af444e3b7fc6819bc30436c5876ffc8f9ec83c51d88a7e77539748418bc879ff5e8
-EBUILD nautilus-3.12.0.ebuild 3473 SHA256 89b9ae104a845ac710f77b2409b3f9c8df081a7cdc42b814c7000d7b29a0f9c4 SHA512 aab1d5ff89964e8294ffa84f071414da48ae1ce58c46b704e3612385cbd8a0c389e8500da762463e014f494fe0176b094faffe3ef390e194025e0d1864d77cbc WHIRLPOOL 1fc2c02ea9933cb4a2e9748875d1eada517e9ddc5bf3c2e4c610aafe6aa27291f44601f32273766c5c295a58c769dc9f5b36e56badce1c1627e3518cc0efeb6e
 EBUILD nautilus-3.12.2.ebuild 3477 SHA256 c80a355b6bc5059699197a92076640be6c5d2cd9943cd26a94eab0bfdf9da797 SHA512 415783085f92a11e52c15dfd5c83d40402aded97a50a50dc96755787ee38a580beb69c63761ce46b505e702a3250b960838b63ea7e1698b1dc1161ebc950acef WHIRLPOOL 1d2b3524a9d1c74b2d1d2e69f624684d6a236ed7861f335b67c6f5d32acd4b642d1dc8557eb56dd2f323d8678fec5491a4626038c1a2b52bf2d3c269fc2e9fdb
-MISC ChangeLog 63654 SHA256 8da2331add781bb48e1415bc391f8dde2408038330ff2e8bcf7e5c75b85f88d8 SHA512 fbb334e94670a02bcb4af60c491ba0a706586f4bba55b19f8cc4bd1bd1189c5fa4c22a0bfcc4797948c393678f792143467a8d9dc4c8b6771fa7fae2639ca4dd WHIRLPOOL 7a29b31576a2a921e522e7773842a46cd02fa7a8235fa4412657645ef58cfe38a8993b63dbb64a87a49d7a78c20b4dd03771676772c924798280af97dc182123
+MISC ChangeLog 63854 SHA256 699fa09b70e4446fe899914b1c08d9b558fd4049798ba0f9e2d36ee66b705ba9 SHA512 49c79bc164cff2b5f9c0c33ee0ccee6fc3f8c996c08a79e43f951a0dffbb5b59faac81ceb55e08e4fc1bbf8a8f5eeac4ab00bfeb7cb9431d09b54eb36698194f WHIRLPOOL 9fddc71bf3631af25d1ff2386a27a88f0097d062d820b95f85115ee92685cf32b6e5cd8dd4e4b3715d9ab688cfeef14725dd70d976ddf7304d8c5814b3acba2b
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9IKAAoJELp701BxlEWfqSUP/iUNCQEhp0CFV+/6N3ZLKaV8
-VIr9Td/NoPeTGVuHx7dK1aqv2nIxPQZef5tTcQOCc+siuqpTk9leqKlO5G9XG0lQ
-5Uu5HNL9StvIKJ9kcwbEbOtc3NvoSjM/u/ZWad7jn2eqkW50sJnGEHbnXo7mhBsA
-7MnMwEGr4FPND3qAaK5K1ueAhhmtzHGvXvjdsuh727n993grkLjV5Fbgjqe6C7HO
-7TO79sravybUVhH/ntx03rNVwVAW9CDRAJrDbQajBmwoKs8RG4LxGV/9VgJgWqS0
-1GlLMO3FpvwpiJj6VYoqRp4PrlP7Ze0QttL4QUdhXu7ejvKBzWfEEvumqtiduJld
-8Qkq12PVqu2Uxd8xNSl7c2uWta1JUykSs1VQE4dL7XkyjvhRqshtQ973U+zW1zX2
-tPfuBdOjgCbEbGJFABO+gMAfnS8eHqyIQxxNNJnrsd/zfTuhPObixF7tjlg0pODY
-mpXOPPeshTx0Xo/LpfrKt9fMwKZO7CjoGf1BhgehhHYyN54m0nbGLyKO/fVs1R3u
-oqtKxFhsBW26JWEwJqH/kDaQWvTQIOTzT7n2LYubCw2czlUDRHWcgrSOuC47S+tH
-SW8vu87Vg5xXrz4Rl5RrK5tTtZ2Y7USoqUfdsrbL4BZXkjapLTYwOMPD4dGYrpOp
-Cc4c4+P9jdCMjZql0J7c
-=4Cwk
+iEYEAREIAAYFAlRkmD0ACgkQCaWpQKGI+9QAzwCfbzPIj0306Ct71txtiaDnYBib
+g9oAn00f0PuaL7ZPVxWLQ+I7LWI7efYr
+=RuUi
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch b/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch
deleted file mode 100644
index 86c66ec7604f..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.32.2.1-gold-glib2.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 97e171e..4cf7827 100644
---- a/configure.in
-+++ b/configure.in
-@@ -336,7 +336,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
- AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
- 
- dnl core nautilus
--CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
-+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gmodule-no-export-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
- AC_SUBST(CORE_CFLAGS)
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild
deleted file mode 100644
index 1dba0db37c6c..000000000000
--- a/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r2.ebuild,v 1.9 2012/12/20 16:27:56 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="gnome +introspection xmp"
-
-RDEPEND=">=dev-libs/glib-2.28.0:2
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7:2
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2:2
-	dev-libs/libunique:1
-	gnome-base/dconf
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( media-libs/exempi:2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1"
-# For eautoreconf
-#	gnome-base/gnome-common
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable introspection)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-	# Apply multiple upstream fixes
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# build failure with ld.gold, fixed in 3.4
-	epatch "${FILESDIR}/${P}-gold-glib2.32.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-3.10.1.ebuild b/gnome-base/nautilus/nautilus-3.10.1.ebuild
deleted file mode 100644
index d4c2526191ae..000000000000
--- a/gnome-base/nautilus/nautilus-3.10.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.10.1.ebuild,v 1.4 2014/03/09 11:59:25 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.11:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable debug) \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.12.0.ebuild b/gnome-base/nautilus/nautilus-3.12.0.ebuild
deleted file mode 100644
index f0d782410c93..000000000000
--- a/gnome-base/nautilus/nautilus-3.12.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.12.0.ebuild,v 1.1 2014/04/27 17:04:07 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit eutils gnome2 readme.gentoo virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-
-# profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-RESTRICT="test"
-
-# FIXME: selinux support is automagic
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.3:2
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.11.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xproto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? (
-		>=x11-themes/gnome-icon-theme-1.1.91
-		x11-themes/gnome-icon-theme-symbolic )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-
-	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
-	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
-
-	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
-	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
-		-i configure || die "sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable debug) \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	gnome2_environment_reset
-	unset DBUS_SESSION_BUS_ADDRESS
-	export GSETTINGS_BACKEND="memory"
-	Xemake check
-	unset GSETTINGS_BACKEND
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}