Fix optional patch (#464346 by poncho), this also solves bugs #463858 and #463856. NetworkManager is not really optional now.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 434 insertions, 5 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index c66cb960261f..f8fa4cdab1a7 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.123 2013/03/28 23:08:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.124 2013/04/07 09:19:11 pacho Exp $
+
+*gnome-control-center-3.8.0-r1 (07 Apr 2013)
+
+  07 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-control-center-3.8.0-optional-r1.patch,
+  +gnome-control-center-3.8.0-r1.ebuild:
+  Fix optional patch (#464346 by poncho), this also solves bugs #463858 and
+  #463856. NetworkManager is not really optional now.
 
 *gnome-control-center-3.8.0 (28 Mar 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 18ec737209a9..acff43c8c190 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -11,6 +11,7 @@ AUX gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch 5989 SHA256 e
 AUX gnome-control-center-3.5.91-optional-kerberos.patch 7920 SHA256 49bc7820c9c5b3ee8171111d9ec37c878554e22b61badece23abf1e2bd09548a SHA512 960743771dab2b929fb1071e1c532e78eb87d4c902f0e72e4c2c99fc01e838022b84394c7e52a202f4c22f96061681d2fe82194cfa23651320cc96c8e29bad92 WHIRLPOOL d4db5288d848631f1cc6a3935ad4455fcb026857b043299af609b070c93d8e5f878d727d6e3049c6b273131ae15b11b9d514d80c7e58b39215e378fbda9db427
 AUX gnome-control-center-3.6.3-pulseaudio-3-fix.patch 1605 SHA256 cd02aad43cf34a91b2449ab1d583169449ca2a6cea057a1ff205b2b6f1e6463f SHA512 d29dc4ed8ead058c9a5fd94d14c2f1fb3d3287872057d605d4ccecf7146fa6f80a2fd292761ce1420689172e90ec74da8835241bb4f48f36502388da84319d2d WHIRLPOOL d4b294af571aadc5c6915f131c22c2d38ffc5617f7a8d19d8d8615123d5cead41b3d19323cf169c25bc03f57106580cc6f3f63f304b46dd09fece919e09ead89
 AUX gnome-control-center-3.7.4-optional-kerberos.patch 6668 SHA256 7e4807b03c7f5d97294e5a9f933c1764a6a281a4e984c3f03e67fc8b14d80497 SHA512 154284f795f564396a3e30e963e268f39684e526e35d2f4354f12ae5f0660907f44c8ce7cb23ef22930f9e131312a29a88073ea48c69afd5baec0637fecc362d WHIRLPOOL 4fc87d4aef26ea0433cfa65a948c2ce5e7c9f960f823be9d7f5ab3b1ebf697da1c9b97787e6821ee2fc17f61ab2a46a49c0c4137c69be8376690cc6af3b50239
+AUX gnome-control-center-3.8.0-optional-r1.patch 9577 SHA256 9234128cb2c733f46fbbe0f2ec2e1854ac9bc7dae35eb945b3114ad510e50e79 SHA512 e10c6d54db275fe1d8ad774f041c00568be4dd5e5582c0350ba11362a6a007487f8ec7fc9750665ec8a9bb7952325bd758ff7bb8df6e0c369390bbcd51a8a835 WHIRLPOOL 13de899453bafcab1d8f2cc756db6200358f97cd7bda875ad3b8bdbdf224b6f89d335a8023f963fcc8f5ca605acc29d2844c5fa9cb77a9e976a19ab13558cd24
 AUX gnome-control-center-3.8.0-optional.patch 6275 SHA256 d96c9978e4ea4cb71c6710e939b5a55fb8ed211e96fc4c5bb601b7a22dd815cb SHA512 0c944c74344ed2461c9f5c1bf812fb95efd519d745429d0621c6b569343d2aff7828bf954a72865c08af6ab925d6a397666f3a97a0e27a9d4d998a65d1cad718 WHIRLPOOL 479929b80765fa9fcbb4a6f222ce5e198496d9d40cbd499d176d43fbe574b5a59f7cfb1132b682cef459e817b8a51564ca276e6480a24d0f1d4e08ebc0832b19
 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
@@ -19,13 +20,14 @@ DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5
 DIST gnome-control-center-3.8.0.tar.xz 6793712 SHA256 154653d45c224eb5daf5a756e145989c2477fc4b448af20a5b62dbb897dd74f7 SHA512 abffd5b5942c02db8ca3263faab2c4e76865f5d3b4666a6d830c6b62e87e3a922bd7564d7c3bca21e2d8394a4efb505035fe685a189a0837cdbd3a81e9a6c970 WHIRLPOOL e50737d74e54eb8675d7ab4b8199306fcb28eaa6c0cb3317f41a68e07ed9b03c3f5b02ad04bbe68e639e72e835f78941f0f4967f86cac0c677c66273fe132eac
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
 EBUILD gnome-control-center-3.6.3-r1.ebuild 4559 SHA256 d532e2601572d312f367ee885aedf2f9b057b2ea1151bbf4bb2051f5633bb892 SHA512 db7dd4fdc00654669da0c0213714eb9a966f4a5ac1d98b5455eb1470fdb31c5d31ace30793c2e32f9fecf42adc58aac6e2d2e581e9f73e6eb3d9e6618447d2dd WHIRLPOOL c5bf7f6bcc5ee2eda5bc351975ed9143f9b31a14af3f250cdfc8d82189485eeea5db5f236b29be74ea59914151500d4a3841854146a8f163b58f45228ffd5db8
+EBUILD gnome-control-center-3.8.0-r1.ebuild 4419 SHA256 ca31257544e57a63393e569eb9a163d8349bcefa5a7ac7fcc5bc16b9326570b1 SHA512 23db384f2dc69fe77e5ffbfd54e4d426da5116bcd6df0d09814ac0f6a8ef5740bdaa7efac3a734f5ce2840836c69e28278e41fd602f2ed7e7cef2b4b98787ae0 WHIRLPOOL efec3c6365c8ff1772e0706ab051ee4cb5686be89fe7a270568dd767280ce5ad4dbe26805540b00d325576d9f7650448ef938d21976dddaa228fc5d0ac5e2430
 EBUILD gnome-control-center-3.8.0.ebuild 4510 SHA256 6d40653b948d250f0d4a544c1c61ff49517a6c9995407d1e216a1ececcf45f97 SHA512 e530738fc7fd142642353e31f76d3c6302abd7f72b321212aaf2a67fefdf038efed387e74dd7e2348e22f4e77c52543fd954a3ab738c14e227175f4830bb4c39 WHIRLPOOL 0fb2db01869ee5aefe54dc225824bb753c8b9d3fa73fddb5e11f6e9cfbc3d6f49f7e8bda0cd82a47de6bb8cf75a975c4c311572c1967e050aacbb6c69d7b3215
-MISC ChangeLog 61667 SHA256 8bc487a86eabe15cdc282db30d0e86387c553b65996e8d2d480450e518c7f277 SHA512 e16b524cf885220533c905f7e2940d7dd609c508d27a50d89f08fb5057de1054efd332cf27bbffb0a48154e52753a123052bb82572cdefe9a80d3b501b332fc1 WHIRLPOOL af57b49230cb78c17e334b7dc4f66c292a2b78276d6878137f1493f05264224b93246666d23cf996735b41b823006427ad9c9e32e0648a1f2f1f3f218c5b8403
+MISC ChangeLog 61986 SHA256 d927e351203f7d25f381f33b418279497b2b261a27d043ef9e68dc31b6ebdea0 SHA512 cfbcec1751f0dbb3a3dce8726949d47244f9e09134bcf39d8974c831d9ca9c2fe27a20860ebed67309dd58f003cff463836c4a1418e27ba00cd85d1b08a18733 WHIRLPOOL ce22055da3d452c52bf0fb6af2fff9b57069113f3483d2001f66e6d9319adc3eceab03cdd747bbb517309f747e84ce59bf5eeb690e23bd6b7deb2807cb330b9e
 MISC metadata.xml 626 SHA256 c9a75efab859ae7807307d84c8c849b4b1c3874bfbb598934146295b5a3f4328 SHA512 be29f660669a454fa1d237dff0045fb574ca9919351e685bb15866a700995ee2de2c7379a60441d08830dfd1d5d5c43a74e731e2a2e92a13109959a42353a87f WHIRLPOOL 1b967098d536cffb46d6b1ae877fa131c7672eb17dd0f49d62dc97a8b6157efb6371664b63a71269aa951e3f59b68e6bce86d037204f4f43242b649081828fcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUzVgACgkQCaWpQKGI+9SmBACeK5PHEEtWARAKtHcTX29SCCP1
-3+AAnitt7xa5nV8K/tT63xdc4c6p6Hk/
-=8f0s
+iEYEAREIAAYFAlFhOhEACgkQCaWpQKGI+9QucACfXALt/BdcjFQuz5aAJ08l2EX2
+br4Ani7zzhiIFdfU6nabzgW7UBQMi/O5
+=JAwA
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch
new file mode 100644
index 000000000000..e7fe8dc8d776
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch
@@ -0,0 +1,271 @@
+diff --git a/configure.ac b/configure.ac
+index b3df2dd..6b10ce4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,13 +143,57 @@ 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
+-                  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
++		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)
+@@ -210,9 +254,22 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
+ 
+-# Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
+-		  [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.5.5)
++	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
+@@ -289,12 +346,23 @@ 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)
+-      AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+-      have_wacom=yes
++	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)
++		have_wacom=yes
++	fi
+     fi
+     ;;
+   *)
+@@ -555,6 +623,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
+@@ -565,11 +638,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/shell/Makefile.am b/shell/Makefile.am
+index f9f9070..094aca1 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -51,14 +51,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			\
+@@ -84,6 +82,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\""
+ 
+ sysdir = $(datadir)/applications
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 20a5262..1cef85d 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     ),
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..b0da8db6ac49
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.0-r1.ebuild
@@ -0,0 +1,148 @@
+# 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.0-r1.ebuild,v 1.1 2013/04/07 09:19:11 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb systemd v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# 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
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.1:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.7.7:3
+	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
+	>=gnome-base/gnome-desktop-3.7.5:3=
+	>=gnome-base/gnome-settings-daemon-3.6[colord?,policykit]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	app-text/iso-codes
+	dev-libs/libpwquality
+	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.9.1
+	>=x11-libs/libnotify-0.7.3
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
+	colord? ( >=x11-misc/colord-0.1.29 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
+	i18n? ( >=app-i18n/ibus-1.4.99 )
+	kerberos? ( virtual/krb5 )
+	socialweb? ( net-libs/libsocialweb )
+	systemd? ( >=sys-apps/systemd-31 )
+	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.6
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/accountsservice-0.6.30
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3
+		  >=x11-misc/colord-0.1.29 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	!systemd? (
+		app-admin/openrc-settingsd
+		sys-auth/consolekit )
+	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() {
+	# Make some panels optional; requires eautoreconf
+	# https://bugzilla.gnome.org/697478
+	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
+
+	# https://bugzilla.gnome.org/686840
+	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.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"
+
+	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
+}
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--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_with socialweb libsocialweb)
+		$(use_enable systemd)
+		$(use_with v4l cheese)
+		$(use_enable input_devices_wacom wacom)"
+	# FIXME: add $(use_with kerberos) support?
+	if ! use kerberos; then
+		G2CONF+=" KRB5_CONFIG=$(type -P true)"
+	fi
+	gnome2_src_configure
+}