Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-settings-daemon
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-11-13 11:38:37 +0000
committerPacho Ramos <pacho@gentoo.org>2014-11-13 11:38:37 +0000
commit7727772393daa93742b37e384c06142f9320eadd (patch)
tree8c04ef0dcecbd085d415ff5840da7f1059a780d2 /gnome-base/gnome-settings-daemon
parentVersion bump. (diff)
downloadhistorical-7727772393daa93742b37e384c06142f9320eadd.tar.gz
historical-7727772393daa93742b37e384c06142f9320eadd.tar.bz2
historical-7727772393daa93742b37e384c06142f9320eadd.zip
Drop old (#508854)
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'gnome-base/gnome-settings-daemon')
-rw-r--r--gnome-base/gnome-settings-daemon/ChangeLog12
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest17
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-lcdfilter.patch34
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-0.7.patch76
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-libnotify-init.patch14
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-media-keys-react.patch43
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-netfs-monitor.patch58
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.32.1-syndaemon-mode.patch42
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.32.1-r2.ebuild123
9 files changed, 15 insertions, 404 deletions
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
-}