From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1048801-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2F4B4138334
	for <garchives@archives.gentoo.org>; Tue, 25 Sep 2018 17:51:12 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DD3BFE096D;
	Tue, 25 Sep 2018 17:51:09 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 9F099E096D
	for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 17:51:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 97CF6335C38
	for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 17:51:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D34653CB
	for <gentoo-commits@lists.gentoo.org>; Tue, 25 Sep 2018 17:51:05 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1537897848.132fa488b79248c227fa7146519e751f2e814999.leio@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild
X-VCS-Directories: gnome-base/gnome-settings-daemon/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: 132fa488b79248c227fa7146519e751f2e814999
X-VCS-Branch: master
Date: Tue, 25 Sep 2018 17:51:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1a34fe64-dbae-48f4-94e1-f09b55ed5ab8
X-Archives-Hash: c0fc4c331528138c77a186d5203477bd

commit:     132fa488b79248c227fa7146519e751f2e814999
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 17:50:48 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 17:50:48 2018 +0000
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 00000000..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 )
+	!<gnome-base/gnome-session-3.25.4
+"
+DEPEND="${COMMON_DEPEND}
+	cups? ( sys-apps/sed )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
+		gnome-base/gnome-session )
+	dev-libs/libxml2:2
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf
+	# Make colord and wacom optional; requires eautoreconf
+	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+	# Fix build system to require gudev with wayland, bug #627966; requires eautoreconf
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d \
+		$(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 gudev) \
+		$(use_enable input_devices_wacom wacom) \
+		$(use_enable wayland)
+}
+
+src_test() {
+	virtx emake check
+}
+
+pkg_postinst() {
+	gnome2_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 "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
+}