Bump to 3.2.1 from the gnome overlay. Drop arm keyword (needs app-admin/apg and net-libs/gnome-online-accounts keyworded). Keywording bug will be opened once all of gnome-3.2 is in portage.

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

5 files changed, 194 insertions, 6 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index d2b76c55ec0d..877ba7bfb1a6 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.91 2011/10/28 00:57:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.92 2011/10/29 06:53:44 tetromino Exp $
+
+*gnome-control-center-3.2.1 (29 Oct 2011)
+
+  29 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-control-center-3.2.1.ebuild,
+  +files/gnome-control-center-3.2.1-optional-colord.patch, metadata.xml:
+  Bump to 3.2.1 from the gnome overlay. Drop arm keyword (needs app-admin/apg
+  and net-libs/gnome-online-accounts keyworded). Numerous code changes.
 
   28 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-2.32.1-r1.ebuild, gnome-control-center-3.0.2-r2.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index b308036bcaf8..3d0675fec679 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -9,17 +9,20 @@ AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1
 AUX gnome-control-center-3.0.2-cups-ppd.h.patch 1534 RMD160 51b9b65a4c36beb67ece15a736a5e69abe363580 SHA1 73b7402688092c299f2f85d99ac61e344ba5a19a SHA256 ac21082f23ea4d11337e162d4b4eb410d5dbd01ca2e2e3bb82c2470c00434cad
 AUX gnome-control-center-3.0.2-delete-users-32-bit.patch 993 RMD160 4de0c576ccbf5fda4bc8508ec123816c0a9df361 SHA1 c3a24ea90fc5468777b0bc782784dbb788286f5a SHA256 1afb8d93ff9d3da24618e1da56cb36b67a3c0eb79e71bedb816f17619e3eca5c
 AUX gnome-control-center-3.0.2-https-handler.patch 1031 RMD160 0d8d7d3b00dda710e81661b89b31b14a3410e09a SHA1 e4bf47f8f3a8e49dda71bc112ac07fa22bd2f5bc SHA256 6a4a94c45e4160ef7ffd4745b653e8252a9209378edb4968923e6d22f8d12af3
+AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
 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.0.2.tar.bz2 4567179 RMD160 e1903c84d7f6a6662a6386e7110773ba789f634b SHA1 c0d5d203e25bc1829e25780b125efb3d9a4e741f SHA256 477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896
+DIST gnome-control-center-3.2.1.tar.xz 4252172 RMD160 00542e30fa12775d7683d09c2e12d6d9fa612343 SHA1 794cbff94baf876e80fe73c7e646f468cf5bc398 SHA256 bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2697 RMD160 579c17b90282bc8031137b478feddcf55d5168db SHA1 0cfe31988822ee4bc016f3f6ccc6640685f6f308 SHA256 e5850ae31e5c73ec3f7d77ee8d35af746080e5497dce91fff487e90b727c971b
 EBUILD gnome-control-center-3.0.2-r2.ebuild 3148 RMD160 50d910316443d554b01e94899ac12e8c9609ea4f SHA1 d827f3d8a567a4125f6afd1e7dea07dc51013f4a SHA256 b7438707e1e06277d487b1ae4d22fd1bca1d9e74df7120ee9b836b554bbad01c
-MISC ChangeLog 53407 RMD160 81250e9c63e4b4f6a24012967d0c1fb61bfdabe2 SHA1 5b86505d50223aa116ead61d2b8caf1dddd7ac1f SHA256 aa9b115ba86b1daf7f02f34db64c5611a2f829d973e438226e7eead9a3b06300
-MISC metadata.xml 432 RMD160 ca0967b543d638817a2516a6104e792afa87539e SHA1 1f62656bbef63f5a89f78ac2c264bc6569441b81 SHA256 c39726081beb40c71a16163367bc95daf005268814a4eb0182563821176e5f76
+EBUILD gnome-control-center-3.2.1.ebuild 3090 RMD160 1dae1743efa388ab400c1687d6f2158afeded383 SHA1 8e91414c3a03a73792057373d0f51bb607ba2efe SHA256 652ac2f5e7018a38ac6aeb5c8bb8e3645177b348257d4c897dbbd28162f298ba
+MISC ChangeLog 53771 RMD160 6d2b4a05cddb979919b54d4fd31a2222a71670db SHA1 a60f03db2338bb0c642facbe11b50bc622d56cb0 SHA256 e2afe2fb3adb0212eb60cad478d185bbce93c757ac1543b6448f0d9cf5d45df6
+MISC metadata.xml 522 RMD160 4ab7dba7c77c1b268d4276a16475e9854f3610f1 SHA1 6f4dece0998697e456a3967b28e254a8eb7f6f9d SHA256 131c11bbcbcdf6d0ba43d74423f0afdb957375343bfe8de3e578fce0f21491a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6p/g4ACgkQdjK8w9WeBnB+hAD5AbxXAaDZDQuK2AB2ScuLJMkA
-IHfbYmcJcrPm1Lr3vAkBAJGJjd46cxaVgcyqky5FT8LSkPmV+4LoKIBLyCpWjtJA
-=LSDZ
+iF4EAREIAAYFAk6rov4ACgkQdjK8w9WeBnDmfgD7BSIRUaK15ej/KYFWhC0D6Ao4
+Zp31Qrw4VZQ2c4d4qh4BAIfGlxGM3clQLbDxwASVzpafoFZeM2pEiQz0t/BR6KsU
+=PnMr
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
new file mode 100644
index 000000000000..edbbf314c2be
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
@@ -0,0 +1,66 @@
+From b56f9e04f8822db34b030bea86d39c1d444a3cbb 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 optional.
+
+---
+ configure.ac       |   19 ++++++++++++++++++-
+ panels/Makefile.am |    5 ++++-
+ 2 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d552ac8..fd9062e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,7 +106,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 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..a375e2f 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,7 +3,6 @@ SUBDIRS= \
+ 	background \
+ 	screen \
+ 	power \
+-	color \
+ 	display \
+ 	media \
+ 	mouse \
+@@ -17,6 +16,10 @@ SUBDIRS= \
+ 	datetime \
+ 	wacom
+ 
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+ endif
+-- 
+1.7.7.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
new file mode 100644
index 000000000000..2538ad77dbb7
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 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.2.1.ebuild,v 1.1 2011/10/29 06:53:44 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+cheese +colord +cups +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
+# 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)
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.14:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=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(+)?]
+	>=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
+
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-2.91.91.1 )
+	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 )"
+# <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
+	cups? ( net-print/cups-pk-helper )
+
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<gnome-base/gdm-2.91.94"
+# 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
+	>=dev-util/pkgconfig-0.19
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_with cheese)
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_with socialweb libsocialweb)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Make colord plugin optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index ef86235e8846..e681e123814c 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
+		<flag name="colord">Support color management using
+			<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