Version bump for Gnome 3.10

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

5 files changed, 550 insertions, 29 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 5b5d21983758..35c8e9d4afcd 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.140 2013/12/08 18:26:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.141 2013/12/24 17:55:10 pacho Exp $
+
+*gnome-control-center-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-control-center-3.10.2-gentoo-paths.patch,
+  +files/gnome-control-center-3.10.2-optional.patch,
+  +gnome-control-center-3.10.2.ebuild, -gnome-control-center-3.8.5-r1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-control-center-3.8.6.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 6b8c6603dbef..ec9cc8b67e63 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -6,23 +6,25 @@ AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b081
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130
 AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d SHA512 ea81dc45ef7f2b5c14e9a094a9a8601c6631ad1df60a9316ea2f2fe8c922979bbb23e1a3a13adb3ca909eed1b489a7eb521b85cf7bd0dd7e09ce528c0a38d751 WHIRLPOOL 1b8450b5073ddb44b30964373024005c6fadd58f3246cdf37290e8350cc3d9ca54754c6ac1eca5fcedbd06e288495e8657102d8c8200e30e83c07702eb34531a
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538 SHA512 c4a59d44853ce81c067626d1a51f3566a3cf754e98584d1a836072d8ea6b8a89fb6542f92b2237a4675c1f5cc296c76d28e39fb3e441cb8d6cc7f42877304307 WHIRLPOOL 20e47d5aa6670bee3a3e1dee8cd176e9c3909de2d60614b8d058a3c09b929e32761abd345592dc92f6cab32e2fb677ed4d87dfc63fc9b231a902b5dc4b3ed822
+AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d
+AUX gnome-control-center-3.10.2-optional.patch 13785 SHA256 d8a3a8a060b7f8715b4510c5b2b83c6825312ea5eea6c1728439118dc532113f SHA512 a6dde875ef42b6176ebadcf85e3c2b0b52f1bdffdd51544756c06fdf072a3182f4f2ae440bf1426c3516cab464d339413783176d15e59d6c9e3784e5e8bff8d2 WHIRLPOOL dfcdda7e20902a121178af0f099c2f6be231ce1a9a3ea37bf17f0a16d2c01291608bbb05b9dec353c4cfc231639608e3d88ce57c83cacbb654752098623dd5b4
 AUX gnome-control-center-3.8.0-paths-makefiles.patch 865 SHA256 65deb3482fddbef130b8bcdf67150a8e2ed6775b68922b2958ce0d03556e6101 SHA512 6a4ec4bb5c80ae3ee40a75fb7985a890822ed7e4c53f24263054b016ae59eef4670091d257a5f6eb0e87b5c5cdd40c8b36d0036a59accbe28e2e1c080bffd2eb WHIRLPOOL 9a70893a8edd3bfbd03bebe3ec45246b7a90db1d748421d8ff561acd2bc4f4a845151bb95ef65dc5696daf75d4e66ec067bd19dc114c08c1528d2464297bad7d
 AUX gnome-control-center-3.8.0-paths.patch 2178 SHA256 3c8e3a8232262cb92d0416bd27ed47b157354b6ee4d9b31f5ef0705ff4ce96e3 SHA512 ad64242b6c4c822ea973d938307105c12c41a9cf27fa0f7d9974fdfd3cd5945a02f110db7649bdd2dd95add31ff758a3c0a9b0228f7826b7f135bacd16a5dfe6 WHIRLPOOL a8b0c092da3812b9398e1eacccb5dbf6c899ace1a1b130cd0047f8d7e542c440c9550cc1e4a35384581aadf8cbaab683b21da0a02d431f80304137dde98a86ca
 AUX gnome-control-center-3.8.5-optional.patch 14242 SHA256 2aa4729552adc055053cb697157735bf5dff9df2932d7f7023871e1603b6bd91 SHA512 5b7f87163fe9d4adbdef9bd6ca6495aa4a1487ebd884d4a6a0cd3c4682425460f67ce4010b2f265463bb9d46edb99bda0319e539618ee7b129651948150b8205 WHIRLPOOL a5f2174bc6a8ae151dc00d75b102317bb48b1b27faef85e548c3df710ed9a73abf1c869f059377885dd37ea17d71e31031552d9a456098c6f2737b2662a82a42
 AUX gnome-control-center-3.8.6-flickr-linking.patch 801 SHA256 7c5d736a57c41c7b9982f5fed308d1097c06e6683fa1160a3ceb34f32fc4f0aa SHA512 dfbd6c7996f9aeadd3c568354ce9d3125d671b4d0c8c79da31bca2cd06a320e7c6a49a57baa3aa8278963d98244699bcc60179c86e849cb4c0ba1f0aaf633ba3 WHIRLPOOL b081330b407b75795b6c0f0484a51e806076d8c88cf6b3baee1f7f09ca548b8c1f4f3dd6524dde8ffd00da9aa0e33f74ef81b58ff97387ceb3acb971afda6fd1
 AUX gnome-control-center-3.8.6-flickr-linking2.patch 1085 SHA256 f2259e7e4c7ccf953fb3a220cd2fcec0cc517f3ebdcb8f7414a37c70bccf7459 SHA512 87591a831f351f27a78bb3a2d5f67edf9f32a862d6da05d05427aef7a59949cc4275e61f91f27bc86e29f4e944b5811de39131f120714ebe4efc6fbbbf09c480 WHIRLPOOL 3fd893bde381748c961f89193112288138fc9ef431784d380c9081fff2d6d9ffbeb626e2c89c3253e24dbb0a0300f7bc59aa01c87c4d7375410b876bc9ecbf4d
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
-DIST gnome-control-center-3.8.5.tar.xz 6925968 SHA256 efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2 SHA512 5023a859756fe94334632ee2cf6206fbaed5c612d30ba230da52e7d62d95b94002f03adf0b39af18b5489428d559cc9ec6baf95698b894f275a5eaa86ff670b5 WHIRLPOOL 9ae8d2971ea793533bd3a2875f39b33b123a83c25ced2a241e8a7cdc4dd9f34f4547472e60bdffbdad34e09ca7867441a2a2fcd841b2ebbbcf45734a36607944
+DIST gnome-control-center-3.10.2.tar.xz 6832928 SHA256 f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9 SHA512 3095af95a9d9cbb3b636f2e3c845f8c5df1cd943b60afca2e89506e3f80719ae4277068576e59d9bed602bc5b75380627b689ce71f84fbb4a2f6590ed5affe69 WHIRLPOOL 8d90153af8fdf921322d016413b8f95e130a1ec4e0a203dc9ed99a06239b51e08a9f5e51d1a325583974780039a9541850d54b7483f3fba202c54f8e8b315a3c
 DIST gnome-control-center-3.8.6.tar.xz 6723440 SHA256 8dba7eb3fa720580e84bb1a8241c745abacaa8999bbf9c28902819d5584fa42a SHA512 7c917d9527b178352148eb746a4e99aa154d3c2aa13973e0e638cd4a6d977b1f4448ee010897617d4d06faa568c6cda43bcd334c014352b3d8f68df75cdb880a WHIRLPOOL bc8de5b336862640f66c883e0da8e02c8bb4f16b6557ce351e27c9e10d93dcfd449bf33d0c1d6ce09c4cd6f19b50c9b8478bc1143ccce61418bb1ec2c2ff7e24
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
-EBUILD gnome-control-center-3.8.5-r1.ebuild 5402 SHA256 66e1b04bd4098f7ab817597113c398ea7064e7a012ce332b4397c8b2d183ddd8 SHA512 e44522c8f6bcc7387ccb93ebfa00a7c1ec96f11caf605293faa1045f9ac7d306c29847693cae193b96149fad7058fc207f49b7b85b0d253b344a04bb9d02e3c8 WHIRLPOOL 6292675813b513e613d80dbf417f3eb3e18ab2a41c2ec005a61ca2e2b167f4001569798b0bcc98eab1645fc9310d6a6dbee4727b7fbcac836e1a8a2bef40aefa
+EBUILD gnome-control-center-3.10.2.ebuild 5461 SHA256 ea88381cbe2e85bc4624fbd22f5f7a2a674e1b205ecf2e941d1365e707b5a0f3 SHA512 7ad83421123ae6c6cfd9097a47d12398ae82264988d6921e4d48045acb0ba0e6c39454a097088c3b5e9271dc9f7d54ecccf4f0767693572b7c26882ed24048af WHIRLPOOL 3eabeaef016a3957b8f6db68499ae4c9f1c1d22e6ade1bcf5a60254753508da48d0a32ee7f6a7baecb88a2853afa828e9c4cc0fa0bbd82e8bfa8ed9a2b66a71d
 EBUILD gnome-control-center-3.8.6.ebuild 5512 SHA256 4a39d96ff68e81ea9cae0542b190a3f945ef1b5084378a739add91461b4cb970 SHA512 8283282c2593bee4f7f920a985114ce7450a42529f43c6d10f8b26c664339e27f5c3d5342fb9fa4c684947542d16ced0444e934838b2f75aeef6d9b045f3f85f WHIRLPOOL 02bc7eff6b2d9a3c9a820aee1f6c5891a710a05aa0822a82b1cfb8c71a2be1fe7e88473ab124a988d823672f1611463d90b98d38ea10efa4f1439fc8005e4519
-MISC ChangeLog 66703 SHA256 b71a26a91c9432846b010a559b0705954d42df14afe1f54be8153c5b29390240 SHA512 57b0c2b9e9906c8b36e87c02bcb5a7026c97ba1f638c3412dbfea5b8cd125e9f1383d10ce42746e0da67d0134d6a205442448400a373a9eb5aeb03cecbd8e4ff WHIRLPOOL ef4c4a10d604931146a3fd422406bec5fc12f153dc16d09073354e52b4c71f07e2ff17aae4d5adb7d0cd912e0336a9c60f3891a057d379d1820e7830a0cb0d40
+MISC ChangeLog 67012 SHA256 0feea27c442cac43dd42fdad536b19aa1b06403d927bf6f68f8726a10775055a SHA512 c04ac546bca4629578f838f38c6d1046e1ac6376d51f0ad07f6131ee1e3db6fd1529de96e90ec9abc74d146c7ee615cd0e33521b5cb8c296a80caf476bcab023 WHIRLPOOL d846f1555c088e7c60c67f0d4894b774e53f11d0a66c24f3e58d3261c377c96a76c48a7b5e6ecbc3ba0d1a2e360ac7b495e8c1abef4c418e9b87d0133cc54590
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkuesACgkQCaWpQKGI+9S0UACfZza7b1JDx98cbE+VoqZ4NH3g
-YHUAn1EHRgF0qj5HBzZPYxx+9qxVeTFZ
-=Pqjj
+iEYEAREIAAYFAlK5yn8ACgkQCaWpQKGI+9Q56ACePPHGKPJBDdTC+ZNpbCc5V7n/
+4c4AoIfNejgyMSKHJZ801Q6Ro9HD6pjD
+=EQaj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
new file mode 100644
index 000000000000..8ef4033492ae
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
@@ -0,0 +1,119 @@
+From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Dec 2013 23:44:56 +0100
+Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo
+
+---
+ panels/datetime/Makefile.am         | 1 +
+ panels/datetime/test-endianess.c    | 4 ++--
+ panels/datetime/test-timezone.c     | 2 +-
+ panels/datetime/tz.h                | 4 ++--
+ panels/printers/Makefile.am         | 3 +++
+ panels/printers/cc-printers-panel.c | 4 ++--
+ panels/printers/pp-host.c           | 2 +-
+ 7 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index fc85592..133845f 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -24,6 +24,7 @@ AM_CPPFLAGS =						\
+ 	$(DATETIME_PANEL_CFLAGS)			\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+ 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
++	-DREALDATADIR="\"$(datadir)\""                  \
+ 	$(NULL)
+ 
+ noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 490df17..b43fc87 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -38,11 +38,11 @@ int main (int argc, char **argv)
+ 		return 0;
+ 	}
+ 
+-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ 	if (dir == NULL) {
+ 		/* Try with /usr/share/locale/
+ 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+-		dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ 		if (dir == NULL) {
+ 			return 1;
+ 		}
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index 5667657..8483b87 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -1,7 +1,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+ 
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+ 
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 71c1c23..ca4b3c4 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -29,9 +29,9 @@
+ #include <glib.h>
+ 
+ #ifndef __sun
+-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+ 
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 63a33b4..12e2e45 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -7,6 +7,9 @@ INCLUDES = 						\
+ 	$(SMBCLIENT_CFLAGS)				\
+ 	-I$(top_srcdir)/shell/				\
+ 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
++	-DREALDATADIR="\"$(datadir)\""                  \
++	-DPREFIX="\"$(prefix)\""                        \
++	-DLIBEXECDIR="\"$(libexecdir)\""                \
+ 	$(NULL)
+ 
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index 29b8173..24bcdf8 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
+ 
+   if (printer_name)
+     {
+-      const gchar  *const dirs[] = { "/usr/share/cups",
+-                                     "/usr/local/share/cups",
++      const gchar  *const dirs[] = { REALDATADIR "/cups",
++                                     PREFIX "/local/share/cups",
+                                      NULL };
+       const gchar  *testprint[] = { "%s/data/testprint",
+                                     "%s/data/testprint.ps",
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index a994a61..51efe50 100644
+--- a/panels/printers/pp-host.c
++++ b/panels/printers/pp-host.c
+@@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
+   data->devices->devices = NULL;
+ 
+   argv = g_new0 (gchar *, 3);
+-  argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
++  argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
+   argv[1] = g_strdup (priv->hostname);
+ 
+   /* Use SNMP to get printer's informations */
+-- 
+1.8.3.2
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
new file mode 100644
index 000000000000..0c4d1117375c
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
@@ -0,0 +1,384 @@
+From 079e6b87816d96d73adaa5eeb2f8a1b620a0ae70 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 9 Dec 2013 23:23:13 +0100
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac                            | 140 ++++++++++++++++++++++++++------
+ panels/Makefile.am                      |  10 ++-
+ panels/user-accounts/um-realm-manager.c |   9 ++
+ shell/Makefile.am                       |  10 ++-
+ shell/cc-panel-loader.c                 |   8 ++
+ 5 files changed, 149 insertions(+), 28 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19bebaf..8b4177a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -136,14 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++AC_ARG_ENABLE(goa,
++	AC_HELP_STRING([--disable-goa],
++		[disable online accounts management panel]),
++	[case "${enableval}" in
++		yes) WANT_ONLINE_ACCOUNTS=yes ;;
++		no) WANT_ONLINE_ACCOUNTS=no ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++	esac],
++	[WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++if test x$WANT_ONLINE_ACCOUNTS = xyes; then
++	PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++	build_online_accounts=true
++fi
++if test "x$build_online_accounts" = xtrue ; then
++	AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+-                  colord >= $COLORD_REQUIRED_VERSION
+-                  colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+-                  libsoup-2.4
+-                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_color=false
++AC_ARG_ENABLE(color,
++	AC_HELP_STRING([--disable-color],
++		[disable color management panel]),
++	[case "${enableval}" in
++		yes) WANT_COLOR=yes ;;
++		no) WANT_COLOR=no ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++	esac],
++	[WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++	PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++		colord >= $COLORD_REQUIRED_VERSION
++		colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++		libsoup-2.4
++		gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++	build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++	AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -196,8 +240,24 @@ if test x${have_networkmanager} = xyes; then
+ fi
+ 
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
+-		  [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++	AC_HELP_STRING([--disable-bluetooth],
++		[disable bluetooth management panel]),
++	[case "${enableval}" in
++		yes) WANT_BLUETOOTH=yes ;;
++		no) WANT_BLUETOOTH=no ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++	esac],
++	[WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++	# Check for gnome-bluetooth
++	PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
++		[have_bluetooth=yes], have_bluetooth=no)
++	have_bluetooth=yes
++fi
++
+ if test "x$have_bluetooth" = xyes ; then
+ 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -282,15 +342,26 @@ case $host_os in
+     if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+       have_wacom=no
+     else
+-      PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+-                        gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+-                        xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+-                        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+-                        clutter-gtk-1.0
+-                        clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
+-      if test x${have_wacom} = xyes; then
++      AC_ARG_ENABLE(wacom,
++                    AC_HELP_STRING([--disable-wacom],
++                                   [disable wacom management panel]),
++                    [case "${enableval}" in
++                            yes) WANT_WACOM=yes ;;
++                            no) WANT_WACOM=no ;;
++                            *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++		    esac],
++		    [WANT_WACOM=yes]) dnl Default value
++
++      if test x$WANT_WACOM = xyes; then
++        PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
++                          gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++                          xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++                          gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++                          clutter-gtk-1.0
++                          clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+         AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+         AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++        have_wacom=yes
+       fi
+     fi
+     ;;
+@@ -301,16 +372,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+ 
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+-  AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++              AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++              [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++    AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++    if test "$KRB5_CONFIG" = "no"; then
++      AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++    fi
+ 
++    AC_MSG_CHECKING(for krb5 libraries and flags)
++    KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++    KRB5_LIBS="`$KRB5_CONFIG --libs`"
++    AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++    AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+ 
+@@ -547,6 +624,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Bluetooth panel disabled])
+ fi
++if test "x$build_color" = "xtrue"; then
++	AC_MSG_NOTICE([** colord (Color panel)])
++else
++	AC_MSG_NOTICE([   Color panel disabled])
++fi
+ if test "x$enable_cups" = "xyes"; then
+ 	AC_MSG_NOTICE([** CUPS (Printers panel)])
+ else
+@@ -557,11 +639,21 @@ if test "x$have_cheese" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xtrue"; then
++	AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++	AC_MSG_NOTICE([   Online Accounts panel disabled])
++fi
+ if test "x$with_libsocialweb" = "xyes"; then
+ 	AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
+ else
+ 	AC_MSG_NOTICE([   Background panel Flickr support disabled])
+ fi
++if test "x$build_wacom" = "xtrue"; then
++	AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++	AC_MSG_NOTICE([   Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ 	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ 	common \
+ 	background \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	notifications \
+-	online-accounts \
+ 	region \
+ 	info \
+ 	sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ 	privacy \
+ 	sharing
+ 
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+ 
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 1fd41ad..ce0988e 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -23,7 +23,9 @@
+ 
+ #include "um-realm-manager.h"
+ 
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -697,6 +699,7 @@ login_closure_free (gpointer data)
+         g_slice_free (LoginClosure, login);
+ }
+ 
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+                      const gchar *realm,
+@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5,
+ 
+         return code;
+ }
++#endif /* HAVE_KERBEROS */
+ 
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+                    GObject *object,
+                    GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+         LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+         krb5_context k5 = NULL;
+         krb5_error_code code;
+@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+ 
+         if (k5)
+                 krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++        g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++                                         _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+ 
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index ad7a68f..cc968ac 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -52,14 +52,12 @@ gnome_control_center_LDADD =						\
+ 	$(top_builddir)/libgd/libgd.la					\
+ 	$(top_builddir)/panels/common/liblanguage.la			\
+ 	$(top_builddir)/panels/background/libbackground.la		\
+-	$(top_builddir)/panels/color/libcolor.la			\
+ 	$(top_builddir)/panels/datetime/libdate_time.la			\
+ 	$(top_builddir)/panels/display/libdisplay.la			\
+ 	$(top_builddir)/panels/info/libinfo.la				\
+ 	$(top_builddir)/panels/keyboard/libkeyboard.la			\
+ 	$(top_builddir)/panels/mouse/libmouse-properties.la		\
+ 	$(top_builddir)/panels/notifications/libnotifications.la	\
+-	$(top_builddir)/panels/online-accounts/libonline-accounts.la	\
+ 	$(top_builddir)/panels/power/libpower.la			\
+ 	$(top_builddir)/panels/privacy/libprivacy.la			\
+ 	$(top_builddir)/panels/region/libregion.la			\
+@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+ 
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+ 
+ # Dbus service file
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+   PANEL_TYPE("bluetooth",        cc_bluetooth_panel_get_type    ),
+ #endif
++#ifdef BUILD_COLOR
+   PANEL_TYPE("color",            cc_color_panel_get_type        ),
++#endif
+   PANEL_TYPE("datetime",         cc_date_time_panel_get_type    ),
+   PANEL_TYPE("display",          cc_display_panel_get_type      ),
+   PANEL_TYPE("info",             cc_info_panel_get_type         ),
+@@ -87,7 +93,9 @@ static struct {
+   PANEL_TYPE("network",          cc_network_panel_get_type      ),
+ #endif
+   PANEL_TYPE("notifications",    cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+   PANEL_TYPE("online-accounts",  cc_goa_panel_get_type          ),
++#endif
+   PANEL_TYPE("power",            cc_power_panel_get_type        ),
+ #ifdef BUILD_PRINTERS
+   PANEL_TYPE("printers",         cc_printers_panel_get_type     ),
+-- 
+1.8.3.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.5-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
index 815a37e1b598..a7a4e18a38de 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.5-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.5-r1.ebuild,v 1.1 2013/10/08 15:24:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild,v 1.1 2013/12/24 17:55:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,8 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos modemmanager +socialweb v4l"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
@@ -27,16 +26,20 @@ QA_CONFIGURE_OPTIONS=".*"
 # https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
 #
 # kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
 COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
+	>=dev-libs/glib-2.37.2:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3
-	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
-	>=gnome-base/gnome-desktop-3.7.5:3=
+	>=x11-libs/gtk+-3.9.12:3
+	>=gnome-base/gsettings-desktop-schemas-3.9.91
+	>=gnome-base/gnome-desktop-3.9.90:3=
 	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
-	dev-libs/libpwquality
+	>=dev-libs/libpwquality-1.2.2
 	dev-libs/libxml2:2
 	gnome-base/gnome-menus:3
 	gnome-base/libgtop:2
@@ -49,7 +52,8 @@ COMMON_DEPEND="
 	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager?]
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/modemmanager-0.7.990
 
 	virtual/opengl
 	x11-apps/xmodmap
@@ -57,15 +61,16 @@ COMMON_DEPEND="
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
-	colord? ( >=x11-misc/colord-0.1.29 )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34 )
 	cups? (
 		>=net-print/cups-1.4[dbus]
 		>=net-fs/samba-3.6.14-r1[smbclient] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
 	kerberos? ( app-crypt/mit-krb5 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
 	socialweb? ( net-libs/libsocialweb )
 	v4l? (
 		media-libs/gstreamer:1.0
@@ -73,6 +78,8 @@ COMMON_DEPEND="
 		>=media-video/cheese-3.5.91 )
 	input_devices_wacom? (
 		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
 		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
@@ -82,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 	colord? (
 		>=gnome-extra/gnome-color-manager-3
-		>=x11-misc/colord-0.1.29
+		>=x11-misc/colord-0.1.34
 		>=x11-libs/colord-gtk-0.1.24 )
 	cups? (
 		>=app-admin/system-config-printer-gnome-1.3.5
@@ -123,11 +130,12 @@ src_prepare() {
 
 	# Make some panels and dependencies optional; requires eautoreconf
 	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}/${PN}-3.8.5-optional.patch"
+	epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
 
 	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
-	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	epatch_user
 
 	# top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
 	# avoid libtoolize "We've already been run in this tree" warning, bug #484988
@@ -138,15 +146,16 @@ src_prepare() {
 		popd > /dev/null
 	done
 	elibtoolize --force
-	epatch_user
 
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
+	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+	# We need to touch timedated{c,h} to prevent them from being
 	# regenerated (bug #415901)
 	# Upstream think they should be removed, preventing compilation errors too
 	# (https://bugzilla.gnome.org/704822)
 	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
 	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+	gnome2_src_prepare
 }
 
 src_configure() {
@@ -160,7 +169,6 @@ src_configure() {
 		$(use_enable gnome-online-accounts goa) \
 		$(use_enable i18n ibus) \
 		$(use_enable kerberos) \
-		$(use_enable modemmanager) \
 		$(use_with socialweb libsocialweb) \
 		$(use_with v4l cheese) \
 		$(use_enable input_devices_wacom wacom)