Version bump for gnome-3.2 version. Make gnome-online-accounts optional (requested by Matt Turner). Fix socialweb USE flag description. Drop old.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

7 files changed, 247 insertions, 71 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 1e8c4402344d..f359ad7f6d17 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.103 2012/05/21 18:51:38 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.104 2012/05/25 08:15:12 tetromino Exp $
+
+*gnome-control-center-3.2.3 (25 May 2012)
+
+  25 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-control-center-3.2.3.ebuild,
+  +files/gnome-control-center-3.2.3-optional-colord-goa.patch,
+  -gnome-control-center-3.4.1.ebuild,
+  -files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch,
+  gnome-control-center-3.4.2.ebuild,
+  +files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch,
+  metadata.xml:
+  Version bump for gnome-3.2 version. Make gnome-online-accounts optional
+  (requested by Matt Turner). Fix socialweb USE flag description. Drop old.
 
   21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-3.2.2.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index f5679b2264b5..e9a7283f02c2 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -10,27 +10,28 @@ AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd888
 AUX gnome-control-center-3.2.2-metacity-gconf.patch 1051 RMD160 3e828bc3217ff67cc862cc47edbc5b7c7f1a2309 SHA1 fbdfccca12c536bed76ad7783763b9e5a677dc2d SHA256 c3fa18ddebaec274e6095277cd1586041bba08b89cc03daaedada9103abea64d
 AUX gnome-control-center-3.2.2-timezone-free.patch 983 RMD160 1d8a84ebac8b3b80f3db953421f07adf4649359b SHA1 8ffe002d9af49a40bbe7b8a4c06067815b75610b SHA256 4c76fae0549ed5893cf594340576c7ca4230c470bd5402ed686b95fdd65b05af
 AUX gnome-control-center-3.2.2-timezones-linguas.patch 1266 RMD160 e54de3d8eff1b9de3f609c9fe21b128ffb82add5 SHA1 1bff83ce2d7ac31864f2d4f4fccee8043f52f9d7 SHA256 f693ecb6a03c4dbdc220609e6d1976d4a6f3bc8740c0bf1cbd1784e8eabc67d7
-AUX gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch 4648 RMD160 c9d1f6568f97b2e7c3989a4d8e73a05074d7ce5c SHA1 db73b7eec100a4cad3448a5072b11fec6a492d8d SHA256 824a3a0fdb0fda43d27eb5df66a3b60f9f674c3ef667920fc0811cc38ee71b60
+AUX gnome-control-center-3.2.3-optional-colord-goa.patch 3205 RMD160 5322cd75ca4101fbde06ed2b4d89765d714d0b68 SHA1 a82b68cf3467ac003fc9abeeabb3eacb522cfc50 SHA256 6de471d3b2468daeaf05265745ea090bd89c584c2218d8079299d1dd8d79e0af
+AUX gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch 7023 RMD160 65e29321c5a2ba21cb9449a49440018cfd76573e SHA1 08d93d2c3265d8dde8136a422bc14027377dcdd4 SHA256 933af56534f4b62c74d55a650f4af510f7d39f9ae0a846d53988bbc06ec703d5
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
 DIST gnome-control-center-3.2.2.tar.xz 4225196 RMD160 6a97f6cf9824c99daf3b33c0e347131b7024988f SHA1 e946ab719625e6f793141434179a932c35ece183 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369
-DIST gnome-control-center-3.4.1.tar.xz 4416236 RMD160 0823b75990b285d93826ae71d4caab83e342cf35 SHA1 0ba55a946211f70ecb7c195cfff8ca73a8f01c65 SHA256 c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1
+DIST gnome-control-center-3.2.3.tar.xz 4238612 RMD160 1a16ffcd39d743b84fba8049c55607cbf97b6f6d SHA1 ce66ae73d10f3a971ce0e95eca61ecc3177b415a SHA256 f0460410ba5af5a1f784a0006d814bab93b1e647f93a490a5c4c2c585815ae14
 DIST gnome-control-center-3.4.2.tar.xz 4267688 RMD160 e5ef20cf80d148cd0a94a9d42206ac17805dd64d SHA1 f5296d1ae8eade22ad89fe30cfe32420c068f01b SHA256 efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 RMD160 400f355138bc3cc71bde6a48905ef3a6ffd64a43 SHA1 c0d41d57a9d3ac2b5230dd45f3fcf32b3f72c630 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270
 EBUILD gnome-control-center-3.2.2-r1.ebuild 3571 RMD160 312489edc0c7af7735e5e26a0c5a7ef51b50ac44 SHA1 bdcdde4ba2d4b3a0d7911f99721af7e7d3b41696 SHA256 6d1abc936f24c89b964daa0333d97cfd4ad6f95330466bfd5a0d2eb354e1b4ae
 EBUILD gnome-control-center-3.2.2.ebuild 3304 RMD160 43f5e9159212a70279adf977e837128828516051 SHA1 d02782155d02ed93260501a601a17f23f43354ad SHA256 ae8b43325c9140cd707d69321c5995ed234029b0fc4412cd8d7f6a9ab4caa206
-EBUILD gnome-control-center-3.4.1.ebuild 3850 RMD160 fdee71f81089a6ad0f6811df1e0c3ab4470f065f SHA1 18a954924831a147d5ce1f65049be65be8b2b7dc SHA256 c5b296fa37aeef6b713b0b7c9ef9592d35188296fc5f254e261f71e1049cd0c2
-EBUILD gnome-control-center-3.4.2.ebuild 3907 RMD160 06bc65f1c2063b222f0b574fc755b5b584b0b2e5 SHA1 70141af54fe4e1b3852461c8279036fd25726aef SHA256 24b7451c4d7366ecb0be513b09e504808f3c5ab062bcd52a2d27fa2170d093ca
-MISC ChangeLog 56786 RMD160 800039ab246f58f32c2efb6d3bfedec8609a0f66 SHA1 a40ab8a5f35418d21bae317c80faa7f762c9b39d SHA256 580f5a1132f4905dc64bc56cae7c623d0f3236b23cb077f329817c190d1bdfc3
-MISC metadata.xml 734 RMD160 4bb175f304af7d332411634034cd27eedfcd766a SHA1 c4401e101b27cad60966b153f2bad30ad7ab1e52 SHA256 a0b1ff067c0b24471a16aa6862bddc3d712b5fffb0489bdf84f5297fa0593bc6
+EBUILD gnome-control-center-3.2.3.ebuild 3433 RMD160 72233339247b99da1fbefa20310fcaa36ec085f5 SHA1 38941a0fe3379e48d5034ea0a7d0c45b515ca822 SHA256 87f1f21d422aa1e32f3afdaf2a6fef1d0f3a227f226514808b692a7ee66c3eff
+EBUILD gnome-control-center-3.4.2.ebuild 3994 RMD160 02a38e51106c9e9dbfdf9da9a387b18d5b260077 SHA1 131c831552fc0059ab842a75501c85b3b3410eac SHA256 eb52529b166f318a46f338a2e706cf679ee9fc50472ca4e262a87bde979e4aaa
+MISC ChangeLog 57378 RMD160 43408002e378db4cc61d55b4fc4a3a9ff92bcf97 SHA1 bd02d7b93f8f8a90f266847b5ce0b5080351301e SHA256 cebf53bbded1c549de0c122a77f3214feab2dee899b41aaf898a88db1a5b1e73
+MISC metadata.xml 861 RMD160 68868736303c9a6aee041f79272e335ecf598800 SHA1 7b0e8ada654c3d833ca8b9f861f002fa52fab146 SHA256 9f78bdf41ecb164c1465a0bd87889b7bf64c92bc7057123718f9894ee3f6e1bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuo6/AAoJEJ0WA1zPCt1hmJMH+wdeCe+PxP/5MWOWq4d+FQ0x
-HGuxQ3lCYFw2FhB/m8nEkYCAHvAbyZrETaQvLWLLncXUw+whXAroFGU1ime6MTsu
-+fuL1H+lzc8s/xByD3WM1gEpEgUmJUxpOuO6XiQxr7pF/rxx4KujdENwFgOrc19v
-7nA8mGGgq3DFysjJ20r0gAhwrnZ0LaLMc+17vWn3aBDK+f9qk7qEtQEi/Z1ThVL6
-cjBrfwkfviL3xy0c5eD1WJ0sVwEuAwJ3nmllKKJ7tZURzS+8lPp5JGpToQIyNrB4
-ln8FLuQsyf6m8Cf5hETNEL7gD/fmFv0jyBc11KNhpHemCkAIXXFNJ5bYyUXQeV4=
-=5BwZ
+iQEcBAEBAgAGBQJPvz+WAAoJEJ0WA1zPCt1hu1sH/jQbRvzOQnf1SBTrPiQBmYZD
+AhLLPBp0zcjqQneBUNtnAb6RVE1bYjBOdi94V2NDFphodlUdSw9np/o+bi9IYfmz
+FJPvqSsj0DG6eFBgfbFtyrs5ywSa0yNE6q3ObHgDKa0xWyMBf2b4Esd9Y+Hd7tdq
+v7NianlT08rIPOH8HKYad63hzQzoNRvv4ESdNMoGKPxrkzvHuAJnRxPSJNOfmMdj
+bWxHdjWu8N7poGSvlbGO1JB9um/AcHsjgVnuQJoa/PAg88++MUw8s1YcDTjf9mu1
+BTCf1yoFM0iXUGQkoxSTOEvO6fD5QeL73Vuso+HgGYEGqyfxJrU7djy8t+1JRac=
+=Y9Ed
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.3-optional-colord-goa.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.3-optional-colord-goa.patch
new file mode 100644
index 000000000000..24fadfc3e28d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.3-optional-colord-goa.patch
@@ -0,0 +1,100 @@
+From 86cd8f0edaea95ec819cfcc380834608d95b066a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 27 Oct 2011 23:55:23 -0400
+Subject: [PATCH] Make colord and gnome-online-accounts optional.
+
+---
+ configure.ac       |   38 ++++++++++++++++++++++++++++++++++++--
+ panels/Makefile.am |   10 ++++++++--
+ 2 files changed, 44 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 109c610..26e9f6b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,10 +103,44 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
++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)
++      build_online_accounts=true
++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 >= 0.1.8)
++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 >= 0.1.8)
++      build_color=true
++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 dbus-glib-1
+                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 566a2f8..ab636c5 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,11 +3,9 @@ SUBDIRS= \
+ 	background \
+ 	screen \
+ 	power \
+-	color \
+ 	display \
+ 	media \
+ 	mouse \
+-	online-accounts \
+ 	region \
+ 	info \
+ 	sound \
+@@ -17,6 +15,10 @@ SUBDIRS= \
+ 	datetime \
+ 	wacom
+ 
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+ endif
+@@ -25,4 +27,8 @@ if BUILD_NETWORK
+ SUBDIRS += network
+ endif
+ 
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.8.6
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch
index 03248f790040..31facc732a1e 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch
@@ -1,19 +1,41 @@
-From f9d277788e7ac4338955a272eee043f6774421d9 Mon Sep 17 00:00:00 2001
+From 93d009037aa3321e2eea86ef2e70cde959c5a250 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Sun, 13 May 2012 19:53:13 -0400
-Subject: [PATCH] Make bluetooth, colord, wacom optional
+Subject: [PATCH] Make bluetooth, colord, gnome-online-accounts, wacom
+ optional
 
 ---
- configure.ac       |   65 ++++++++++++++++++++++++++++++++++++++++++++-------
- panels/Makefile.am |   12 +++++++--
- 2 files changed, 65 insertions(+), 12 deletions(-)
+ configure.ac       |  101 ++++++++++++++++++++++++++++++++++++++++++++++------
+ panels/Makefile.am |   17 +++++++--
+ 2 files changed, 103 insertions(+), 15 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1046870..a40b792 100644
+index d496365..2d2d15e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,7 +109,24 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
+@@ -106,10 +106,44 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+                   gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
++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)
++      build_online_accounts=true
++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 >= 0.1.8)
@@ -23,8 +45,8 @@ index 1046870..a40b792 100644
 +                 [disable color management panel]),
 +      [case "${enableval}" in
 +              yes) WANT_COLOR=yes ;;
-+	      no) WANT_COLOR=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++              no) WANT_COLOR=no ;;
++              *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
 +      esac],
 +      [WANT_COLOR=yes]) dnl Default value
 +
@@ -38,7 +60,7 @@ index 1046870..a40b792 100644
  PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
                    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
  PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-@@ -127,10 +144,26 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
+@@ -127,10 +161,26 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
                    gnome-desktop-3.0
                    gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
                    $SYSTEMD)
@@ -53,8 +75,8 @@ index 1046870..a40b792 100644
 +                 [disable wacom management panel]),
 +      [case "${enableval}" in
 +              yes) WANT_WACOM=yes ;;
-+	      no) WANT_WACOM=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++              no) WANT_WACOM=no ;;
++              *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
 +      esac],
 +      [WANT_WACOM=yes]) dnl Default value
 +
@@ -69,7 +91,7 @@ index 1046870..a40b792 100644
  
  GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
  AC_SUBST(GDESKTOP_PREFIX)
-@@ -146,10 +179,24 @@ if test "x$have_networkmanager" = xno ; then
+@@ -146,10 +196,24 @@ if test "x$have_networkmanager" = xno ; then
  fi
  AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
  
@@ -83,8 +105,8 @@ index 1046870..a40b792 100644
 +                 [disable bluetooth management panel]),
 +      [case "${enableval}" in
 +              yes) WANT_BLUETOOTH=yes ;;
-+	      no) WANT_BLUETOOTH=no ;;
-+	      *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++              no) WANT_BLUETOOTH=no ;;
++              *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
 +      esac],
 +      [WANT_BLUETOOTH=yes]) dnl Default value
 +
@@ -98,19 +120,61 @@ index 1046870..a40b792 100644
  
  # Check for CUPS 1.4 or newer
  AC_ARG_ENABLE([cups],
+@@ -423,11 +487,16 @@ if test "x$have_networkmanager" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Network panel disabled])
+ fi
+-if test "x$have_bluetooth" = "xyes"; then
++if test "x$build_bluetooth" = "xtrue"; then
+ 	AC_MSG_NOTICE([** gnome-bluetooth (Bluetooth panel)])
+ 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
+@@ -438,6 +507,11 @@ 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
+@@ -448,4 +522,9 @@ if test "x$with_systemd" = "xyes"; then
+ else
+ 	AC_MSG_NOTICE([   Using ConsoleKit for session tracking])
+ 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
+ AC_MSG_NOTICE([End options])
 diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 172dd06..09e7b00 100644
+index 172dd06..134b0c8 100644
 --- a/panels/Makefile.am
 +++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS= \
+@@ -3,18 +3,19 @@ SUBDIRS= \
  	background \
  	screen \
  	power \
 -	color \
  	display \
  	mouse \
- 	online-accounts \
-@@ -13,8 +12,11 @@ SUBDIRS= \
+-	online-accounts \
+ 	region \
+ 	info \
+ 	sound \
  	keyboard \
  	universal-access \
  	user-accounts \
@@ -124,10 +188,14 @@ index 172dd06..09e7b00 100644
  
  if BUILD_PRINTERS
  SUBDIRS += printers
-@@ -28,4 +30,8 @@ if BUILD_BLUETOOTH
+@@ -28,4 +29,12 @@ if BUILD_BLUETOOTH
  SUBDIRS += bluetooth
  endif
  
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
 +if BUILD_WACOM
 +SUBDIRS += wacom
 +endif
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild
index 24bdd946532a..894b57da8035 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.1.ebuild,v 1.2 2012/05/14 13:15:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.3.ebuild,v 1.1 2012/05/25 08:15:12 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb wacom"
+IUSE="+cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
@@ -24,12 +24,14 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solari
 # gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
 # g-s-d[policykit] needed for bug #403527
 COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
+	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.3.5:3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	>=gnome-base/gnome-desktop-3.1.91:3
-	>=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit]
+	>=x11-libs/gtk+-3.1.19:3
+	>=gnome-base/gsettings-desktop-schemas-3.0.2
+	>=gnome-base/gconf-2.0:2
+	>=dev-libs/dbus-glib-0.73
+	>=gnome-base/gnome-desktop-3.1.0:3
+	>=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit]
 	>=gnome-base/libgnomekbd-2.91.91
 
 	app-text/iso-codes
@@ -37,7 +39,6 @@ COMMON_DEPEND="
 	gnome-base/gnome-menus:3
 	gnome-base/libgtop:2
 	media-libs/fontconfig
-	net-libs/gnome-online-accounts
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-0.9.16[glib]
@@ -51,32 +52,27 @@ COMMON_DEPEND="
 	>=x11-libs/libxklavier-5.1
 	>=x11-libs/libXi-1.2
 
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
 	cheese? (
 		media-libs/gstreamer:0.10
-		>=media-video/cheese-3.3.5 )
+		>=media-video/cheese-2.91.91.1 )
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
 		>=net-misc/networkmanager-0.8.997 )
-	socialweb? ( net-libs/libsocialweb )
-	wacom? ( >=dev-libs/libwacom-0.3
-		x11-libs/libXi )"
+	socialweb? ( net-libs/libsocialweb )"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	app-admin/apg
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
 	cups? ( net-print/cups-pk-helper )
-	wacom? ( gnome-base/gnome-settings-daemon[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"
+	!<gnome-extra/gnome-media-2.32.0-r300"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
@@ -98,29 +94,24 @@ DEPEND="${COMMON_DEPEND}
 #	gnome-base/gnome-common
 
 pkg_setup() {
-	# TODO: libwacom is needed for wacom support
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		$(use_enable bluetooth)
 		$(use_with cheese)
 		$(use_enable colord color)
 		$(use_enable cups)
-		$(use_with socialweb libsocialweb)
-		$(use_enable wacom)"
+		$(use_enable gnome-online-accounts goa)
+		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
 src_prepare() {
-	# Make colord plugin optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.4.1-optional-bluetooth-colord-wacom.patch"
+	# https://bugzilla.gnome.org/show_bug.cgi?id=670051, requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.2-timezones-linguas.patch"
+
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.3-optional-colord-goa.patch"
 	eautoreconf
 
 	gnome2_src_prepare
-
-	# 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
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
 }
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
index 16b140047da1..aff960bfacaf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.2.ebuild,v 1.2 2012/05/21 14:32:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild,v 1.3 2012/05/25 08:15:12 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
@@ -37,7 +37,6 @@ COMMON_DEPEND="
 	gnome-base/gnome-menus:3
 	gnome-base/libgtop:2
 	media-libs/fontconfig
-	net-libs/gnome-online-accounts
 
 	>=media-libs/libcanberra-0.13[gtk3]
 	>=media-sound/pulseaudio-0.9.16[glib]
@@ -57,6 +56,7 @@ COMMON_DEPEND="
 		>=media-video/cheese-3.3.5 )
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( net-libs/gnome-online-accounts )
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
 		>=net-misc/networkmanager-0.8.997 )
@@ -107,6 +107,7 @@ pkg_setup() {
 		$(use_with cheese)
 		$(use_enable colord color)
 		$(use_enable cups)
+		$(use_enable gnome-online-accounts goa)
 		$(use_with socialweb libsocialweb)
 		$(use_enable systemd)
 		$(use_enable wacom)"
@@ -114,8 +115,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Make colord plugin optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.4.1-optional-bluetooth-colord-wacom.patch"
+	# Make some panels optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch"
 	eautoreconf
 
 	gnome2_src_prepare
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index bc5209b07a1e..55c8b1b65015 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -7,8 +7,10 @@
 			<pkg>x11-misc/colord</pkg></flag>
 		<flag name="cheese">Add support for taking pictures for the user
 			accounts panel using <pkg>media-video/cheese</pkg></flag>
-		<flag name="socialweb">Add support for configuring social web service
-			settings using <pkg>net-libs/libsocialweb</pkg></flag>
+		<flag name="gnome-online-accounts">Enable configuration panel for
+			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+		<flag name="socialweb">Add support for desktop background images from
+			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
 		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 		<flag name="wacom">Enable support for Wacom tablets and drawing