[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     3a4a482651f7d7d9e5a00efba702074c492d273f
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 08:24:47 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Apr  6 08:38:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a4a4826

gnome-base/gnome-settings-daemon: 3.3.92 → 3.4.0

Now with systemd and wacom support.

---
 ...ttings-daemon-3.4.0-optional-color-wacom.patch} |   12 +++++-----
 ...2.ebuild => gnome-settings-daemon-3.4.0.ebuild} |   23 ++++++++++---------
 .../gnome-settings-daemon-9999.ebuild              |   23 ++++++++++---------
 3 files changed, 30 insertions(+), 28 deletions(-)

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.4.0-optional-color-wacom.patch
similarity index 94%
rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.3.92-optional-color-wacom.patch
rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.4.0-optional-color-wacom.patch
index 6af221d..045b4d6 100644
--- 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.4.0-optional-color-wacom.patch
@@ -12,14 +12,14 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.
 +       [with_color=$enableval],
 +       [with_color=yes]) dnl Default value
 +
-+if test x$WANT_COLOR = xyes; then
++if test x$with_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])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if wacom plugin is enabled])
 +fi
-+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xtrue")
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
 +
-+AC_SUBST(COLORD_CFLAGS)
-+AC_SUBST(COLORD_LIBS)
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
  
  dnl ---------------------------------------------------------------------------
  dnl - wacom
@@ -36,7 +36,7 @@ diff -Naur gnome-settings-daemon-3.3.92//configure.ac gnome-settings-daemon-3.3.
 +       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")
++AM_CONDITIONAL(WITH_WACOM, test "x$with_wacom" = "xyes")
 +
 +AC_SUBST(WACOM_CFLAGS)
 +AC_SUBST(WACOM_LIBS)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
similarity index 89%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
index f7bbc6a..1a3a652 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.3.92.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
-+udev" #wacom
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
@@ -57,9 +56,10 @@ COMMON_DEPEND="
 	smartcard? (
 		sys-fs/udev[gudev] 
 		>=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[gudev] )"
-# Needs libwacom
-#	wacom? ( x11-drivers/xf86-input-wacom )"
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		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
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
 	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -89,16 +91,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--disable-systemd
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
-		$(use_enable udev gudev)"
-		# TODO: libwacom is needem
-		#$(use_enable wacom)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
 }
 
 src_prepare() {
@@ -110,7 +111,7 @@ src_prepare() {
 		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"
+	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
 
 	eautoreconf
 

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 f7bbc6a..1a3a652 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -21,8 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard
-+udev" #wacom
+IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
@@ -57,9 +56,10 @@ COMMON_DEPEND="
 	smartcard? (
 		sys-fs/udev[gudev] 
 		>=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[gudev] )"
-# Needs libwacom
-#	wacom? ( x11-drivers/xf86-input-wacom )"
+	systemd? ( >=sys-apps/systemd-31 )
+	udev? ( sys-fs/udev[gudev] )
+	wacom? ( >=dev-libs/libwacom-0.3
+		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
@@ -70,7 +70,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
 	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-power-manager-3.1.3
+
+	!systemd? ( sys-auth/consolekit )"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -89,16 +91,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
-		--disable-systemd
 		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
 		$(use_enable packagekit)
 		$(use_enable smartcard smartcard-support)
-		$(use_enable udev gudev)"
-		# TODO: libwacom is needem
-		#$(use_enable wacom)
+		$(use_enable systemd)
+		$(use_enable udev gudev)
+		$(use_enable wacom)"
 }
 
 src_prepare() {
@@ -110,7 +111,7 @@ src_prepare() {
 		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"
+	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
 
 	eautoreconf