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 1RJezE-00033U-Jc for garchives@archives.gentoo.org; Fri, 28 Oct 2011 05:28:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3AA321C039; Fri, 28 Oct 2011 05:28:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 56C7C21C02D for ; Fri, 28 Oct 2011 05:28:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 56DC01B401A for ; Fri, 28 Oct 2011 05:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BFA758004F for ; Fri, 28 Oct 2011 05:28:02 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <5e2fe330de4dc94bcf5a32ebc69c308381c0fa41.tetromino@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/gnome-control-center-3.2.1.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 5e2fe330de4dc94bcf5a32ebc69c308381c0fa41 Date: Fri, 28 Oct 2011 05:28:02 +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: X-Archives-Hash: 7fe444bfe97c63a846a4ae046f6f7d1b commit: 5e2fe330de4dc94bcf5a32ebc69c308381c0fa41 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Fri Oct 28 04:02:52 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Oct 28 04:25:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D5e2fe330 gnome-base/gnome-control-center: make colord optional As discussed on IRC with Nirbheek. This will make gnome-3.2 easier to unmask. --- ...nome-control-center-3.2.1-optional-colord.patch | 66 ++++++++++++++= ++++++ .../gnome-control-center-3.2.1.ebuild | 17 ++++- 2 files changed, 79 insertions(+), 4 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 new file mode 100644 index 0000000..edbbf31 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-op= tional-colord.patch @@ -0,0 +1,66 @@ +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/gnome-control-center-3.2.1.e= build b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild index 92e8642..a094f13 100644 --- 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 @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit autotools gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -16,7 +16,7 @@ HOMEPAGE=3D"http://www.gnome.org/" =20 LICENSE=3D"GPL-2" SLOT=3D"2" -IUSE=3D"+cheese +cups +networkmanager +socialweb" +IUSE=3D"+cheese +colord +cups +networkmanager +socialweb" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" else @@ -37,7 +37,7 @@ COMMON_DEPEND=3D" >=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 + >=3Dgnome-base/gnome-settings-daemon-3.1.4[colord(+)?] >=3Dgnome-base/libgnomekbd-2.91.91 =20 app-text/iso-codes @@ -52,7 +52,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 @@ -63,6 +62,7 @@ COMMON_DEPEND=3D" cheese? ( media-libs/gstreamer:0.10 >=3Dmedia-video/cheese-2.91.91.1 ) + colord? ( >=3Dx11-misc/colord-0.1.8 ) cups? ( >=3Dnet-print/cups-1.4[dbus] ) networkmanager? ( >=3Dgnome-extra/nm-applet-0.9.1.90 @@ -101,7 +101,16 @@ pkg_setup() { --disable-update-mimedb --disable-static $(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.2.1-optional-colord.patch" + eautoreconf + + gnome2_src_prepare +}