Add gnome-base/gnome-control-center-3.3.92

5 files changed, 282 insertions, 85 deletions

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 8b24723c..811ab2b3 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,4 @@
-AUX gnome-control-center-3.2.1-optional-colord.patch 2005 RMD160 0a170f2ff2bd8886c3ecff18d22fc80a57497f2e SHA1 2047e863537832e3219564403a6207e8e8f7702b SHA256 852ca74531d54e65da41989f9c1c9f3883ecd7e31d0d4a17f6cca793c978284a
-EBUILD gnome-control-center-9999.ebuild 2997 RMD160 4938928452fef73af7de22fab86fc39c1d527114 SHA1 f25a2b52b0381a19a3a3ea130bfc4d6265f9740c SHA256 282bd461b7b0c1592d5d4cb51443b3974535d9a2c50ee40fb06e014e1b297626
+AUX gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch 4435 RMD160 97d426473324b0f9e04f01756ed1d4a625db5580 SHA1 a25215334cf47547336d101c6dc27ee1085c7ab1 SHA256 a99b035f9d282b18d172a36a57dc4056f1c98bde4dcdef8e90037026e84076db
+DIST gnome-control-center-3.3.92.tar.xz 4278596 RMD160 cd32afbb18d44b2fe33178b283ca88122c2fedde SHA1 0ae44f347ecc6c012cb1d622204bfbae97c35b23 SHA256 fe5c9e4e065bc2988096a6eaba53f0d9bd760e198c05c71d5c9316f73d892cfb
+EBUILD gnome-control-center-3.3.92.ebuild 3429 RMD160 e0a418dafbd0568510475bfafb92b65b363ce5be SHA1 a8ea9436ca9b4770981ee3f75cc9c82821955c19 SHA256 2c0d11e66ab4bdf521fa4b4f1fa05f7bae5533322af57b3f3ac0ae42f927661a
+EBUILD gnome-control-center-9999.ebuild 3429 RMD160 e0a418dafbd0568510475bfafb92b65b363ce5be SHA1 a8ea9436ca9b4770981ee3f75cc9c82821955c19 SHA256 2c0d11e66ab4bdf521fa4b4f1fa05f7bae5533322af57b3f3ac0ae42f927661a
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
deleted file mode 100644
index edbbf314..00000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch
new file mode 100644
index 00000000..fa2b1b6d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch
@@ -0,0 +1,124 @@
+diff -Naur gnome-control-center-3.3.92//configure.ac gnome-control-center-3.3.92.new//configure.ac
+--- gnome-control-center-3.3.92//configure.ac	2012-03-19 15:06:11.000000000 +0530
++++ gnome-control-center-3.3.92.new//configure.ac	2012-03-25 17:34:27.124395337 +0530
+@@ -109,7 +109,24 @@
+ 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 @@
+                   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,25 @@
+ 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,
++                       [have_bluetooth=yes], have_bluetooth=no)
++     build_bluetooth=true
++fi
++
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth = xyes])
+ 
+ # Check for CUPS 1.4 or newer
+ AC_ARG_ENABLE([cups],
+diff -Naur gnome-control-center-3.3.92//panels/Makefile.am gnome-control-center-3.3.92.new//panels/Makefile.am
+--- gnome-control-center-3.3.92//panels/Makefile.am	2012-02-14 15:42:23.000000000 +0530
++++ gnome-control-center-3.3.92.new//panels/Makefile.am	2012-03-25 17:31:48.801387677 +0530
+@@ -3,7 +3,6 @@
+ 	background \
+ 	screen \
+ 	power \
+-	color \
+ 	display \
+ 	mouse \
+ 	online-accounts \
+@@ -13,8 +12,11 @@
+ 	keyboard \
+ 	universal-access \
+ 	user-accounts \
+-	datetime \
+-	wacom
++	datetime
++
++if BUILD_COLOR
++SUBDIRS += color
++endif
+ 
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+@@ -28,4 +30,8 @@
+ SUBDIRS += bluetooth
+ endif
+ 
++if BUILD_WACOM
++SUBDIRS += wacom
++endif
++
+ -include $(top_srcdir)/git.mk
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
new file mode 100644
index 00000000..a825a047
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
@@ -0,0 +1,122 @@
+# 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.2.2-r1.ebuild,v 1.2 2012/02/16 07:26:52 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
+# 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 )"
+# <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
+	cups? ( net-print/cups-pk-helper )
+
+	!<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"
+# 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 )
+
+	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
+		--disable-wacom
+		$(use_enable bluetooth)
+		$(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.3.92-optional-bluetooth-colord-wacom.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 92e86421..a825a047 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2-r1.ebuild,v 1.2 2012/02/16 07:26:52 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit gnome2
+inherit autotools eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -16,11 +16,11 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
@@ -29,15 +29,14 @@ fi
 # 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.29.14:2
+	>=dev-libs/glib-2.31.0: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
+	>=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
@@ -52,7 +51,6 @@ COMMON_DEPEND="
 	>=sys-auth/polkit-0.97
 	>=sys-power/upower-0.9.1
 	>=x11-libs/libnotify-0.7.3
-	>=x11-misc/colord-0.1.8
 
 	x11-apps/xmodmap
 	x11-libs/libX11
@@ -60,9 +58,11 @@ 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-2.91.91.1 )
+		>=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
@@ -72,12 +72,13 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	app-admin/apg
 	sys-apps/accountsservice
+	x11-themes/gnome-icon-theme-symbolic
 	cups? ( net-print/cups-pk-helper )
 
+	!<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
-	!<gnome-base/gdm-2.91.94"
+	!<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}
@@ -92,16 +93,30 @@ DEPEND="${COMMON_DEPEND}
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
 
-	cups? ( sys-apps/sed )"
+	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
+		--disable-wacom
+		$(use_enable bluetooth)
 		$(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.3.92-optional-bluetooth-colord-wacom.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+}