Needs to be rebuilt with upower-glib .so version updates, drop old

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

13 files changed, 29 insertions, 1178 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index c7397a0a9aae..0e354236bf3b 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.157 2014/07/23 15:16:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.158 2014/09/26 20:33:12 pacho Exp $
+
+  26 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-control-center-3.10.2-optional.patch,
+  -gnome-control-center-3.10.3.ebuild, -gnome-control-center-3.12.1.ebuild,
+  gnome-control-center-3.12.1-r1.ebuild, metadata.xml:
+  Needs to be rebuilt with upower-glib .so version updates, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org>
   gnome-control-center-3.12.1-r1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 5589e084cb59..f0b103172cb2 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -8,32 +8,18 @@ AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f16
 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.12.1-optional-r1.patch 19513 SHA256 f28ff1f142031f3a02abb91d4cfae5037f02caec4d11899ac50de35d1631a2c5 SHA512 949c808a34c6df8e66efba945af9561391fab52c32d2b3928361cdffd50f030c8c61f811f7fb1e601127bb38bb788f6a751cf78cd6f3757b255fd89722c3d15b WHIRLPOOL 72b91611ada4ebabf118d9af73511da186f470054533867ea78cc3cade2a4d40240b668ccd94ebecb5ce8098f0d48de13cdcb6dde3842be2eba57ae8a5b742fe
 AUX gnome-control-center-3.12.1-optional.patch 14081 SHA256 23abccc022b2e2fe5d99dd82b6e076651469859a15bc44b91bb7f28ad895f1ad SHA512 0969b16675056ba1d10bf77352d6dc5012239277fe02da640771b8400bf8afafbc456f3cce7b4eb52d230d460a3869151c917f88703b2c3cf58a6addfdca527a WHIRLPOOL c92c638e53a18e43a100bb383bc3df3e6b7e59d3d95cd89867d8b4e052571845d0a15bbc2ecea889246703fcb130a15887cbb7904f45ea73708636e108fdd654
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
-DIST gnome-control-center-3.10.3.tar.xz 6821248 SHA256 059172d5e7f8b6c385bcc1b73f966375b92a8456dd5eba8d7f8b75907c3324a6 SHA512 0289b5cbe56aeb10f1f28ef9fd66fbe3f3b3f977a1b1a5e8cd5d9089a8d8cae088b0d1abc44ae5a6a461d0a511cbd28446da8371738dbe4147889f40ee37822e WHIRLPOOL 9c5e496d3064c3a66bbb9bb8ede9153199b0e67beec872a3d334b10ac095215354aada524efbe4ccf7d1e3e935ab23f1ec2308a2aa5e9686225a9c5b456ea01e
 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2823 SHA256 2dfa1f6402c7ab7f4539183e15448a234cb6f80e38310c50f222536291d4d4c1 SHA512 562dcadbf348f7e0a25796fa03b5a32786549537fa2213c6ac279b942269a0e8c62a7a977da54c6939d82e87460ee77422032b337dd1959e26403312d82cf081 WHIRLPOOL 099ea3c37bba16bbc94308961365123ccdc80e8b0ec291e3d50a2607ea59fb6b2ce2deba45d1e66be0c3cb99f86b9c0ad55d087c20f90ae7fd93fe8983c8a722
-EBUILD gnome-control-center-3.10.3.ebuild 5097 SHA256 e092609a606d033d42f4dcf66c586a598aa89a7fb4bfe70efc5c5bbb884aaad8 SHA512 cc4d13b69f4d450b8bbd1fddfb80168594c31589233690da3c37896a1a54014ac0aa61b33043e3616fa4f8641eadb1682665d520531b0c47146fa403ad5c47d0 WHIRLPOOL 69e5eeb63573c6c7d49d535f1afd0d3ff9a291dc77bb31e36de65ff0d3afe80dfaf5f5bb8351eb634284bfdc8919b3c5dd0887c2095a1654f541ee79a76424bc
-EBUILD gnome-control-center-3.12.1-r1.ebuild 5017 SHA256 fbdd6b2e299f093faea3b879b9e1c059028ba1e7b0c707d285c5f9e32d647ab3 SHA512 ff791d96fff44bc7c5a076c95b0f7adb89a07f182ddd701ec105edac43f438110c4528bed5a40586fb3ef67dd3750fa37ed8a6930c26cf68effb15c44e1e7a9e WHIRLPOOL a7d46ad7b6be2257e18584b04a073b610542c970622e6658a6ac4ada2fb2577e61b211b256252e3c2d80ff9526809e8f172d2c11f4baf5ad7505f6fac2ca3b4f
-EBUILD gnome-control-center-3.12.1.ebuild 5012 SHA256 fb95aee6294bdf7ce1f73ce60487233f78995236bf62a49f501c7565003556a2 SHA512 6a5c44215bf48b84fdb3599768380877b0606b6ec73605858274b4e773c23aa198530867512843ad20c189c1bbb5a60a27968432d1cee8d4e7a08cf56633aa99 WHIRLPOOL b08136e3746f17616ed17177f3a9e10aeef50c6a301af9075f83014576baa952a88adada0cee47a02601834a7431aac1c0f4946c1a9676381d515e6ad98e4683
-MISC ChangeLog 69918 SHA256 a8a167ad0e73a43902d8738a8707c06c5b4ae43c004cd284464134bc3242495c SHA512 c12451b39ddd5f94bc779f53d509d4ef60f189a37d48b91dce7cc07cd11acbde7b9ba48a9d83c2f87e5c8193d3eedaec26f3a514291897b0cd4de578fc23292a WHIRLPOOL 8327e532ff1ff06d606852d29c269a867f32a6c1914de75d7cba5de15a8fe79eaba5ad29800c0a5b2cf9fdc2997e5c45f2e4349c891fb97476571ebc8937eb43
-MISC metadata.xml 626 SHA256 c9a75efab859ae7807307d84c8c849b4b1c3874bfbb598934146295b5a3f4328 SHA512 be29f660669a454fa1d237dff0045fb574ca9919351e685bb15866a700995ee2de2c7379a60441d08830dfd1d5d5c43a74e731e2a2e92a13109959a42353a87f WHIRLPOOL 1b967098d536cffb46d6b1ae877fa131c7672eb17dd0f49d62dc97a8b6157efb6371664b63a71269aa951e3f59b68e6bce86d037204f4f43242b649081828fcb
+EBUILD gnome-control-center-3.12.1-r1.ebuild 5021 SHA256 382d52bbc8294eaac4bc9d2daf878c0720007a18b3712ff5be12b5ad90316bfd SHA512 c601e47473fd60af2da56529ee1b883e055ee398a4d08a9cc028671e00e0ceb5316cb17a486385f1e242efb8bf5e5623f487ff42c8b9119d30cc50687d4f40b3 WHIRLPOOL fa6236ecd93946911b6e3ecdcc1c0a42ac919bf058afca79beb557142c5f6317f9fdd470de486770960a74adf9c2318676577a4c99ff86bd5676b7077f52d196
+MISC ChangeLog 70220 SHA256 a84125849f9f20e1c99550c5f74454eb598d5f15f74c48967f9ba2b55739df41 SHA512 04ea2f59858b611896df126cdb09a1fda41237c08de6e6e99c964d8a1de321aa08281db4784ca7a59867677e004e3ffb7da81739ba91ab270ba5c1fa8581c6cb WHIRLPOOL 50647eb59d99d39a03246a7cd7b8985a51e4808eb80e1a2a84f461480784da5e7f659e99b107939bc1e1bc8a019c32a3a0c99bfe0080ab1405229796a668c619
+MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9HgAAoJELp701BxlEWfFZAP/jq94vAzyumcUhzr16WPrjk7
-dr/eW649z2crVs+LbmnBmXRCgF+kJwhoH3v+YfiXTHWQcS/RP8QpGfAYKAngJ5Ii
-CkVsYuMbVg4Y9DX7yVmfU2vb9aFrZZDGUpUS9xd62Kp11Q+F0ajAC9k4HqJhJmZh
-JV8p1A+fZ1JNkBpViUAKh/B831HEZThfKVgDm4MLKc1TapXHLdiLpyGFzxWARJfS
-W467KYE7nWTNdMbDLTAU1Dg+3N2Jb7vQ4JzprSHnHYuFcsvZCwD4QGY/y/69m/ux
-w/6daVB5lVoVkk3dt44+rD9P8iJ5gYs5zhBGd5VLjtUJOD3s+uFM8y9v0Kdch3tq
-1s1/RyYMDe+P5AlOiIuuiEj7gPbH9v0BodliUOXNeabGNNe33cDFflkPfUg9Q3in
-eqtRegOfXYWQzNcL8KVtItJCPWHIO4c4EI6crJT2Qwyee2qdkU1ssvzDFogq8QbK
-KNswS5ifASEejVi+fregV+bmQcqDxGAnxVLiQKPAD1ehpOvTMRsD4s/YeL93cbof
-fsSwaRUrSc4Mo9SBRancEiXIxJJgzWZYs0/X+LVPD2Xe18mL12aWW70aQlnd4ZGZ
-fguk9lY4PYLfI3IxktfP3IIUSuPT7KVoMDYGDgHjCNHRVxV3cf9TsTUFqgckHeLk
-3eWq3hkDrsntLkPo5qdi
-=V2wo
+iEYEAREIAAYFAlQlzYkACgkQCaWpQKGI+9RLVgCfRICkKgfbb53wbSMpRLVP4pvj
+llwAn1RbvrudMAy2iroNzJ1w4Tb0bdwA
+=+mtL
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 0c4d1117375c..000000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-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.10.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
deleted file mode 100644
index fa072785139a..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.10.3.ebuild
+++ /dev/null
@@ -1,163 +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-control-center/gnome-control-center-3.10.3.ebuild,v 1.7 2014/06/01 07:59:51 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-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 +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
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.2:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=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]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2
-	media-libs/fontconfig
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	socialweb? ( net-libs/libsocialweb )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=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
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.30
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Gentoo handles completions in a different directory, bugs #465094 and #477390
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-
-	# 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() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with socialweb libsocialweb) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r1.ebuild
index 1aa6febf4dc3..ed456f0fd0d1 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.1-r1.ebuild,v 1.3 2014/07/23 15:16:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r1.ebuild,v 1.4 2014/09/26 20:33:12 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -44,7 +44,7 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-2[glib]
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	>=x11-libs/libnotify-0.7.3:0=
 
 	>=gnome-extra/nm-applet-0.9.7.995
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
deleted file mode 100644
index 4cce05f0f59b..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
+++ /dev/null
@@ -1,162 +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-control-center/gnome-control-center-3.12.1.ebuild,v 1.4 2014/05/31 10:21:05 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-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 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
-QA_CONFIGURE_OPTIONS=".*"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-#
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.39.91:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.11.1:3
-	>=gnome-base/gsettings-desktop-schemas-3.9.91
-	>=gnome-base/gnome-desktop-3.11.3:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/gnome-menus:3
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=media-libs/grilo-0.2.6:0.2
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager]
-	>=net-misc/modemmanager-0.7.990
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
-	i18n? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	v4l? (
-		media-libs/gstreamer:1.0
-		media-libs/clutter-gtk:1.0
-		>=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
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
-	>=sys-apps/accountsservice-0.6.30
-	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		>=app-admin/system-config-printer-gnome-1.3.5
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	i18n? ( >=gnome-base/libgnomekbd-3 )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	cups? ( sys-apps/sed )
-
-	gnome-base/gnome-common
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-
-src_prepare() {
-	# Gentoo handles completions in a different directory, bugs #465094 and #477390
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
-	epatch_user
-
-	eautoreconf
-
-	# 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() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable i18n ibus) \
-		$(use_enable kerberos) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index 0fe31de608d0..2865903805bb 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -9,7 +9,5 @@
 			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
 		<flag name="i18n">Enable support for enhanced input methods through
 			<pkg>app-i18n/ibus</pkg></flag>
-		<flag name="socialweb">Add support for desktop background images from
-			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 95020ef1b4e6..edbe3737650c 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # 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.144 2014/07/24 17:48:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.145 2014/09/26 20:36:22 pacho Exp $
+
+  26 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  -files/gnome-settings-daemon-3.10.2-optional.patch,
+  -files/gnome-settings-daemon-3.7.90-optional-color-wacom.patch,
+  -gnome-settings-daemon-3.10.2.ebuild, gnome-settings-daemon-3.12.2.ebuild:
+  Needs to be rebuilt with upower-glib .so version updates, drop old
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   gnome-settings-daemon-3.10.2.ebuild, gnome-settings-daemon-3.12.2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 6e495a71ed85..cd3aea5e6ce0 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -7,27 +7,19 @@ AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 SHA256 3f81b1bf76b4e01
 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.10.2-optional.patch 3190 SHA256 c4d84d2fc35ee254a637fbc24ab8504d492bd6e0171bda40083222d9c1f30da8 SHA512 33be2bd93c8603a5a7a6c0cfd53ced1413d1ffd6c8ef502c17625c4c766623bde3105a929a0bff88cdc3072594ffd9dd7b3d3eba583e3a5cb7b1bd32399c903e WHIRLPOOL e9ef1d3320970bb8ad850bc5dc00954a03fa4163daebbf398cae5fe6d5279776c1b346388b2c841c052bcca9ce9011578146610fafaeb410122040d68ed2e8a6
 AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe
-AUX gnome-settings-daemon-3.7.90-optional-color-wacom.patch 5877 SHA256 8ff3403c00715bb674d01291588d541794ea795803e4165c7003d6b9652bbde7 SHA512 b7167df5843d90c379076d3bb4f8c247bcabd755f197c3217fb39df2123681fe619896f3d5a2729e969b4af9c47820143c594bbb5158978b2056d744f689c707 WHIRLPOOL f7a185c44539bd2cc8cd89de0ed3afeef0e1cf00326b08d25ad21570c72f22755f02568e6dc9e68a45a56ee2d6fb571dd72689271098ac3c7976d96b888a6dce
 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.10.2.tar.xz 1648652 SHA256 808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264 SHA512 4e937bf178086c3582a7072ce6f2db60b84dac1171ff8344b7b90876b415f0cef0924403308f86cd73f08d6490ae011d533447356c59086e16f41732f1860a87 WHIRLPOOL e1711c2bb9dc4270dfca8aa2f5f9744669a1fa674b64c5aacce55e2b158fe819523a89e02c82086b1fc42cd0b17a274b9ee38e1c450c36371768be0bf8df8d8f
 DIST gnome-settings-daemon-3.12.2.tar.xz 1672512 SHA256 e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f SHA512 d8063933ace4dfc9943991b5e6d29811546dec362cd3e26ec3c1c355ee2bbb854fb6fcc37ebaee78d70342ea2f6ae46325712dc6e20e6404ed54b0ee81c4bb8c WHIRLPOOL 977b689616645329dddeb515e0353927d901c8abf0f8033dd1fca245c77b71477249c5fd1abf82cb8ada25ec0d37a97eaf3af1f9d972f7d983d9e16aee4cd2c5
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
-EBUILD gnome-settings-daemon-3.10.2.ebuild 4217 SHA256 24b15d29d3097d4506aa91475184ebf5e051584b80c01ff4cf42713436b4a8d2 SHA512 5c7fd630db7aaf270a698f50307b10bc7daf02982cd4e3da40b2c29029f35917c8bc61fc1fd93305e0abdacd44ad7c682064df4c3ab47b33d9106eeb46457bc0 WHIRLPOOL cd64349885fb418d2635d8601b9b0090d28f65ff278eb138faf882cb5831b76c9e64b50484f59b00b97d13599f130961cf34f3e0a71f261894164f7643103c88
-EBUILD gnome-settings-daemon-3.12.2.ebuild 4317 SHA256 9914faa46e359f9989bd033dac7304809be8d4257cd7f4df64405e261d08c3fe SHA512 afa0d9c74210e5471b40a0d56b71dfc491ab397053777888ba8aba523414d0eaaf69437d55b49389fddd8d94a41e7d15462734dde2218d02a72455ffa1423874 WHIRLPOOL 8d310b3699d9d131c7f9294c65321dda80bcd559a773af9cc151327d82dd58a5deeda852350f02ffc56e8bd124856bd13d3176e16f7ac981e9b5d2b278ef026d
-MISC ChangeLog 29587 SHA256 498270e03ed6baab1606b27019a2cd64ddb00d56387ec82a407fc10ff3d6957b SHA512 967b76970c8866d772fe4921f13b61175de785528397c1cabda4d03cc6e9b4f0bc9594f8366fa48b93d82b331aa65b9affdac17d1dfcd0de6bf32f498afd46d9 WHIRLPOOL b775a220197ff53dc9f73e1d830917f94fc7f280a2bb2866d7640d6d77740d1e7bb0c912c464e63ed4c7117b5a25c2f069fde73bcf1ceeebe30577bd59317942
+EBUILD gnome-settings-daemon-3.12.2.ebuild 4315 SHA256 e5678387e248c37a401097c471c84260caf512a66dc49dedab1dd3f9a79b21b0 SHA512 0ce16e3777c9ddea09fb1f75ec61d7e575ebb9b3403e78389406f7ac686dfdd12f0641b60f33a64ecb1d24cfa48a57eff9147afa88f4574f94ec7f8f24742ee4 WHIRLPOOL ffcc3d1072cae660e6e789a79424a0d9df12739a9c8267161e3c7ed53ebc7e0b1ecd3fac784472db4236b50066903a352dc52f2ca773076820e6692ec75a382f
+MISC ChangeLog 29896 SHA256 889c3d4ad956537449f48839e07ef341f2f875ab79cc991011259af8b2024bd4 SHA512 e4a361ebba355a10b72b299c8da0fa7d267efcd96fa43c2ccaeb65b50e46812bef13c02f49dc932d94d3df115b2ec1f5a463a8eb0527e58caf933c4d5b74da12 WHIRLPOOL 4d24a527a7c12343d72f039b98812b6351fd5cc31216b41a8996c4a1c579ce362fa098fb42ff968474b6dec5cd71e5af09a9ba0006b5170d0aa6fff824a12e75
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0Ub+AAoJEEdUh39IaPFNYaEH/jSacNRRUPde8mXFBG3w1YKa
-xV7F1MZIRst/gR6njnJAdAsbvqn6L/7WLg+JUkTB+HAw+rE0mWWQQPAb1kAPUr83
-eASkGRrOtE0UoZfT0lx4aqJOa5sgjh8It7jMONcOh3oyBUf7XdtKBKFA+LkY3GDc
-R2nu+pd4baG6FtUt0XtmRyEZ86G4HP8zmpvEoT9qjMa2ckJy8mZkYLgdyxApj01l
-ta1OdioLvmwkSwMH0wdrgqOOgjBnWnkVM1nGy0odQ0MfY9VHEv2EhQCBYernwI8H
-MUv3WCokH9m1rhbD4yiPJqvsKjv0qraBjXdYEJ+zwhpHqRsmkqHZqcgo04mmNI4=
-=Lh1o
+iEYEAREIAAYFAlQlzkcACgkQCaWpQKGI+9Rc0wCfSAA86dvWzv26sHPREoOeV6zY
+JKIAn14ecVtChe4jS4HC6S0x8TYJHclL
+=1NDW
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
deleted file mode 100644
index 213d0a738969..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 10 Dec 2013 00:27:27 +0100
-Subject: [PATCH] Make colord and wacom support optional
-
----
- configure.ac        | 30 ++++++++++++++++++++++++++----
- plugins/Makefile.am |  7 ++++++-
- 2 files changed, 32 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f3b7ed..5720d36 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -245,7 +245,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - datetime
-@@ -276,12 +289,21 @@ case $host_os in
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
--        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+        AC_ARG_ENABLE([wacom],
-+          AS_HELP_STRING([--disable-wacom],
-+                         [turn off wacom plugin]),
-+                      [with_wacom=$enableval],
-+                      [with_wacom=no]) dnl Default value
-+        if test x$with_wacom = xyes; then
-+          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
-+          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
-+          have_wacom=yes
-+        fi
-+        AC_SUBST(WACOM_CFLAGS)
-+        AC_SUBST(WACOM_LIBS)
-       else
-         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-       fi
--      have_wacom=yes
-     fi
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 2f4840d..d517e77 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -22,6 +21,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
--- 
-1.8.3.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-optional-color-wacom.patch
deleted file mode 100755
index 64049e1beeda..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-optional-color-wacom.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 640337bdf28df00583d142413f5e58065d6016ef Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Mon, 25 Feb 2013 17:35:35 +0330
-Subject: [PATCH] gnome-settings-daemon-3.7.90-optional-color-wacom
-
----
- configure           | 46 +++++++++++++++++++++++++++++++++++++++++++++-
- configure.ac        | 29 ++++++++++++++++++++++++++---
- plugins/Makefile.am |  7 ++++++-
- 3 files changed, 77 insertions(+), 5 deletions(-)
-
-diff --git a/configure b/configure
-index 65296f5..6927d31 100755
---- a/configure
-+++ b/configure
-@@ -661,6 +661,8 @@ HAVE_WACOM_FALSE
- HAVE_WACOM_TRUE
- WACOM_LIBS
- WACOM_CFLAGS
-+WITH_COLOR_FALSE
-+WITH_COLOR_TRUE
- COLOR_LIBS
- COLOR_CFLAGS
- BACKLIGHT_HELPER_LIBS
-@@ -911,6 +913,8 @@ enable_iso_c
- enable_schemas_compile
- enable_gudev
- enable_ibus
-+enable_color
-+enable_wacom
- enable_packagekit
- enable_smartcard_support
- with_nssdb
-@@ -1626,6 +1630,8 @@ Optional Features:
-   --disable-gudev         Disable GUdev support (not optional on Linux
-                           platforms)
-   --disable-ibus          Disable IBus support
-+  --disable-color         turn off color plugin
-+  --disable-wacom         turn off wacom plugin
-   --disable-packagekit    turn off PackageKit support
-   --disable-smartcard-support
-                           turn off smartcard support
-@@ -19655,6 +19661,14 @@ fi
- fi
- 
- 
-+# Check whether --enable-color was given.
-+if test "${enable_color+set}" = set; then :
-+  enableval=$enable_color; with_color=$enableval
-+else
-+  with_color=yes
-+fi
-+
-+if test x$with_color = xyes; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLOR" >&5
-@@ -19747,6 +19761,21 @@ $as_echo "yes" >&6; }
- 
- fi
- 
-+$as_echo "#define HAVE_COLOR 1" >>confdefs.h
-+
-+fi
-+ if test "x$with_color" = "xyes"; then
-+  WITH_COLOR_TRUE=
-+  WITH_COLOR_FALSE='#'
-+else
-+  WITH_COLOR_TRUE='#'
-+  WITH_COLOR_FALSE=
-+fi
-+
-+
-+
-+
-+
- 
- case $host_os in
-   linux*)
-@@ -19754,6 +19783,13 @@ case $host_os in
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
-+      	 # Check whether --enable-wacom was given.
-+if test "${enable_wacom+set}" = set; then :
-+  enableval=$enable_wacom; with_wacom=$enableval
-+else
-+  with_wacom=no
-+fi
-+          if test x$with_wacom = xyes; then
- 
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WACOM" >&5
-@@ -19845,10 +19881,14 @@ else
- $as_echo "yes" >&6; }
- 
- fi
-+                 have_wacom=yes
-+	 fi
-+
-+
-       else
-         as_fn_error $? "GUdev is necessary to compile Wacom support" "$LINENO" 5
-       fi
--      have_wacom=yes
-+
-     fi
-     ;;
-   *)
-@@ -20594,6 +20634,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"
-   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${WITH_COLOR_TRUE}" && test -z "${WITH_COLOR_FALSE}"; then
-+  as_fn_error $? "conditional \"WITH_COLOR\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${HAVE_WACOM_TRUE}" && test -z "${HAVE_WACOM_FALSE}"; then
-   as_fn_error $? "conditional \"HAVE_WACOM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff --git a/configure.ac b/configure.ac
-index 49035f3..4aa70b6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -241,7 +241,20 @@ dnl ---------------------------------------------------------------------------
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE([color],
-+  AS_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+       [with_color=$enableval],
-+       [with_color=yes]) dnl Default value
-+
-+if test x$with_color = xyes; then
-+       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
-+fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
-+
-+AC_SUBST(COLOR_CFLAGS)
-+AC_SUBST(COLOR_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom (disabled for s390/s390x and non Linux platforms)
-@@ -253,11 +266,21 @@ case $host_os in
-       have_wacom=no
-     else
-       if test x$enable_gudev != xno; then
--        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION])
-+      	 AC_ARG_ENABLE([wacom],
-+	   AS_HELP_STRING([--disable-wacom],
-+	                  [turn off wacom plugin]),
-+	                  [with_wacom=$enableval],
-+		          [with_wacom=no]) dnl Default value
-+         if test x$with_wacom = xyes; then    
-+                 PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION])
-+                 have_wacom=yes
-+	 fi
-+	AC_SUBST(WACOM_CFLAGS)
-+	AC_SUBST(WACOM_LIBS)
-       else
-         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
-       fi
--      have_wacom=yes
-+      
-     fi
-     ;;
-   *)
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index b3aed9e..a4cb188 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -4,7 +4,6 @@ enabled_plugins =	\
- 	a11y-keyboard	\
- 	a11y-settings	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
- 	power		\
-@@ -21,6 +20,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if WITH_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
- else
--- 
-1.8.1.2
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
deleted file mode 100644
index 314a580e0c44..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.10.2.ebuild
+++ /dev/null
@@ -1,141 +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-settings-daemon/gnome-settings-daemon-3.10.2.ebuild,v 1.8 2014/07/24 17:48:47 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 systemd virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
-REQUIRED_USE="
-	packagekit? ( udev )
-	smartcard? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2
-	>=x11-libs/gtk+-3.7.8:3
-	>=gnome-base/gnome-desktop-3.9:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
-	>=gnome-base/librsvg-2.36.2
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-
-	app-misc/geoclue:2.0
-	>=dev-libs/libgweather-3.9.5:2
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? ( >=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev )
-	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	>=x11-themes/gnome-themes-standard-2.91
-	>=x11-themes/gnome-icon-theme-2.91
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
-	# Apparently this change severely affects touchpad usability for some
-	# people, so revert it if USE=short-touchpad-timeout.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.10.2-optional.patch"
-
-	epatch_user
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-man \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable i18n ibus) \
-		$(use_enable packagekit) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "http://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild
index d7ffe0b62e08..55c9d384ba91 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-3.12.2.ebuild,v 1.4 2014/07/24 17:48:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.2.ebuild,v 1.5 2014/09/26 20:36:22 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99
+	>=sys-power/upower-0.99:=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3:=