Version bump for gnome-3.4 with numerous changes.

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

5 files changed, 287 insertions, 3 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/Manifest b/gnome-base/gnome-control-center/Manifest
index 1f10cb18fca9..bb8f9da5b097 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 RMD160 2d4c8c024e4b89e719f339be17e2de24470979ef SHA1 15d0854f5bdb3e05c74e81a1031922b7a1715c01 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d
 AUX gnome-control-center-2.32.1-erase-background.patch 1899 RMD160 3407e35a16bf8862ef99f8bccc270b183948bae5 SHA1 3cdd95012ec99df9c0d0dd6dc8350e0f1eed7b6d SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 RMD160 0001d36b7409ece4ab0b0f1ecf3f762863028c9a SHA1 9b17ebe472aabb69c768618cada7bfbd10cbe910 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd
@@ -7,11 +10,25 @@ 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 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
 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 3294 RMD160 671fbd3a72126da31caa358d1cb393e1a3a8e05f SHA1 cc9c5f14fcba378c2274074804a379f41165e6e3 SHA256 8d6a88f6bd1b5d5894c22739862409cf97c2662f1cd3e5c9a86946c6fc3ff42a
-MISC ChangeLog 55923 RMD160 78538fcbaae90b403ed49d5dbae6b7179b133441 SHA1 6e85d0eb17659c9b5bf005107962630a9f364917 SHA256 fb7202c95700a3c8bab0af055bf1a0b237e540e68e1632f6a45b76f7c12245b7
-MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
+EBUILD gnome-control-center-3.4.1.ebuild 3517 RMD160 144021d923247fe3cb87338f00905331049a1b90 SHA1 bf1275746ca03f14a40c181e0d7fdb9818a5ce55 SHA256 0ebf1a82075c28f034e5d75fe9333687e474643ab51bde62be8c59da8470ea99
+MISC ChangeLog 56195 RMD160 b7d5a2a3de646fcc7ea12c6ebe2a1c60832881a6 SHA1 4bf8c89bafe7dd9117a0d2eedcf66c88b45a30bc SHA256 aa14e740ea476c92e34c3ed4a34bec0bd8e3995a44dcb3200b2eada400181913
+MISC metadata.xml 606 RMD160 b90e138cd8311413b309d6f8dfccdc94ef347a23 SHA1 905f3f715944caaafdbafa2320d91a39d836f01f SHA256 72125f23efce3510c80ef6bd03c3b306dbdabbe7f7fa8478bf895fccf88164a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsErKAAoJEJ0WA1zPCt1hPDMIAIPFuWS1YvwulMkh3R9miZSB
+4Y8jx6ax89gTDxcilkbnOHlYr+Q7TfnWs0mWJbeMhReCsaFKima/zQLtqZ9qojYu
+8NDzrMOfUBK9fb5ygy3PbzUkkp2g9r9Km7Mk2c4dPdDGprWD7+Sq0hzmrF8Rybdx
+bg6ztD633M0r2Y+gX2Go3ts5k6dxhyv5Cep/x+ZeEKnRf9V2Hhayc1nfQDtPfgNj
+N1zbIrqBmoqp45TT1DQ5XoIWOVUSMYSepat8ctmvXfd/yStvrlEloy0R7W7Zjz8N
+ejbzvUd5zwuvoxJhvsLSZzD9Ij1N6ooeyqBiG75xJaPxk0KRRmCwyQXOvw/cMrY=
+=bOMJ
+-----END PGP SIGNATURE-----
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>