public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/
Date: Mon, 26 Mar 2012 08:20:07 +0000 (UTC)	[thread overview]
Message-ID: <1332749978.2244ea955f012fde263d0b7793b646e57d558456.nirbheek@gentoo> (raw)

commit:     2244ea955f012fde263d0b7793b646e57d558456
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 06:12:41 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2244ea95

Add gnome-base/gnome-settings-daemon-3.3.92

---
 ...ome-settings-daemon-3.2.1-optional-colord.patch |   95 ---------------
 ...ttings-daemon-3.3.92-optional-color-wacom.patch |  127 ++++++++++++++++++++
 ....ebuild => gnome-settings-daemon-3.3.92.ebuild} |   58 +++++----
 .../gnome-settings-daemon-9999.ebuild              |   58 +++++----
 4 files changed, 191 insertions(+), 147 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
deleted file mode 100644
index 98afbec..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e1e0584cec966dc58a51efaf534f129b4830399f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:30:41 -0400
-Subject: [PATCH] Make colord optional
-
----
- configure.ac        |   20 +++++++++++++++++++-
- data/Makefile.am    |    7 ++++++-
- plugins/Makefile.am |    7 ++++++-
- 3 files changed, 31 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe74674..f1a8547 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -107,7 +107,25 @@ PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VE
- dnl ---------------------------------------------------------------------------
- dnl - Check for colord
- dnl ---------------------------------------------------------------------------
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.12)
-+build_color=false
-+AC_ARG_ENABLE(color,
-+  AC_HELP_STRING([--disable-color],
-+                 [turn off color plugin]),
-+      [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(COLORD, colord >= 0.1.12)
-+      build_color=true
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Check for libcanberra
-diff --git a/data/Makefile.am b/data/Makefile.am
-index 43ba27c..1f3bbef 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -11,7 +11,6 @@ gsettings_SCHEMAS =							\
- 	org.gnome.settings-daemon.plugins.gschema.xml			\
- 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
--	org.gnome.settings-daemon.plugins.color.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
- 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
- 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
-@@ -21,6 +20,12 @@ gsettings_SCHEMAS =							\
- 
- all_schemas = $(gsettings_SCHEMAS)
- 
-+if BUILD_COLOR
-+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
-+else
-+all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
-+endif
-+
- if HAVE_PACKAGEKIT
- gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
- else
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 5e26811..d2404ab 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -6,7 +6,6 @@ enabled_plugins =	\
- 	automount	\
- 	background	\
- 	clipboard	\
--	color		\
- 	cursor		\
- 	datetime	\
- 	dummy		\
-@@ -24,6 +23,12 @@ enabled_plugins =	\
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_GCONF_BRIDGE
- enabled_plugins += gconf
- else
--- 
-1.7.7.1
-

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
new file mode 100644
index 0000000..6af221d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
@@ -0,0 +1,127 @@
+diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.92.new//configure.ac
+--- gnome-settings-daemon-3.3.92//configure.ac	2012-03-19 14:23:38.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//configure.ac	2012-03-25 11:36:35.833356226 +0530
+@@ -194,13 +194,39 @@
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue")
++
++AC_SUBST(COLORD_CFLAGS)
++AC_SUBST(COLORD_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++AC_ARG_ENABLE([wacom],
++  AS_HELP_STRING([--disable-wacom],
++                 [turn off wacom plugin]),
++       [with_wacom=$enableval],
++       [with_wacom=no]) dnl Default value
++
++if test x$with_wacom = xyes; then
++       PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++       AC_DEFINE(HAVE_WACOM, 1, [Define if wacom plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xtrue")
++
++AC_SUBST(WACOM_CFLAGS)
++AC_SUBST(WACOM_LIBS)
+ 
+ dnl ==============================================
+ dnl PackageKit section
+diff -Naur gnome-settings-daemon-3.3.92//data/Makefile.am gnome-settings-daemon-3.3.92.new//data/Makefile.am
+--- gnome-settings-daemon-3.3.92//data/Makefile.am	2012-03-16 22:59:35.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//data/Makefile.am	2012-03-25 11:39:24.548364338 +0530
+@@ -11,16 +11,20 @@
+ 	org.gnome.settings-daemon.plugins.gschema.xml			\
+ 	org.gnome.settings-daemon.plugins.keyboard.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.power.gschema.xml		\
+-	org.gnome.settings-daemon.plugins.color.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.media-keys.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.xsettings.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.housekeeping.gschema.xml	\
+ 	org.gnome.settings-daemon.plugins.print-notifications.gschema.xml	\
+-	org.gnome.settings-daemon.peripherals.wacom.gschema.xml		\
+ 	org.gnome.settings-daemon.plugins.xrandr.gschema.xml
+ 
+ all_schemas = $(gsettings_SCHEMAS)
+ 
++if WITH_COLOR
++gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.color.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.plugins.color.gschema.xml
++endif
++
+ if HAVE_PACKAGEKIT
+ gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.updates.gschema.xml
+ else
+@@ -33,6 +37,12 @@
+ all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
+ endif
+ 
++if WITH_WACOM
++gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++endif
++
+ @INTLTOOL_XML_NOMERGE_RULE@
+ 
+ @GSETTINGS_RULES@
+diff -Naur gnome-settings-daemon-3.3.92//plugins/Makefile.am gnome-settings-daemon-3.3.92.new//plugins/Makefile.am
+--- gnome-settings-daemon-3.3.92//plugins/Makefile.am	2012-03-16 22:59:35.000000000 +0530
++++ gnome-settings-daemon-3.3.92.new//plugins/Makefile.am	2012-03-25 11:37:47.296359651 +0530
+@@ -6,7 +6,6 @@
+ 	automount	\
+ 	background	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	dummy		\
+ 	power		\
+@@ -15,13 +14,18 @@
+ 	media-keys	\
+ 	mouse		\
+ 	sound		\
+-	wacom		\
+ 	xrandr		\
+ 	xsettings	\
+ 	$(NULL)
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
+@@ -46,5 +50,11 @@
+ disabled_plugins += print-notifications
+ endif
+ 
++if WITH_WACOM
++enabled_plugins += wacom
++else
++disabled_plugins += wacom
++endif
++
+ SUBDIRS = common $(enabled_plugins)
+ DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
similarity index 69%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
index 53eed8e..f7bbc6a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-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-settings-daemon/gnome-settings-daemon-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,48 +19,47 @@ SLOT="0"
 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 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
++udev" #wacom
 
-# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
-# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-# upower-0.9.11 needed for UpSleepKind
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gconf-2.6.1:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
+	>=gnome-base/gnome-desktop-3.3.92:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-0.9.16
 	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXtst
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
-	>=x11-misc/colord-0.1.13
 	>=media-sound/pulseaudio-0.9.16
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		|| ( sys-fs/udev[gudev]
-			sys-fs/udev[extras] )
+		sys-fs/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
-	policykit? (
-		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2[X] )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( || ( sys-fs/udev[gudev]
-		sys-fs/udev[extras] ) )"
+	smartcard? (
+		sys-fs/udev[gudev] 
+		>=dev-libs/nss-3.11.2 )
+	udev? ( sys-fs/udev[gudev] )"
+# Needs libwacom
+#	wacom? ( x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -86,18 +85,20 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	# TODO: systemd support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--enable-gconf-bridge
-		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		--disable-systemd
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
-		$(use_enable policykit polkit)
 		$(use_enable smartcard smartcard-support)
 		$(use_enable udev gudev)"
+		# TODO: libwacom is needem
+		#$(use_enable wacom)
 }
 
 src_prepare() {
@@ -108,6 +109,11 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 }
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 53eed8e..f7bbc6a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-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-settings-daemon/gnome-settings-daemon-2.32.1.ebuild,v 1.1 2010/12/04 16:50:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -19,48 +19,47 @@ SLOT="0"
 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 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
++udev" #wacom
 
-# Latest gsettings-desktop-schemas is needed due to commit e8d1de92
-# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-# upower-0.9.11 needed for UpSleepKind
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-2.99.3:3
-	>=gnome-base/gconf-2.6.1:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gtk+-3.3.4:3
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.2.0-r1:3
-	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
+	>=gnome-base/gnome-desktop-3.3.92:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
 	media-fonts/cantarell
 	media-libs/fontconfig
 	>=media-libs/lcms-2.2:2
 	media-libs/libcanberra[gtk3]
 	>=media-sound/pulseaudio-0.9.16
 	>=sys-power/upower-0.9.11
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/libnotify-0.7.3
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXtst
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
-	>=x11-misc/colord-0.1.13
 	>=media-sound/pulseaudio-0.9.16
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		|| ( sys-fs/udev[gudev]
-			sys-fs/udev[extras] )
+		sys-fs/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
-	policykit? (
-		>=sys-auth/polkit-0.97
-		>=sys-apps/dbus-1.1.2[X] )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( || ( sys-fs/udev[gudev]
-		sys-fs/udev[extras] ) )"
+	smartcard? (
+		sys-fs/udev[gudev] 
+		>=dev-libs/nss-3.11.2 )
+	udev? ( sys-fs/udev[gudev] )"
+# Needs libwacom
+#	wacom? ( x11-drivers/xf86-input-wacom )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -86,18 +85,20 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
+	# TODO: systemd support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--enable-gconf-bridge
-		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		--disable-systemd
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
-		$(use_enable policykit polkit)
 		$(use_enable smartcard smartcard-support)
 		$(use_enable udev gudev)"
+		# TODO: libwacom is needem
+		#$(use_enable wacom)
 }
 
 src_prepare() {
@@ -108,6 +109,11 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.3.92-optional-color-wacom.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 }
 



             reply	other threads:[~2012-03-26  8:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-26  8:20 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:59 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ Mart Raudsepp
2018-02-14 19:44 Sobhan Mohammadpour
2018-02-09 15:55 Sobhan Mohammadpour
2015-04-29 19:00 Ole Reifschneider
2014-10-11 23:11 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:34 Gilles Dartiguelongue
2013-01-22  8:12 Alexandre Rostovtsev
2012-10-30 21:28 Gilles Dartiguelongue
2012-09-27  5:21 Priit Laes
2012-09-09 12:43 Nirbheek Chauhan
2012-04-06  8:38 Alexandre Restovtsev
2011-10-29 19:56 Alexandre Restovtsev
2011-10-28  5:28 Alexandre Restovtsev
2011-10-04  8:56 Alexandre Restovtsev
2011-07-13 15:53 Alexandre Restovtsev
2011-07-12  0:19 Alexandre Restovtsev
2011-06-14  6:36 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332749978.2244ea955f012fde263d0b7793b646e57d558456.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox