From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SC5BF-0002Cn-IW for garchives@archives.gentoo.org; Mon, 26 Mar 2012 08:21:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0D0CE05F5; Mon, 26 Mar 2012 08:20:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8FE9CE05EB for ; Mon, 26 Mar 2012 08:20:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8D2D1B4076 for ; Mon, 26 Mar 2012 08:20:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E695AE542C for ; Mon, 26 Mar 2012 08:20:07 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1332749978.074049b9995cc8c114b7061cc9618fe741534da0.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 074049b9995cc8c114b7061cc9618fe741534da0 X-VCS-Branch: master Date: Mon, 26 Mar 2012 08:20:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 96c8b564-3863-4c48-82f6-e583626026a2 X-Archives-Hash: dfd45c10a72a1ffb1d296d5f1dbb1ddf commit: 074049b9995cc8c114b7061cc9618fe741534da0 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Mar 25 12:13:21 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Mar 26 08:19:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D074049b9 Add gnome-base/gnome-control-center-3.3.92 --- ...nome-control-center-3.2.1-optional-colord.patch | 66 ----------- ...er-3.3.92-optional-bluetooth-colord-wacom.patch | 124 ++++++++++++++= ++++++ ...9.ebuild =3D> gnome-control-center-3.3.92.ebuild} | 49 +++++--- .../gnome-control-center-9999.ebuild | 49 +++++--- 4 files changed, 188 insertions(+), 100 deletions(-) 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 edbbf31..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-op= tional-colord.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b56f9e04f8822db34b030bea86d39c1d444a3cbb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -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-ba= ckend-1.0) - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >=3D 0.9.1 - gnome-settings-daemon >=3D $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >=3D 0.1.8) -+build_color=3Dfalse -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=3Dyes ;; -+ no) WANT_COLOR=3Dno ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=3Dyes]) dnl Default value -+ -+if test x$WANT_COLOR =3D xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >=3D 0.1.8) -+ build_color=3Dtrue -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" =3D "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1 - polkit-gobject-1 >=3D $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >=3D 2.91.9= 1 -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=3D \ - background \ - screen \ - power \ -- color \ - display \ - media \ - mouse \ -@@ -17,6 +16,10 @@ SUBDIRS=3D \ - datetime \ - wacom -=20 -+if BUILD_COLOR -+SUBDIRS +=3D color -+endif -+ - if BUILD_PRINTERS - SUBDIRS +=3D printers - endif ---=20 -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-ce= nter/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.pa= tch new file mode 100644 index 0000000..fa2b1b6 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-o= ptional-bluetooth-colord-wacom.patch @@ -0,0 +1,124 @@ +diff -Naur gnome-control-center-3.3.92//configure.ac gnome-control-cente= r-3.3.92.new//configure.ac +--- gnome-control-center-3.3.92//configure.ac 2012-03-19 15:06:11.000000= 000 +0530 ++++ gnome-control-center-3.3.92.new//configure.ac 2012-03-25 17:34:27.12= 4395337 +0530 +@@ -109,7 +109,24 @@ + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-ba= ckend-1.0) + PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >=3D 0.9.1 + gnome-settings-daemon >=3D $GSD_REQUIRED_VERSION) +-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >=3D 0.1.8) ++build_color=3Dfalse ++AC_ARG_ENABLE(color, ++ AC_HELP_STRING([--disable-color], ++ [disable color management panel]), ++ [case "${enableval}" in ++ yes) WANT_COLOR=3Dyes ;; ++ no) WANT_COLOR=3Dno ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; ++ esac], ++ [WANT_COLOR=3Dyes]) dnl Default value ++ ++if test x$WANT_COLOR =3D xyes; then ++ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >=3D 0.1.8) ++ build_color=3Dtrue ++fi ++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" =3D "xtrue") ++AC_SUBST(COLOR_PANEL_CFLAGS) ++AC_SUBST(COLOR_PANEL_LIBS) + PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES + polkit-gobject-1 >=3D $POLKIT_REQUIRED_VERSION) + PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >=3D 2.91.9= 1 +@@ -127,10 +144,26 @@ + gnome-desktop-3.0 + gdk-pixbuf-2.0 >=3D $GDKPIXBUF_REQUIRED_VERSION + $SYSTEMD) +-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES +- gnome-settings-daemon >=3D $GSD_REQUIRED_VERSION +- xi >=3D 1.2 x11 libwacom >=3D $LIBWACOM_REQUIRED_VERS= ION +- gnome-desktop-3.0 >=3D $GNOME_DESKTOP_REQUIRED_VERSIO= N) ++ ++build_wacom=3Dfalse ++AC_ARG_ENABLE(wacom, ++ AC_HELP_STRING([--disable-wacom], ++ [disable wacom management panel]), ++ [case "${enableval}" in ++ yes) WANT_WACOM=3Dyes ;; ++ no) WANT_WACOM=3Dno ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; ++ esac], ++ [WANT_WACOM=3Dyes]) dnl Default value ++ ++if test x$WANT_WACOM =3D xyes; then ++ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES ++ gnome-settings-daemon >=3D $GSD_REQUIRED_VERSION ++ xi >=3D 1.2 x11 libwacom >=3D $LIBWACOM_REQUIRED= _VERSION ++ gnome-desktop-3.0 >=3D $GNOME_DESKTOP_REQUIRED_V= ERSION) ++ build_wacom=3Dtrue ++fi ++AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" =3D "xtrue") +=20 + GDESKTOP_PREFIX=3D`$PKG_CONFIG --variable prefix gsettings-desktop-sche= mas` + AC_SUBST(GDESKTOP_PREFIX) +@@ -146,10 +179,25 @@ + fi + AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager =3D xyes]) +=20 +-# Check for gnome-bluetooth +-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >=3D 3= .3.4, +- [have_bluetooth=3Dyes], have_bluetooth=3Dno) +-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth =3D xyes]) ++build_bluetooth=3Dfalse ++AC_ARG_ENABLE(bluetooth, ++ AC_HELP_STRING([--disable-bluetooth], ++ [disable bluetooth management panel]), ++ [case "${enableval}" in ++ yes) WANT_BLUETOOTH=3Dyes ;; ++ no) WANT_BLUETOOTH=3Dno ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) = ;; ++ esac], ++ [WANT_BLUETOOTH=3Dyes]) dnl Default value ++ ++if test x$WANT_BLUETOOTH =3D xyes; then ++ # Check for gnome-bluetooth ++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= =3D 3.3.4, ++ [have_bluetooth=3Dyes], have_bluetooth=3Dno) ++ build_bluetooth=3Dtrue ++fi ++ ++AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth =3D xyes]) +=20 + # 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 +=3D color ++endif +=20 + if BUILD_PRINTERS + SUBDIRS +=3D printers +@@ -28,4 +30,8 @@ + SUBDIRS +=3D bluetooth + endif +=20 ++if BUILD_WACOM ++SUBDIRS +=3D wacom ++endif ++ + -include $(top_srcdir)/git.mk diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.eb= uild b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild similarity index 67% copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuil= d copy to gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuil= d index 92e8642..a825a04 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.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 $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit autotools eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,11 +16,11 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"2" -IUSE=3D"+cheese +cups +networkmanager +socialweb" +IUSE=3D"+bluetooth +cheese +colord +cups +networkmanager +socialweb" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux = ~x86-solaris" fi =20 # 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 a= t 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=3D" - >=3Ddev-libs/glib-2.29.14:2 + >=3Ddev-libs/glib-2.31.0:2 >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-3.1.19:3 - >=3Dgnome-base/gsettings-desktop-schemas-3.0.2 - >=3Dgnome-base/gconf-2.0:2 - >=3Ddev-libs/dbus-glib-0.73 - >=3Dgnome-base/gnome-desktop-3.1.0:3 - >=3Dgnome-base/gnome-settings-daemon-3.1.4 + >=3Dx11-libs/gtk+-3.3.5:3 + >=3Dgnome-base/gsettings-desktop-schemas-3.3.0 + >=3Dgnome-base/gnome-desktop-3.1.91:3 + >=3Dgnome-base/gnome-settings-daemon-3.3.92[colord?,policykit] >=3Dgnome-base/libgnomekbd-2.91.91 =20 app-text/iso-codes @@ -52,7 +51,6 @@ COMMON_DEPEND=3D" >=3Dsys-auth/polkit-0.97 >=3Dsys-power/upower-0.9.1 >=3Dx11-libs/libnotify-0.7.3 - >=3Dx11-misc/colord-0.1.8 =20 x11-apps/xmodmap x11-libs/libX11 @@ -60,9 +58,11 @@ COMMON_DEPEND=3D" >=3Dx11-libs/libxklavier-5.1 >=3Dx11-libs/libXi-1.2 =20 + bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.3.4 ) cheese? ( media-libs/gstreamer:0.10 - >=3Dmedia-video/cheese-2.91.91.1 ) + >=3Dmedia-video/cheese-3.3.5 ) + colord? ( >=3Dx11-misc/colord-0.1.8 ) cups? ( >=3Dnet-print/cups-1.4[dbus] ) networkmanager? ( >=3Dgnome-extra/nm-applet-0.9.1.90 @@ -72,12 +72,13 @@ COMMON_DEPEND=3D" RDEPEND=3D"${COMMON_DEPEND} app-admin/apg sys-apps/accountsservice + x11-themes/gnome-icon-theme-symbolic cups? ( net-print/cups-pk-helper ) =20 + !=3Dgnome-base/gnome-session-2.91.6-r1" DEPEND=3D"${COMMON_DEPEND} @@ -92,16 +93,30 @@ DEPEND=3D"${COMMON_DEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.10.1 =20 - cups? ( sys-apps/sed )" + cups? ( sys-apps/sed ) + + gnome-base/gnome-common" # Needed for autoreconf # gnome-base/gnome-common =20 pkg_setup() { + # TODO: libwacom is needed for wacom support G2CONF=3D"${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=3D"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.eb= uild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index 92e8642..a825a04 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 $ =20 EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit autotools eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,11 +16,11 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"2" -IUSE=3D"+cheese +cups +networkmanager +socialweb" +IUSE=3D"+bluetooth +cheese +colord +cups +networkmanager +socialweb" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-f= bsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" + KEYWORDS=3D"~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux = ~x86-solaris" fi =20 # 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 a= t 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=3D" - >=3Ddev-libs/glib-2.29.14:2 + >=3Ddev-libs/glib-2.31.0:2 >=3Dx11-libs/gdk-pixbuf-2.23.0:2 - >=3Dx11-libs/gtk+-3.1.19:3 - >=3Dgnome-base/gsettings-desktop-schemas-3.0.2 - >=3Dgnome-base/gconf-2.0:2 - >=3Ddev-libs/dbus-glib-0.73 - >=3Dgnome-base/gnome-desktop-3.1.0:3 - >=3Dgnome-base/gnome-settings-daemon-3.1.4 + >=3Dx11-libs/gtk+-3.3.5:3 + >=3Dgnome-base/gsettings-desktop-schemas-3.3.0 + >=3Dgnome-base/gnome-desktop-3.1.91:3 + >=3Dgnome-base/gnome-settings-daemon-3.3.92[colord?,policykit] >=3Dgnome-base/libgnomekbd-2.91.91 =20 app-text/iso-codes @@ -52,7 +51,6 @@ COMMON_DEPEND=3D" >=3Dsys-auth/polkit-0.97 >=3Dsys-power/upower-0.9.1 >=3Dx11-libs/libnotify-0.7.3 - >=3Dx11-misc/colord-0.1.8 =20 x11-apps/xmodmap x11-libs/libX11 @@ -60,9 +58,11 @@ COMMON_DEPEND=3D" >=3Dx11-libs/libxklavier-5.1 >=3Dx11-libs/libXi-1.2 =20 + bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.3.4 ) cheese? ( media-libs/gstreamer:0.10 - >=3Dmedia-video/cheese-2.91.91.1 ) + >=3Dmedia-video/cheese-3.3.5 ) + colord? ( >=3Dx11-misc/colord-0.1.8 ) cups? ( >=3Dnet-print/cups-1.4[dbus] ) networkmanager? ( >=3Dgnome-extra/nm-applet-0.9.1.90 @@ -72,12 +72,13 @@ COMMON_DEPEND=3D" RDEPEND=3D"${COMMON_DEPEND} app-admin/apg sys-apps/accountsservice + x11-themes/gnome-icon-theme-symbolic cups? ( net-print/cups-pk-helper ) =20 + !=3Dgnome-base/gnome-session-2.91.6-r1" DEPEND=3D"${COMMON_DEPEND} @@ -92,16 +93,30 @@ DEPEND=3D"${COMMON_DEPEND} app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.10.1 =20 - cups? ( sys-apps/sed )" + cups? ( sys-apps/sed ) + + gnome-base/gnome-common" # Needed for autoreconf # gnome-base/gnome-common =20 pkg_setup() { + # TODO: libwacom is needed for wacom support G2CONF=3D"${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=3D"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 +}