Version bump for gnome-3.4 with numerous changes.

(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)

4 files changed, 268 insertions, 1 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index c664e4d9be10..a64d9ee6af56 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # 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.99 2012/05/05 05:38:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.100 2012/05/13 23:59:00 tetromino Exp $
+
+*gnome-control-center-3.4.1 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch,
+  +gnome-control-center-3.4.1.ebuild:
+  Version bump for gnome-3.4 with numerous changes.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   gnome-control-center-2.32.1-r1.ebuild, gnome-control-center-3.2.2.ebuild,
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.1-optional-bluetooth-colord-wacom.patch
new file mode 100644
index 000000000000..03248f790040
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch
@@ -0,0 +1,138 @@
+From f9d277788e7ac4338955a272eee043f6774421d9 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
+
+---
+ configure.ac       |   65 ++++++++++++++++++++++++++++++++++++++++++++-------
+ panels/Makefile.am |   12 +++++++--
+ 2 files changed, 65 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1046870..a40b792 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)
+ 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
+                   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
+                   gnome-desktop-3.0
+                   gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+                   $SYSTEMD)
+-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)
++
++build_wacom=false
++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)
++      build_wacom=true
++fi
++AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
+ 
+ GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
+ AC_SUBST(GDESKTOP_PREFIX)
+@@ -146,10 +179,24 @@ if test "x$have_networkmanager" = xno ; then
+ fi
+ AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+ 
+-# Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4,
+-		  [have_bluetooth=yes], have_bluetooth=no)
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
++build_bluetooth=false
++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.3.4)
++     build_bluetooth=true
++fi
++
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth = xtrue])
+ 
+ # Check for CUPS 1.4 or newer
+ AC_ARG_ENABLE([cups],
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 172dd06..09e7b00 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,7 +3,6 @@ SUBDIRS= \
+ 	background \
+ 	screen \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	online-accounts \
+@@ -13,8 +12,11 @@ SUBDIRS= \
+ 	keyboard \
+ 	universal-access \
+ 	user-accounts \
+-	datetime \
+-	wacom
++	datetime
++
++if BUILD_COLOR
++SUBDIRS += color
++endif
+ 
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+@@ -28,4 +30,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+ 
++if BUILD_WACOM
++SUBDIRS += wacom
++endif
++
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.8.6
+
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.4.1.ebuild
new file mode 100644
index 000000000000..cf9305e9277a
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.1.ebuild
@@ -0,0 +1,120 @@
+# 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.1 2012/05/13 23:59:00 tetromino Exp $
+
+EAPI="4"
+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 +cheese +colord +cups +networkmanager +socialweb 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
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
+#
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# 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
+	>=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]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	app-text/iso-codes
+	dev-libs/libxml2:2
+	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]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
+
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=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 )
+	colord? ( >=x11-misc/colord-0.1.8 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	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 )"
+# <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"
+# 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
+
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
+# Needed for autoreconf
+#	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)"
+	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"
+	eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index e681e123814c..f74a305b5d12 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -9,5 +9,7 @@
 			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="wacom">Enable support for Wacom tablets and drawing
+			devices</flag>
 	</use>
 </pkgmetadata>