commit: 46a4b8c1a4c60b85116b718af776eb9e248620e9 Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> AuthorDate: Mon Apr 27 20:29:22 2015 +0000 Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> CommitDate: Mon Apr 27 20:30:07 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=46a4b8c1
Bump gnome-settings-daemon to 3.16.1 Package-Manager: portage-2.2.18 Manifest-Sign-Key: 7E8B4D42 ...=> gnome-settings-daemon-3.16.0-optional.patch} | 20 ++++++++--------- ....ebuild => gnome-settings-daemon-3.16.1.ebuild} | 26 +++++++++------------- .../gnome-settings-daemon-9999.ebuild | 13 ++++++----- 3 files changed, 27 insertions(+), 32 deletions(-) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch similarity index 89% rename from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch rename to gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch index a7a56b0..46d9739 100644 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.0-optional.patch @@ -1,6 +1,6 @@ -From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <sobhanmohammadpo...@yahoo.fr> -Date: Tue, 10 Dec 2013 00:27:27 +0100 +From 8b526c757f0e977eeda9285762e137deba0a31f4 Mon Sep 17 00:00:00 2001 +From: Ole Reifschneider <m...@ole-reifschneider.de> +Date: Sat, 11 Apr 2015 23:10:21 +0200 Subject: [PATCH] Make colord and wacom support optional --- @@ -9,10 +9,10 @@ Subject: [PATCH] Make colord and wacom support optional 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index c42ea8b..26ccd36 100644 +index 50a6bb1..a42ec20 100644 --- a/configure.ac +++ b/configure.ac -@@ -225,7 +225,20 @@ dnl --------------------------------------------------------------------------- +@@ -236,7 +236,20 @@ dnl --------------------------------------------------------------------------- dnl - color dnl --------------------------------------------------------------------------- @@ -34,7 +34,7 @@ index c42ea8b..26ccd36 100644 dnl --------------------------------------------------------------------------- dnl - datetime -@@ -256,15 +269,25 @@ case $host_os in +@@ -267,15 +280,25 @@ case $host_os in if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then have_wacom=no else @@ -66,7 +66,7 @@ index c42ea8b..26ccd36 100644 ;; *) diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 7bb01f0..7cc3655 100644 +index 7365953..779b5d9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -4,7 +4,6 @@ enabled_plugins = \ @@ -74,10 +74,10 @@ index 7bb01f0..7cc3655 100644 a11y-settings \ clipboard \ - color \ - cursor \ datetime \ dummy \ -@@ -22,6 +21,12 @@ enabled_plugins = \ + power \ +@@ -21,6 +20,12 @@ enabled_plugins = \ disabled_plugins = $(NULL) @@ -91,5 +91,5 @@ index 7bb01f0..7cc3655 100644 enabled_plugins += smartcard else -- -2.1.2 +2.0.5 diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild similarity index 88% copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild index 7482043..d152d45 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild,v 1.1 2015/03/28 16:07:02 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -8,31 +8,25 @@ GNOME2_LA_PUNT="yes" PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit autotools eutils gnome2 python-r1 systemd udev virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Gnome Settings Daemon" HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" LICENSE="GPL-2+" SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev" +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland" REQUIRED_USE=" + input_devices_wacom? ( udev ) smartcard? ( udev ) test? ( ${PYTHON_REQUIRED_USE} ) " -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -fi +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 - >=x11-libs/gtk+-3.7.8:3 + >=dev-libs/glib-2.37.7:2[dbus] + >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.9.91.1 + >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell media-libs/fontconfig @@ -107,10 +101,10 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch # Make colord and wacom optional; requires eautoreconf - epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch + epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch epatch_user - [[ ${PV} != 9999 ]] && eautoreconf + 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 7482043..2ebf7ee 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -17,8 +17,9 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" LICENSE="GPL-2+" SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev" +IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland" REQUIRED_USE=" + input_devices_wacom? ( udev ) smartcard? ( udev ) test? ( ${PYTHON_REQUIRED_USE} ) " @@ -29,10 +30,10 @@ else fi COMMON_DEPEND=" - >=dev-libs/glib-2.37.7:2 - >=x11-libs/gtk+-3.7.8:3 + >=dev-libs/glib-2.37.7:2[dbus] + >=x11-libs/gtk+-3.15.3:3 >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.9.91.1 + >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/librsvg-2.36.2 media-fonts/cantarell media-libs/fontconfig @@ -107,7 +108,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch # Make colord and wacom optional; requires eautoreconf - epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch + epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch epatch_user [[ ${PV} != 9999 ]] && eautoreconf