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

[Mart Raudsepp]

commit: beb7ce2ab6614f65fadb09ff19af813a87633b07
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Sep 27 21:42:47 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Sep 27 21:42:47 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=beb7ce2a

gnome-base/gnome-settings-daemon: remove, moved to ::gentoo

 .../files/3.24.2-udevrulesdir-configure.patch  |  48 --
 .../files/3.24.3-fix-wayland-build.patch   |  53 ---
 .../files/3.26.1-optional.patch| 169 -
 .../gnome-settings-daemon-3.26.2-r1.ebuild | 131 
 gnome-base/gnome-settings-daemon/metadata.xml  |  13 --
 5 files changed, 414 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
deleted file mode 100644
index 16988f94..
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Mon, 29 May 2017 00:38:57 +0300
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by 
default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.

- configure.ac   | 9 +
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1107578..475821d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
- dnl 
---
-+dnl - Where to install udev rules
-+dnl 
---
-+AC_ARG_WITH([udevrulesdir],
-+AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev 
rules files]),
-+[],
-+[with_udevrulesdir=$($PKG_CONFIG --variable=udevdir 
udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl 
---
- dnl - ALSA integration (default enabled)
- dnl 
---
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index 3c5ec47..bfc34c6 100644
 a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
-   $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
- 
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
- 
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
--- 
-2.10.2
-

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
deleted file mode 100644
index 4a06889a..
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Fri, 18 Aug 2017 09:42:56 +0200
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of
- wayland
-
-See https://bugs.gentoo.org/show_bug.cgi?id=627966

- configure.ac   | 5 +
- plugins/common/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 908b3a3a..c89d5e2d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
- AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: 
auto)]),
- enable_wayland=$enableval, enable_wayland=auto)
- if test x$enable_wayland != xno; then
-+AS_IF([test "$have_udev" = no],
-+  [AC_MSG_ERROR([udev is required for Wayland support])])
-+
- PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, 
have_wayland=no)
- if test x$have_wayland = xyes; then
- AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is 
available])
-+  GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
- else
- if test x$enable_wayland = xyes; then
- AC_MSG_ERROR([Wayland enabled but not found])
- fi
- fi
- fi
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
- 
- dnl 
- dnl Plugins
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 107e4d3b..760f3198 100644
 a/plugins/common/Makefile.am
-+++ 

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

[Mart Raudsepp]

commit: 83d52f2cca54f7835bbe8f7f91b1b1d198222c85
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Sep 25 20:46:31 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Sep 25 20:46:31 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=83d52f2c

gnome-base/gnome-settings-daemon: add glib-utils build dep, remove sed dep

sed is always guaranteed from system packages

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
index cced7d8b..0d45c1d0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -76,13 +76,13 @@ RDEPEND="${COMMON_DEPEND}

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

[Mart Raudsepp]

commit: ed4fd0b4504855b0ce66bfcc80cf7d61c56a1be2
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Sep 25 20:27:10 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Sep 25 20:27:10 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ed4fd0b4

gnome-base/gnome-settings-daemon: (blindly) support elogind

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../gnome-settings-daemon-3.26.2-r1.ebuild | 28 +-
 gnome-base/gnome-settings-daemon/metadata.xml  |  9 +++
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
index f4bef258..cced7d8b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -7,7 +7,7 @@ GNOME2_LA_PUNT="yes"
 #PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # 
https://bugzilla.gnome.org/show_bug.cgi?id=783186
 PYTHON_COMPAT=( python2_7 )
 
-inherit gnome2 python-any-r1 systemd udev virtualx
+inherit gnome2 python-any-r1 udev virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon;
@@ -15,8 +15,9 @@ SRC_URI+=" 
https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit smartcard test +udev wayland"
+IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit 
smartcard systemd test +udev wayland"
 REQUIRED_USE="
+   ^^ ( elogind systemd )
input_devices_wacom? ( udev )
smartcard? ( udev )
wayland? ( udev )
@@ -66,11 +67,12 @@ COMMON_DEPEND="
udev? ( virtual/libgudev:= )
wayland? ( dev-libs/wayland )
 "
-# systemd needed for power and session management, bug #464944
+# logind needed for power and session management, bug #464944
 # gnome-session-3.25.4 adapts to Orientation and XRANDR components removal 
(moved to mutter)
 RDEPEND="${COMMON_DEPEND}
gnome-base/dconf
-   !openrc-force? ( sys-apps/systemd )
+   elogind? ( sys-auth/elogind )
+   systemd? ( sys-apps/systemd )
!https://wiki.gentoo.org/wiki/Systemd;
-   fi
-
-   if use openrc-force; then
-   ewarn "You are enabling 'openrc-force' USE flag to skip systemd 
requirement,"
-   ewarn "this can lead to unexpected problems and is not 
supported neither by"
-   ewarn "upstream neither by Gnome Gentoo maintainers. If you 
suffer any problem,"
-   ewarn "you will need to disable this USE flag system wide and 
retest before"
-   ewarn "opening any bug report."
-   fi
-}

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml 
b/gnome-base/gnome-settings-daemon/metadata.xml
index 7ddc604e..5e2d0958 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -6,11 +6,8 @@
Gentoo GNOME Desktop


-   Support color management using
-   x11-misc/colord
-   Skip systemd dependency (#480336),
-   enabling this flag will become your setup to be fully
-   unsupported by upstream and downstream Gnome team. Do 
not
-   try to enable it unless completely needed
+   Support color management using 
x11-misc/colord
+   Rely on sys-auth/elogind as 
runtime logind provider
+   Rely on sys-apps/systemd as 
runtime logind provider

 

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

[Mart Raudsepp]

commit: be7779fbf05546ccef6d849b9ef1ff126e5fe55f
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Sep 25 20:23:02 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Sep 25 20:23:11 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=be7779fb

gnome-base/gnome-settings-daemon: Remove previous revision

 .../gnome-settings-daemon-3.26.2.ebuild| 153 -
 1 file changed, 153 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild
deleted file mode 100644
index c3015335..
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # 
https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-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 smartcard test +udev wayland"
-REQUIRED_USE="
-   input_devices_wacom? ( udev )
-   smartcard? ( udev )
-   wayland? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-   >=dev-libs/glib-2.53.0:2[dbus]
-   >=x11-libs/gtk+-3.15.3:3[X,wayland?]
-   >=gnome-base/gnome-desktop-3.11.1:3=
-   >=gnome-base/gsettings-desktop-schemas-3.23.3
-   >=gnome-base/librsvg-2.36.2:2
-   media-fonts/cantarell
-   media-libs/alsa-lib
-   media-libs/fontconfig
-   media-libs/libcanberra[gtk3]
-   >=media-sound/pulseaudio-2
-   >=sys-power/upower-0.99:=
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   >=x11-libs/libnotify-0.7.3:=
-   x11-libs/libX11
-   x11-libs/libxkbfile
-   x11-libs/libXi
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXtst
-   x11-libs/libXxf86misc
-   x11-misc/xkeyboard-config
-
-   >=app-misc/geoclue-2.3.1:2.0
-   >=dev-libs/libgweather-3.9.5:2=
-   >=sci-geosciences/geocode-glib-3.10
-   >=sys-auth/polkit-0.103
-
-   colord? (
-   >=media-libs/lcms-2.2:2
-   >=x11-misc/colord-1.0.2:= )
-   cups? ( >=net-print/cups-1.4[dbus] )
-   input_devices_wacom? (
-   >=dev-libs/libwacom-0.7
-   >=x11-libs/pango-1.20
-   x11-drivers/xf86-input-wacom
-   virtual/libgudev:= )
-   networkmanager? ( >=net-misc/networkmanager-1.0 )
-   smartcard? ( >=dev-libs/nss-3.11.2 )
-   udev? ( virtual/libgudev:= )
-   wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# https://wiki.gentoo.org/wiki/Systemd;
-   fi
-
-   if use openrc-force; then
-   ewarn "You are enabling 'openrc-force' USE flag to skip systemd 
requirement,"
-   ewarn "this can lead to unexpected problems and is not 
supported neither by"
-   ewarn "upstream neither by Gnome Gentoo maintainers. If you 
suffer any problem,"
-   ewarn "you will need to disable this USE flag system wide and 
retest before"
-   ewarn "opening any bug report."
-   fi
-}

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

[Mart Raudsepp]

commit: 5e3938d2f49472f6766e152e021d334d6729ffda
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Sep 25 20:21:56 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Sep 25 20:22:17 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5e3938d2

gnome-base/gnome-settings-daemon: Remove too outdated live ebuild

git master uses meson, so no point in blind syncing from my updates.

 .../gnome-settings-daemon-.ebuild  | 157 -
 1 file changed, 157 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
deleted file mode 100644
index dd7f0bd8..
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # 
https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-if [[ ${PV} =  ]]; 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 smartcard test +udev wayland"
-REQUIRED_USE="
-   input_devices_wacom? ( udev )
-   smartcard? ( udev )
-   wayland? ( udev )
-"
-if [[ ${PV} =  ]]; then
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-COMMON_DEPEND="
-   >=dev-libs/glib-2.53.0:2[dbus]
-   >=x11-libs/gtk+-3.15.3:3[X,wayland?]
-   >=gnome-base/gnome-desktop-3.11.1:3=
-   >=gnome-base/gsettings-desktop-schemas-3.23.3
-   >=gnome-base/librsvg-2.36.2:2
-   media-fonts/cantarell
-   media-libs/alsa-lib
-   media-libs/fontconfig
-   media-libs/libcanberra[gtk3]
-   >=media-sound/pulseaudio-2
-   >=sys-power/upower-0.99:=
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   >=x11-libs/libnotify-0.7.3:=
-   x11-libs/libX11
-   x11-libs/libxkbfile
-   x11-libs/libXi
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXtst
-   x11-libs/libXxf86misc
-   x11-misc/xkeyboard-config
-
-   >=app-misc/geoclue-2.3.1:2.0
-   >=dev-libs/libgweather-3.9.5:2=
-   >=sci-geosciences/geocode-glib-3.10
-   >=sys-auth/polkit-0.103
-
-   colord? (
-   >=media-libs/lcms-2.2:2
-   >=x11-misc/colord-1.0.2:= )
-   cups? ( >=net-print/cups-1.4[dbus] )
-   input_devices_wacom? (
-   >=dev-libs/libwacom-0.7
-   >=x11-libs/pango-1.20
-   x11-drivers/xf86-input-wacom
-   virtual/libgudev:= )
-   networkmanager? ( >=net-misc/networkmanager-1.0 )
-   smartcard? ( >=dev-libs/nss-3.11.2 )
-   udev? ( virtual/libgudev:= )
-   wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# https://wiki.gentoo.org/wiki/Systemd;
-   fi
-
-   if use openrc-force; then
-   ewarn "You are enabling 'openrc-force' USE flag to skip systemd 
requirement,"
-   ewarn "this can lead to unexpected problems and is not 
supported neither by"
-   ewarn "upstream neither by Gnome Gentoo maintainers. If you 
suffer any problem,"
-   ewarn "you will need to disable this USE flag system wide and 
retest before"
-   ewarn "opening any bug report."
-   fi
-}

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

[Mart Raudsepp]

commit: 132fa488b79248c227fa7146519e751f2e814999
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Tue Sep 25 17:50:48 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue Sep 25 17:50:48 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=132fa488

gnome-base/gnome-settings-daemon: revbump with full patchset

Include full patchset with upstream gnome-3-26 bug and test fixes.
Don't depend on dev-libs/glib USE=dbus - if this is really needed,
then dconf should be depended on directly.
Remove ancient blockers. Fix gnome-session blocker to be technically
correct, but inconsequential (no-one has inbetween 3.25 versions
anymore). Add explanation about it.

The full patchset includes the 3 Gentoo specific commits.
This is maintained here:
https://github.com/EvaSDK/gnome-settings-daemon/tree/gentoo-3.26.2

TODO: Retry with tests enabled, as the patchset has a huge set of
fixes to it. Tests are currently p.use.masked in main tree.

Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../gnome-settings-daemon-3.26.2-r1.ebuild | 147 +
 1 file changed, 147 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
new file mode 100644
index ..f4bef258
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # 
https://bugzilla.gnome.org/show_bug.cgi?id=783186
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-any-r1 systemd udev virtualx
+
+DESCRIPTION="Gnome Settings Daemon"
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon;
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit smartcard test +udev wayland"
+REQUIRED_USE="
+   input_devices_wacom? ( udev )
+   smartcard? ( udev )
+   wayland? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+   >=dev-libs/glib-2.53.0:2
+   >=x11-libs/gtk+-3.15.3:3[X,wayland?]
+   >=gnome-base/gnome-desktop-3.11.1:3=
+   >=gnome-base/gsettings-desktop-schemas-3.23.3
+   >=gnome-base/librsvg-2.36.2:2
+   media-fonts/cantarell
+   media-libs/alsa-lib
+   media-libs/fontconfig
+   media-libs/libcanberra[gtk3]
+   >=media-sound/pulseaudio-2
+   >=sys-power/upower-0.99:=
+   x11-libs/cairo
+   x11-libs/gdk-pixbuf:2
+   >=x11-libs/libnotify-0.7.3:=
+   x11-libs/libX11
+   x11-libs/libxkbfile
+   x11-libs/libXi
+   x11-libs/libXext
+   x11-libs/libXfixes
+   x11-libs/libXtst
+   x11-libs/libXxf86misc
+   x11-misc/xkeyboard-config
+
+   >=app-misc/geoclue-2.3.1:2.0
+   >=dev-libs/libgweather-3.9.5:2=
+   >=sci-geosciences/geocode-glib-3.10
+   >=sys-auth/polkit-0.103
+
+   colord? (
+   >=media-libs/lcms-2.2:2
+   >=x11-misc/colord-1.0.2:= )
+   cups? ( >=net-print/cups-1.4[dbus] )
+   input_devices_wacom? (
+   >=dev-libs/libwacom-0.7
+   >=x11-libs/pango-1.20
+   x11-drivers/xf86-input-wacom
+   virtual/libgudev:= )
+   networkmanager? ( >=net-misc/networkmanager-1.0 )
+   smartcard? ( >=dev-libs/nss-3.11.2 )
+   udev? ( virtual/libgudev:= )
+   wayland? ( dev-libs/wayland )
+"
+# systemd needed for power and session management, bug #464944
+# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal 
(moved to mutter)
+RDEPEND="${COMMON_DEPEND}
+   gnome-base/dconf
+   !openrc-force? ( sys-apps/systemd )
+   !https://wiki.gentoo.org/wiki/Systemd;
+   fi
+
+   if use openrc-force; then
+   ewarn "You are enabling 'openrc-force' USE flag to skip systemd 
requirement,"
+   ewarn "this can lead to unexpected problems and is not 
supported neither by"
+   ewarn "upstream neither by Gnome Gentoo maintainers. If you 
suffer any problem,"
+   ewarn "you will need to disable this USE flag system wide and 
retest before"
+   ewarn "opening any bug report."
+   fi
+}

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

[Sobhan Mohammadpour]

commit: bcf8b38224a7ddc97e37a1bc9b9b3a2d5a2ef582
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Sun May  6 15:16:19 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Sun May  6 15:16:19 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bcf8b382

gnome-base/gnome-settings-daemon: bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 ...ettings-daemon-3.26.1.ebuild => gnome-settings-daemon-3.26.2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild
similarity index 99%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild
index 1ccf9ecb..f946060e 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2.ebuild
@@ -100,7 +100,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
# Make colord and wacom optional; requires eautoreconf
-   "${FILESDIR}"/${PV}-optional.patch
+   "${FILESDIR}"/3.26.1-optional.patch
# Allow specifying udevrulesdir via configure, bug 509484; requires 
eautoreconf
"${FILESDIR}"/3.24.2-udevrulesdir-configure.patch
# Fix build issue when gudev is present but not wayland, bug #627966

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

[Sobhan Mohammadpour]

commit: c1298d1702e448ba60a6e322967e80af9bb1cfea
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Wed Feb 14 19:02:40 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Wed Feb 14 19:02:40 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c1298d17

Revert "Revert "gnome-base/gnome-settings-daemon: bump""

This reverts commit 7f482f50c0bbf6485cda4e2e4c94dae2fbd60ccb.

 .../files/3.24.2-udevrulesdir-configure.patch  |  48 ++
 .../files/3.24.3-fix-wayland-build.patch   |  53 +++
 .../files/3.26.1-optional.patch| 169 +
 .../gnome-settings-daemon-3.26.1.ebuild| 156 +++
 4 files changed, 426 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
new file mode 100644
index ..16988f94
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Mon, 29 May 2017 00:38:57 +0300
+Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
+
+Use the standard way to find the udev rules directory via pkg-config by 
default,
+and support specifying it, should it be necessary.
+This is the same logic as in colord.
+---
+ configure.ac   | 9 +
+ plugins/rfkill/Makefile.am | 1 -
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1107578..475821d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -104,6 +104,15 @@ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl 
---
++dnl - Where to install udev rules
++dnl 
---
++AC_ARG_WITH([udevrulesdir],
++AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev 
rules files]),
++[],
++[with_udevrulesdir=$($PKG_CONFIG --variable=udevdir 
udev)/rules.d])
++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
++
++dnl 
---
+ dnl - ALSA integration (default enabled)
+ dnl 
---
+ ALSA_PKG=""
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
+index 3c5ec47..bfc34c6 100644
+--- a/plugins/rfkill/Makefile.am
 b/plugins/rfkill/Makefile.am
+@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
+   $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+ 
+ EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+-- 
+2.10.2
+

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
new file mode 100644
index ..4a06889a
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
@@ -0,0 +1,53 @@
+From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Fri, 18 Aug 2017 09:42:56 +0200
+Subject: [PATCH] Fix build issue when gudev is detected in the absence of
+ wayland
+
+See https://bugs.gentoo.org/show_bug.cgi?id=627966
+---
+ configure.ac   | 5 +
+ plugins/common/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 908b3a3a..c89d5e2d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
+ AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: 
auto)]),
+ enable_wayland=$enableval, enable_wayland=auto)
+ if test x$enable_wayland != xno; then
++AS_IF([test "$have_udev" = no],
++  [AC_MSG_ERROR([udev is required for Wayland support])])
++
+ PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, 
have_wayland=no)
+ if test x$have_wayland = xyes; then
+ AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is 
available])
++  GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
+ else
+ if test x$enable_wayland = xyes; then
+ AC_MSG_ERROR([Wayland enabled but not found])
+ fi
+ fi
+ fi
++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
+ 
+ dnl 
+ dnl Plugins
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 107e4d3b..760f3198 100644
+--- 

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

[Sobhan Mohammadpour]

commit: ca6217f2743c2541d60ca729bee194219ddd2aef
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Wed Feb 14 19:33:55 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Wed Feb 14 19:33:55 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ca6217f2

gnome-base/gnome-settings-daemon: update gnome-session's blocker

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
index 0dd04c34..1ccf9ecb 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.1.ebuild
@@ -75,7 +75,7 @@ RDEPEND="${COMMON_DEPEND}

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

[Sobhan Mohammadpour]

commit: 7f482f50c0bbf6485cda4e2e4c94dae2fbd60ccb
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Feb 13 17:41:29 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Feb 13 17:41:29 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7f482f50

Revert "gnome-base/gnome-settings-daemon: bump"

This reverts commit e588ec09d3603c3e92b10ccee617258b92132b7a.

 .../files/3.24.2-udevrulesdir-configure.patch  |  48 --
 .../files/3.24.3-fix-wayland-build.patch   |  53 ---
 .../files/3.26.1-optional.patch| 169 -
 .../gnome-settings-daemon-3.26.1.ebuild| 156 ---
 4 files changed, 426 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
deleted file mode 100644
index 16988f94..
--- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp 
-Date: Mon, 29 May 2017 00:38:57 +0300
-Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
-
-Use the standard way to find the udev rules directory via pkg-config by 
default,
-and support specifying it, should it be necessary.
-This is the same logic as in colord.

- configure.ac   | 9 +
- plugins/rfkill/Makefile.am | 1 -
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1107578..475821d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,15 @@ fi
- AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
- 
- dnl 
---
-+dnl - Where to install udev rules
-+dnl 
---
-+AC_ARG_WITH([udevrulesdir],
-+AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev 
rules files]),
-+[],
-+[with_udevrulesdir=$($PKG_CONFIG --variable=udevdir 
udev)/rules.d])
-+AC_SUBST([udevrulesdir], [$with_udevrulesdir])
-+
-+dnl 
---
- dnl - ALSA integration (default enabled)
- dnl 
---
- ALSA_PKG=""
-diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
-index 3c5ec47..bfc34c6 100644
 a/plugins/rfkill/Makefile.am
-+++ b/plugins/rfkill/Makefile.am
-@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
-   $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
- 
--udevrulesdir = $(prefix)/lib/udev/rules.d
- udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
- 
- EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
--- 
-2.10.2
-

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
deleted file mode 100644
index 4a06889a..
--- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Fri, 18 Aug 2017 09:42:56 +0200
-Subject: [PATCH] Fix build issue when gudev is detected in the absence of
- wayland
-
-See https://bugs.gentoo.org/show_bug.cgi?id=627966

- configure.ac   | 5 +
- plugins/common/Makefile.am | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 908b3a3a..c89d5e2d 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
- AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: 
auto)]),
- enable_wayland=$enableval, enable_wayland=auto)
- if test x$enable_wayland != xno; then
-+AS_IF([test "$have_udev" = no],
-+  [AC_MSG_ERROR([udev is required for Wayland support])])
-+
- PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, 
have_wayland=no)
- if test x$have_wayland = xyes; then
- AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is 
available])
-+  GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
- else
- if test x$enable_wayland = xyes; then
- AC_MSG_ERROR([Wayland enabled but not found])
- fi
- fi
- fi
-+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
- 
- dnl 
- dnl Plugins
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 107e4d3b..760f3198 100644
 

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

[Sobhan Mohammadpour]

commit: e588ec09d3603c3e92b10ccee617258b92132b7a
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Fri Feb  9 15:42:49 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Fri Feb  9 15:42:49 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e588ec09

gnome-base/gnome-settings-daemon: bump

Package-Manager: Portage-2.3.23, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 .../files/3.24.2-udevrulesdir-configure.patch  |  48 ++
 .../files/3.24.3-fix-wayland-build.patch   |  53 +++
 .../files/3.26.1-optional.patch| 169 +
 .../gnome-settings-daemon-3.26.1.ebuild| 156 +++
 4 files changed, 426 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
new file mode 100644
index ..16988f94
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch
@@ -0,0 +1,48 @@
+From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp 
+Date: Mon, 29 May 2017 00:38:57 +0300
+Subject: [PATCH 1/5] build: Get udevrulesdir from pkg-config
+
+Use the standard way to find the udev rules directory via pkg-config by 
default,
+and support specifying it, should it be necessary.
+This is the same logic as in colord.
+---
+ configure.ac   | 9 +
+ plugins/rfkill/Makefile.am | 1 -
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1107578..475821d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -104,6 +104,15 @@ fi
+ AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes)
+ 
+ dnl 
---
++dnl - Where to install udev rules
++dnl 
---
++AC_ARG_WITH([udevrulesdir],
++AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev 
rules files]),
++[],
++[with_udevrulesdir=$($PKG_CONFIG --variable=udevdir 
udev)/rules.d])
++AC_SUBST([udevrulesdir], [$with_udevrulesdir])
++
++dnl 
---
+ dnl - ALSA integration (default enabled)
+ dnl 
---
+ ALSA_PKG=""
+diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
+index 3c5ec47..bfc34c6 100644
+--- a/plugins/rfkill/Makefile.am
 b/plugins/rfkill/Makefile.am
+@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile
+   $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ 
+-udevrulesdir = $(prefix)/lib/udev/rules.d
+ udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules
+ 
+ EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files)
+-- 
+2.10.2
+

diff --git 
a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch 
b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
new file mode 100644
index ..4a06889a
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch
@@ -0,0 +1,53 @@
+From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Fri, 18 Aug 2017 09:42:56 +0200
+Subject: [PATCH] Fix build issue when gudev is detected in the absence of
+ wayland
+
+See https://bugs.gentoo.org/show_bug.cgi?id=627966
+---
+ configure.ac   | 5 +
+ plugins/common/Makefile.am | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 908b3a3a..c89d5e2d 100644
+--- a/configure.ac
 b/configure.ac
+@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland,
+ AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: 
auto)]),
+ enable_wayland=$enableval, enable_wayland=auto)
+ if test x$enable_wayland != xno; then
++AS_IF([test "$have_udev" = no],
++  [AC_MSG_ERROR([udev is required for Wayland support])])
++
+ PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, 
have_wayland=no)
+ if test x$have_wayland = xyes; then
+ AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is 
available])
++  GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0"
+ else
+ if test x$enable_wayland = xyes; then
+ AC_MSG_ERROR([Wayland enabled but not found])
+ fi
+ fi
+ fi
++AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes)
+ 
+ dnl 
+ dnl Plugins
+diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
+index 107e4d3b..760f3198 100644
+--- 

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

[Dennis Lamm]

commit: ffb92259939f398be4cbc1c176b301e46a99ccdb
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Jan 12 13:11:34 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Jan 12 13:11:34 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ffb92259

gnome-base/gnome-settings-daemon: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../gnome-settings-daemon-3.20.0.ebuild| 145 -
 .../gnome-settings-daemon-.ebuild  |   3 +-
 2 files changed, 1 insertion(+), 147 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
deleted file mode 100644
index 866b7869..
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-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 wayland"
-REQUIRED_USE="
-   input_devices_wacom? ( udev )
-   smartcard? ( udev )
-   test? ( ${PYTHON_REQUIRED_USE} )
-"
-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[dbus]
-   >=x11-libs/gtk+-3.15.3:3
-   >=gnome-base/gnome-desktop-3.11.1:3=
-   >=gnome-base/gsettings-desktop-schemas-3.19.3
-   >=gnome-base/librsvg-2.36.2
-   media-fonts/cantarell
-   media-libs/fontconfig
-   >=media-libs/lcms-2.2:2
-   media-libs/libcanberra[gtk3]
-   >=media-sound/pulseaudio-2
-   >=sys-power/upower-0.99:=
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   >=x11-libs/libnotify-0.7.3:=
-   x11-libs/libX11
-   x11-libs/libxkbfile
-   x11-libs/libXi
-   x11-libs/libXext
-   x11-libs/libXfixes
-   x11-libs/libXtst
-   x11-libs/libXxf86misc
-   x11-misc/xkeyboard-config
-
-   >=app-misc/geoclue-2.3.1:2.0
-   >=dev-libs/libgweather-3.9.5:2
-   >=sci-geosciences/geocode-glib-3.10
-   >=sys-auth/polkit-0.103
-
-   colord? ( >=x11-misc/colord-1.0.2:= )
-   cups? ( >=net-print/cups-1.4[dbus] )
-   input_devices_wacom? (
-   >=dev-libs/libwacom-0.7
-   >=x11-libs/pango-1.20
-   x11-drivers/xf86-input-wacom
-   virtual/libgudev:= )
-   networkmanager? ( >=net-misc/networkmanager-1.0 )
-   smartcard? ( >=dev-libs/nss-3.11.2 )
-   udev? ( virtual/libgudev:= )
-   wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# https://wiki.gentoo.org/wiki/Systemd;
-   fi
-
-   if use openrc-force; then
-   ewarn "You are enabling 'openrc-force' USE flag to skip systemd 
requirement,"
-   ewarn "this can lead to unexpected problems and is not 
supported neither by"
-   ewarn "upstream neither by Gnome Gentoo maintainers. If you 
suffer any problem,"
-   ewarn "you will need to disable this USE flag system wide and 
retest before"
-   ewarn "opening any bug report."
-   fi
-}

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
index 655ca295..1f51925b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"

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

[Ole Reifschneider]

commit: 19caff9886615963ec0383baf143ef6fd3d44055
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Mar 20 18:35:20 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Mar 25 00:55:46 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=19caff98

gnome-base/gnome-settings-daemon: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...ings-daemon-3.7.90-short-touchpad-timeout.patch | 25 --
 ebuild => gnome-settings-daemon-3.20.0.ebuild} | 17 +--
 .../gnome-settings-daemon-.ebuild  | 10 -
 3 files changed, 10 insertions(+), 42 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
deleted file mode 100644
index 7dc410f..000
--- 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bc0f7c1da87b17839ebf71dc102c19b7d7b6c65a Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour 
-Date: Mon, 25 Feb 2013 17:24:25 +0330
-Subject: [PATCH] gnome-settings-daemon-3.7.90-short-touchpad-timeout
-

- plugins/mouse/gsd-mouse-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c 
b/plugins/mouse/gsd-mouse-manager.c
-index a62800a..e7d39e1 100644
 a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -583,7 +583,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean 
state)
- 
- g_ptr_array_add (args, "syndaemon");
- g_ptr_array_add (args, "-i");
--g_ptr_array_add (args, "1.0");
-+g_ptr_array_add (args, "0.5");
- g_ptr_array_add (args, "-t");
- g_ptr_array_add (args, "-K");
- g_ptr_array_add (args, "-R");
--- 
-1.8.1.2
-

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
similarity index 87%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
index 934e8d7..866b786 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.20.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
 
 inherit autotools eutils gnome2 python-r1 systemd udev virtualx
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="
>=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.15.4
+   >=gnome-base/gsettings-desktop-schemas-3.19.3
>=gnome-base/librsvg-2.36.2
media-fonts/cantarell
media-libs/fontconfig
@@ -46,7 +46,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
x11-misc/xkeyboard-config
 
-   >=app-misc/geoclue-2.1.2:2.0
+   >=app-misc/geoclue-2.3.1:2.0
>=dev-libs/libgweather-3.9.5:2
>=sci-geosciences/geocode-glib-3.10
>=sys-auth/polkit-0.103
@@ -58,7 +58,7 @@ COMMON_DEPEND="
>=x11-libs/pango-1.20
x11-drivers/xf86-input-wacom
virtual/libgudev:= )
-   networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
+   networkmanager? ( >=net-misc/networkmanager-1.0 )
smartcard? ( >=dev-libs/nss-3.11.2 )
udev? ( virtual/libgudev:= )
wayland? ( dev-libs/wayland )
@@ -93,13 +93,6 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-   # https://bugzilla.gnome.org/show_bug.cgi?id=621836
-   # Apparently this change severely affects touchpad usability for some
-   # people, so revert it if USE=short-touchpad-timeout.
-   # Revisit if/when upstream adds a setting for customizing the timeout.
-   use short-touchpad-timeout &&
-   epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
-
# Make colord and wacom optional; requires eautoreconf
epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
index 1c29112..655ca29 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 

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

[Ole Reifschneider]

commit: 8ecb0d8858564de2bfc7d89a8d78c415ce05ea76
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Mon Oct 12 18:36:41 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Mon Oct 12 18:36:41 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8ecb0d88

gnome-base/gnome-settings-daemon: Bump version to 3.18.0

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42

 ...emon-.ebuild => gnome-settings-daemon-3.18.0.ebuild} | 13 +++--
 .../gnome-settings-daemon/gnome-settings-daemon-.ebuild |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
similarity index 93%
copy from gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
copy to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
index f50486d..934e8d7 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.0.ebuild
@@ -8,9 +8,6 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon;
@@ -23,11 +20,7 @@ REQUIRED_USE="
smartcard? ( udev )
test? ( ${PYTHON_REQUIRED_USE} )
 "
-if [[ ${PV} =  ]]; 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[dbus]
@@ -111,7 +104,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-3.16.0-optional.patch
 
epatch_user
-   [[ ${PV} !=  ]] && eautoreconf
+   eautoreconf
 
gnome2_src_prepare
 }
@@ -146,7 +139,7 @@ pkg_postinst() {
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow the this guide to migrate:"
-   ewarn "http://wiki.gentoo.org/wiki/Systemd;
+   ewarn "https://wiki.gentoo.org/wiki/Systemd;
fi
 
if use openrc-force; then

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
index f50486d..1c29112 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
@@ -146,7 +146,7 @@ pkg_postinst() {
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow the this guide to migrate:"
-   ewarn "http://wiki.gentoo.org/wiki/Systemd;
+   ewarn "https://wiki.gentoo.org/wiki/Systemd;
fi
 
if use openrc-force; then

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

[Alexandre Rostovtsev]

commit: 481235c49f2f6098eedc6af2a8b1acf6153336f4
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Mon May 25 16:53:56 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Mon May 25 16:55:28 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=481235c4

gnome-base/gnome-settings-daemon: fix segfault with wacom tablet (bug #550368)

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 ...ttings-daemon-3.16.2-settings_set_display.patch | 47 ++
 ...uild = gnome-settings-daemon-3.16.2-r1.ebuild} |  3 ++
 2 files changed, 50 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
new file mode 100644
index 000..a8116b6
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.16.2-settings_set_display.patch
@@ -0,0 +1,47 @@
+From 804a75e86c8aafa46ff3c99933d1c8cd54ba7fcc Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev tetrom...@gentoo.org
+Date: Mon, 25 May 2015 12:35:13 -0400
+Subject: [PATCH] common: settings_set_display(): fix segfault when output ==
+ NULL
+
+If settings_set_display() was called with output == NULL, edid remained
+initialized to NULLs, but an array of NULLs is an illegal value for
+KEY_DISPLAY settings, which has type as.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=749844
+---
+ plugins/common/gsd-device-mapper.c | 11 +++
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/common/gsd-device-mapper.c 
b/plugins/common/gsd-device-mapper.c
+index ce70fd0..c8a1a1a 100644
+--- a/plugins/common/gsd-device-mapper.c
 b/plugins/common/gsd-device-mapper.c
+@@ -365,7 +365,8 @@ static void
+ settings_set_display (GSettings   *settings,
+ GnomeRROutput *output)
+ {
+-  gchar **prev, *edid[4] = { NULL, NULL, NULL, NULL };
++  /* KEY_DISPLAY is type as, so edid[0..2] must not be NULL */
++  gchar **prev, *edid[4] = { , , , NULL };
+   GVariant *value;
+   gsize nvalues;
+ 
+@@ -384,9 +385,11 @@ settings_set_display (GSettings   *settings,
+   g_settings_set_value (settings, KEY_DISPLAY, value);
+   }
+ 
+-  g_free (edid[0]);
+-  g_free (edid[1]);
+-  g_free (edid[2]);
++  if (output) {
++  g_free (edid[0]);
++  g_free (edid[1]);
++  g_free (edid[2]);
++  }
+   g_strfreev (prev);
+ }
+ 
+-- 
+2.4.1
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
similarity index 97%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2.ebuild
rename to 
gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
index d152d45..2836e3b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2-r1.ebuild
@@ -103,6 +103,9 @@ src_prepare() {
# Make colord and wacom optional; requires eautoreconf
epatch ${FILESDIR}/${PN}-3.16.0-optional.patch
 
+   # Fix segfault, https://bugzilla.gnome.org/show_bug.cgi?id=749844
+   epatch ${FILESDIR}/${PN}-3.16.2-settings_set_display.patch
+
epatch_user
eautoreconf
 

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

[Gilles Dartiguelongue]

commit: 47ae76d84cab34c8f2806b2beb46d3c1f48cf76f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Tue May 12 19:24:28 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue May 12 19:24:28 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=47ae76d8

gnome-base/gnome-settings-daemon: 3.16.1 → 3.16.2

 ...-settings-daemon-3.16.1.ebuild = gnome-settings-daemon-3.16.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2.ebuild
similarity index 100%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.16.2.ebuild

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

[Ole Reifschneider]

commit: 46a4b8c1a4c60b85116b718af776eb9e248620e9
Author: Ole Reifschneider tranquility AT gentoo DOT org
AuthorDate: Mon Apr 27 20:29:22 2015 +
Commit: Ole Reifschneider tranquility AT gentoo DOT org
CommitDate: Mon Apr 27 20:30:07 2015 +
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-.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-.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-.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-.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} =  ]]; 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} =  ]]; then
-   KEYWORDS=
-else
-   

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

[Gilles Dartiguelongue]

commit: 572f74fa38cd301e0107ab5f853781f405e6694d
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Mon Dec 22 23:45:34 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Mon Dec 22 23:45:34 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=572f74fa

gnome-base/gnome-settings-daemon: moved to gentoo-x86

---
 .../gnome-settings-daemon-3.14.2.ebuild| 151 -
 1 file changed, 151 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
deleted file mode 100644
index e38f9c8..000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit autotools eutils gnome2 python-r1 systemd udev virtualx
-
-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 wayland
-REQUIRED_USE=
-   smartcard? ( udev )
-   test? ( ${PYTHON_REQUIRED_USE} )
-
-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
-   =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
-   media-libs/fontconfig
-   =media-libs/lcms-2.2:2
-   media-libs/libcanberra[gtk3]
-   =media-sound/pulseaudio-2
-   =sys-power/upower-0.99:=
-   x11-libs/cairo
-   x11-libs/gdk-pixbuf:2
-   =x11-libs/libnotify-0.7.3:=
-   x11-libs/libX11
-   x11-libs/libxkbfile
-   x11-libs/libXi
-   x11-libs/libXext
-   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
-   =sci-geosciences/geocode-glib-3.10
-   =sys-auth/polkit-0.103
-
-   colord? ( =x11-misc/colord-1.0.2:= )
-   cups? ( =net-print/cups-1.4[dbus] )
-   input_devices_wacom? (
-   =dev-libs/libwacom-0.7
-   =x11-libs/pango-1.20
-   x11-drivers/xf86-input-wacom
-   virtual/libgudev:= )
-   networkmanager? ( =net-misc/networkmanager-0.9.9.1 )
-   smartcard? ( =dev-libs/nss-3.11.2 )
-   udev? ( virtual/libgudev:= )
-   wayland? ( dev-libs/wayland )
-
-# 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
-# systemd needed for power and session management, bug #464944
-RDEPEND=${COMMON_DEPEND}
-   gnome-base/dconf
-   !openrc-force? ( sys-apps/systemd )
-   =x11-themes/gnome-themes-standard-2.91
-   =x11-themes/gnome-icon-theme-2.91
-   =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
-
-# xproto-7.0.15 needed for power plugin
-DEPEND=${COMMON_DEPEND}
-   cups? ( sys-apps/sed )
-   test? (
-   ${PYTHON_DEPS}
-   dev-python/pygobject[${PYTHON_USEDEP}] )
-   dev-libs/libxml2:2
-   sys-devel/gettext
-   =dev-util/intltool-0.40
-   virtual/pkgconfig
-   x11-proto/inputproto
-   x11-proto/xf86miscproto
-   =x11-proto/xproto-7.0.15
-
-
-src_prepare() {
-   # https://bugzilla.gnome.org/show_bug.cgi?id=621836
-   # Apparently this change severely affects touchpad usability for some
-   # people, so revert it if USE=short-touchpad-timeout.
-   # Revisit if/when upstream adds a setting for customizing the timeout.
-   use short-touchpad-timeout 
-   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_user
-   eautoreconf
-
-   gnome2_src_prepare
-}
-
-src_configure() {
-   gnome2_src_configure \
-   --disable-static \
-   --enable-man \
-   $(use_enable colord color) \
-   $(use_enable cups) \
-   $(use_enable debug) \
-   $(use_enable debug more-warnings) \
-   $(use_enable networkmanager network-manager) \
-   $(use_enable smartcard smartcard-support) \
-   $(use_enable udev 

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

[Gilles Dartiguelongue]

commit: 5311eaf36cee02533d900cfd12c8bf2b3bf52245
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Nov 23 22:12:22 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Nov 23 22:27:51 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5311eaf3

gnome-base/gnome-settings-daemon: 3.14.1 → 3.14.2

---
 ...n-3.14.1.ebuild = gnome-settings-daemon-3.14.2.ebuild} | 10 --
 .../gnome-settings-daemon-.ebuild  | 14 +++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
similarity index 93%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
index c2d859f..e38f9c8 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
@@ -5,17 +5,19 @@
 EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit autotools eutils gnome2 systemd udev virtualx
+inherit autotools eutils gnome2 python-r1 systemd udev virtualx
 
 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 +udev wayland
+IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit +short-touchpad-timeout smartcard test +udev wayland
 REQUIRED_USE=
smartcard? ( udev )
+   test? ( ${PYTHON_REQUIRED_USE} )
 
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 
@@ -77,6 +79,9 @@ RDEPEND=${COMMON_DEPEND}
 # xproto-7.0.15 needed for power plugin
 DEPEND=${COMMON_DEPEND}
cups? ( sys-apps/sed )
+   test? (
+   ${PYTHON_DEPS}
+   dev-python/pygobject[${PYTHON_USEDEP}] )
dev-libs/libxml2:2
sys-devel/gettext
=dev-util/intltool-0.40
@@ -119,6 +124,7 @@ src_configure() {
 }
 
 src_test() {
+   python_export_best
Xemake check
 }
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
index 4d2af19..7482043 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-.ebuild
@@ -5,8 +5,9 @@
 EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit autotools eutils gnome2 systemd udev virtualx
+inherit autotools eutils gnome2 python-r1 systemd udev virtualx
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -16,9 +17,10 @@ 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 +udev
+IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit +short-touchpad-timeout smartcard test +udev
 REQUIRED_USE=
smartcard? ( udev )
+   test? ( ${PYTHON_REQUIRED_USE} )
 
 if [[ ${PV} =  ]]; then
KEYWORDS=
@@ -65,6 +67,7 @@ COMMON_DEPEND=
networkmanager? ( =net-misc/networkmanager-0.9.9.1 )
smartcard? ( =dev-libs/nss-3.11.2 )
udev? ( virtual/libgudev:= )
+   wayland? ( dev-libs/wayland )
 
 # 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
@@ -83,6 +86,9 @@ RDEPEND=${COMMON_DEPEND}
 # xproto-7.0.15 needed for power plugin
 DEPEND=${COMMON_DEPEND}
cups? ( sys-apps/sed )
+   test? (
+   ${PYTHON_DEPS}
+   dev-python/pygobject[${PYTHON_USEDEP}] )
dev-libs/libxml2:2
sys-devel/gettext
=dev-util/intltool-0.40
@@ -120,10 +126,12 @@ src_configure() {
$(use_enable networkmanager network-manager) \
$(use_enable smartcard smartcard-support) \
$(use_enable udev gudev) \
-   $(use_enable input_devices_wacom wacom)
+   $(use_enable input_devices_wacom wacom) \
+   $(use_enable wayland)
 }
 
 src_test() {
+   python_export_best
Xemake check
 }
 

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

[Gilles Dartiguelongue]

commit: 3ee0ca7b16498e802a098891c1819c54a15706b6
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Oct 26 16:54:04 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Oct 26 16:54:04 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ee0ca7b

gnome-base/gnome-settings-daemon: clean up metadata.xml

Keywording waiting on bug #523468

---
 gnome-base/gnome-settings-daemon/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml 
b/gnome-base/gnome-settings-daemon/metadata.xml
index f585760..ae9d0bf 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -5,14 +5,10 @@
   use
 flag name=colordSupport color management using
pkgx11-misc/colord/pkg/flag
-flag name=i18nEnable support for enhanced input methods through
-   pkgapp-i18n/ibus/pkg/flag
flag name=openrc-forceSkip systemd dependency (#480336),
enabling this flag will become your setup to be fully
unsupported by upstream and downstream Gnome team. Do 
not
try to enable it unless completely needed/flag
-flag name=packagekitEnable support for the distro-neutral package
-   manager GUI pkgapp-admin/packagekit/pkg/flag
 flag name=short-touchpad-timeoutChange the touchpad timeout so that 
it's effective for fast typists/flag
   /use

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

[Gilles Dartiguelongue]

commit: ae037dc1364170d778f7ab170d8f4214fa573249
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Wed Oct 15 22:17:21 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Wed Oct 15 22:17:21 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ae037dc1

gnome-base/gnome-settings-daemon: 3.14.0 → 3.14.1

---
 ...ngs-daemon-3.14.0.ebuild = gnome-settings-daemon-3.14.1.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
similarity index 95%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
index b4b6112..c2d859f 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
@@ -13,7 +13,7 @@ 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 +udev
+IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit +short-touchpad-timeout smartcard +udev wayland
 REQUIRED_USE=
smartcard? ( udev )
 
@@ -58,6 +58,7 @@ COMMON_DEPEND=
networkmanager? ( =net-misc/networkmanager-0.9.9.1 )
smartcard? ( =dev-libs/nss-3.11.2 )
udev? ( virtual/libgudev:= )
+   wayland? ( dev-libs/wayland )
 
 # 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
@@ -113,7 +114,8 @@ src_configure() {
$(use_enable networkmanager network-manager) \
$(use_enable smartcard smartcard-support) \
$(use_enable udev gudev) \
-   $(use_enable input_devices_wacom wacom)
+   $(use_enable input_devices_wacom wacom) \
+   $(use_enable wayland)
 }
 
 src_test() {

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

[Gilles Dartiguelongue]

commit: a4894da9617b19e48764bebd743477d2cbd9a967
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Oct 11 22:32:11 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sat Oct 11 22:32:11 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a4894da9

gnome-base/gnome-settings-daemon: 3.12.3 → 3.14.0

---
 ...= gnome-settings-daemon-3.14.0-optional.patch} | 27 --
 ebuild = gnome-settings-daemon-3.14.0.ebuild} | 25 ++--
 .../gnome-settings-daemon-.ebuild  | 25 ++--
 3 files changed, 46 insertions(+), 31 deletions(-)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
similarity index 82%
rename from 
gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
rename to 
gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
index cb117d7..a7a56b0 100644
--- 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
@@ -1,8 +1,18 @@
+From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour sobhanmohammadpo...@yahoo.fr
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac| 35 +--
+ plugins/Makefile.am |  7 ++-
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index dd95dd4..03d651c 100644
+index c42ea8b..26ccd36 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -248,7 +248,20 @@ dnl 
---
+@@ -225,7 +225,20 @@ dnl 
---
  dnl - color
  dnl 
---
  
@@ -24,7 +34,7 @@ index dd95dd4..03d651c 100644
  
  dnl 
---
  dnl - datetime
-@@ -279,15 +292,25 @@ case $host_os in
+@@ -256,15 +269,25 @@ case $host_os in
  if test $host_cpu = s390 -o $host_cpu = s390x; then
have_wacom=no
  else
@@ -56,7 +66,7 @@ index dd95dd4..03d651c 100644
  ;;
*)
 diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 04f8e2a..55ed94c 100644
+index 7bb01f0..7cc3655 100644
 --- a/plugins/Makefile.am
 +++ b/plugins/Makefile.am
 @@ -4,7 +4,6 @@ enabled_plugins =  \
@@ -67,7 +77,7 @@ index 04f8e2a..55ed94c 100644
cursor  \
datetime\
dummy   \
-@@ -21,6 +20,12 @@ enabled_plugins =   \
+@@ -22,6 +21,12 @@ enabled_plugins =   \
  
  disabled_plugins = $(NULL)
  
@@ -77,6 +87,9 @@ index 04f8e2a..55ed94c 100644
 +disabled_plugins += color
 +endif
 +
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
  else
+-- 
+2.1.2
+

diff --git 
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild 
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
similarity index 86%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
index 2d40849..b4b6112 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
@@ -6,16 +6,15 @@ EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 
-inherit autotools eutils gnome2 systemd virtualx
+inherit autotools eutils gnome2 systemd udev virtualx
 
 DESCRIPTION=Gnome Settings Daemon
 HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon;
 
 LICENSE=GPL-2+
 SLOT=0
-IUSE=+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit 
policykit +short-touchpad-timeout smartcard +udev
+IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager 
policykit +short-touchpad-timeout smartcard +udev
 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
@@ -31,7 +30,7 @@ COMMON_DEPEND=
=media-libs/lcms-2.2:2
media-libs/libcanberra[gtk3]
=media-sound/pulseaudio-2
-   =sys-power/upower-0.99
+   =sys-power/upower-0.99:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2
=x11-libs/libnotify-0.7.3:=
@@ -51,15 +50,14 @@ COMMON_DEPEND=
 
colord? ( =x11-misc/colord-1.0.2:= )
cups? ( =net-print/cups-1.4[dbus] )
-   i18n? ( =app-i18n/ibus-1.4.99 )
input_devices_wacom? (
=dev-libs/libwacom-0.7

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

[Gilles Dartiguelongue]

commit: 382387c5aa19811e6c8e14ab5f5839845974a5e8
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 14:21:45 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:25 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=382387c5

gnome-base/gnome-settings-daemon: 3.12.0 → 3.12.1

---
 ...-settings-daemon-3.12.0.ebuild = gnome-settings-daemon-3.12.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

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.1.ebuild
similarity index 100%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild

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

[Gilles Dartiguelongue]

commit: 834b4ee46d6aaefc686cd884cfee8f96c19e3e50
Author: Mike Auty ikelos AT gentoo DOT org
AuthorDate: Wed Apr 16 23:11:54 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:23 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=834b4ee4

gnome-base/gnome-settings-daemon: 3.10.2 → 3.12.0

Bump gnome-settings-daemon, updating the patch to keep wacom/colord optional.

---
 .../gnome-settings-daemon-3.12.0-optional.patch|  82 
 .../gnome-settings-daemon-3.12.0.ebuild| 141 +
 2 files changed, 223 insertions(+)

diff --git 
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
new file mode 100644
index 000..cb117d7
--- /dev/null
+++ 
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
@@ -0,0 +1,82 @@
+diff --git a/configure.ac b/configure.ac
+index dd95dd4..03d651c 100644
+--- a/configure.ac
 b/configure.ac
+@@ -248,7 +248,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
+@@ -279,15 +292,25 @@ case $host_os in
+ if test $host_cpu = s390 -o $host_cpu = s390x; then
+   have_wacom=no
+ else
++  have_wacom=no
+   if test x$enable_gudev != xno; then
+-PKG_CHECK_MODULES(LIBWACOM, [libwacom = $LIBWACOM_REQUIRED_VERSION])
+-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(LIBWACOM, [libwacom = 
$LIBWACOM_REQUIRED_VERSION])
++  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
++  AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is 
available])
++fi
++AC_SUBST(WACOM_CFLAGS)
++AC_SUBST(WACOM_LIBS)
+   else
+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+   fi
+-  AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is 
available])
+-  have_wacom=yes
+ fi
+ ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 04f8e2a..55ed94c 100644
+--- a/plugins/Makefile.am
 b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =  \
+   a11y-keyboard   \
+   a11y-settings   \
+   clipboard   \
+-  color   \
+   cursor  \
+   datetime\
+   dummy   \
+@@ -21,6 +20,12 @@ enabled_plugins =   \
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else

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
new file mode 100644
index 000..4a025bd
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.0.ebuild
@@ -0,0 +1,141 @@
+# 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 $
+
+EAPI=5
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes

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

[Gilles Dartiguelongue]

commit: ae15f14622daac438b78e2c95de31dd4c8c78702
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 14:16:35 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 15:48:24 2014 +
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-.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..000
--- 
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 sobhanmohammadpo...@yahoo.fr
-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: