commit: ae15f14622daac438b78e2c95de31dd4c8c78702 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Apr 20 14:16:35 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Apr 20 15:48:24 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae15f146
gnome-base/gnome-settings-daemon: QAed * Add missing xkeyboard-config dependency. * Fix keywords. * Remove old revision of optional patch. * Sync live ebuild. --- .../gnome-settings-daemon-3.10.2-optional.patch | 89 ---------------------- .../gnome-settings-daemon-3.12.0.ebuild | 7 +- .../gnome-settings-daemon-9999.ebuild | 9 ++- 3 files changed, 9 insertions(+), 96 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch deleted file mode 100644 index 213d0a7..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch +++ /dev/null @@ -1,89 +0,0 @@ -From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <[email protected]> -Date: Tue, 10 Dec 2013 00:27:27 +0100 -Subject: [PATCH] Make colord and wacom support optional - ---- - configure.ac | 30 ++++++++++++++++++++++++++---- - plugins/Makefile.am | 7 ++++++- - 2 files changed, 32 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9f3b7ed..5720d36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -245,7 +245,20 @@ dnl --------------------------------------------------------------------------- - dnl - color - dnl --------------------------------------------------------------------------- - --PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 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$with_color = xyes; then -+ PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3]) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+fi -+AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes") -+ -+AC_SUBST(COLOR_CFLAGS) -+AC_SUBST(COLOR_LIBS) - - dnl --------------------------------------------------------------------------- - dnl - datetime -@@ -276,12 +289,21 @@ case $host_os in - have_wacom=no - else - if test x$enable_gudev != xno; then -- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ 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-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ have_wacom=yes -+ fi -+ AC_SUBST(WACOM_CFLAGS) -+ AC_SUBST(WACOM_LIBS) - else - AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) - fi -- have_wacom=yes - fi - ;; - *) -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 2f4840d..d517e77 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - cursor \ - datetime \ - dummy \ -@@ -22,6 +21,12 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if WITH_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if HAVE_PACKAGEKIT - enabled_plugins += updates - else --- -1.8.3.2 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild index 4a025bd..2d40849 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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-3.10.2.ebuild,v 1.5 2014/03/09 11:58:52 pacho Exp $ +# $Header: $ EAPI="5" GCONF_DEBUG="no" @@ -18,7 +18,7 @@ REQUIRED_USE=" packagekit? ( udev ) smartcard? ( udev ) " -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" COMMON_DEPEND=" >=dev-libs/glib-2.37.7:2 @@ -31,7 +31,7 @@ COMMON_DEPEND=" >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99.0 + >=sys-power/upower-0.99 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= @@ -42,6 +42,7 @@ COMMON_DEPEND=" x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc + x11-misc/xkeyboard-config >=app-misc/geoclue-2.1.2:2.0 >=dev-libs/libgweather-3.9.5:2 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 223a4ac..ebdba0b 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -30,7 +30,7 @@ fi COMMON_DEPEND=" >=dev-libs/glib-2.37.7:2 >=x11-libs/gtk+-3.7.8:3 - >=gnome-base/gnome-desktop-3.9:3= + >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.9.91.1 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell @@ -38,7 +38,7 @@ COMMON_DEPEND=" >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 - >=sys-power/upower-0.9.11 + >=sys-power/upower-0.99 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= @@ -49,8 +49,9 @@ COMMON_DEPEND=" x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc + x11-misc/xkeyboard-config - app-misc/geoclue:2.0 + >=app-misc/geoclue-2.1.2:2.0 >=dev-libs/libgweather-3.9.5:2 >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 @@ -102,7 +103,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-3.7.90-short-touchpad-timeout.patch" # Make colord and wacom optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.10.2-optional.patch" + epatch "${FILESDIR}/${PN}-3.12.0-optional.patch" epatch_user [[ ${PV} != 9999 ]] && eautoreconf
