gentoo resync : 25.09.2019

27 files changed, 1100 insertions, 12 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index b8bb5f4bb825..c4d42c4d8b69 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index ebde64e4aa74..6ecb7633a0c1 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,5 +1,8 @@
 AUX 3.30.3-conditional-cups-tests.patch 767 BLAKE2B 7f92f98da527c96dd6c6cd236085af41a0292ad635c9c68f078eb0c9a54ada04c51d7fba805dbb0b1340b7de94f49d65d9492c942600722830719f6d551c10f2 SHA512 37481ac8ffcd2a56fb55521f179bee03007cc93ef40e74d7571be501ac4a4447099a17a41df78ae9ecf5f6f04138c31d74dfe41ecc656d870190027209a26113
 DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1
 DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
+DIST gnome-control-center-3.32.2-patchset.tar.xz 62920 BLAKE2B 0268c048317c0ef267b1606b5eb85a40bff4f59a0baa8876cf1c893b96513c51708edeeb965933d54fe345bbce3e255e889c45eef98147b32d3d1208bf049fc9 SHA512 458ea50c1e95e2e005a1dbeb3c1d1a82d3399909a1367ad827ee3c5cef14cd3ecdfe27bc17bf24d6b037e1eae00df3235a75d0154178203b177b05b8d0688e6c
+DIST gnome-control-center-3.32.2.tar.xz 5953072 BLAKE2B 98206c6c7fd8fdca8bb6ba7c1178eacaa6e3364380c6faf7b1e98c0819c440e16d35f4299d323c27db8271a161be84e4e7520a4b8b03c4d654d195b25c93cdc6 SHA512 6f69f72e15d901935bd2fba90e0a598e6c6463d4b0f914d2a9c330c77378a461c8da86f198408045c07de370d3c1558046323a4c23a97ceed96602597e167c78
 EBUILD gnome-control-center-3.30.3-r1.ebuild 5844 BLAKE2B e162b72341a314622e8be3056af5cdb1e97e56668c3d14fab822d037bd5c1c787c7815c9848655de0e47828617e3d92b607f6038d68bf0b431012e09defed956 SHA512 afdc5320664b18daa7bda2992d03190aa6ffcfcbd8cfea6910a14a45bc366e675d069f8b58831d23d1e5e48be0ddb459a71f1a200a72b5b4ca153142a6eb13a4
+EBUILD gnome-control-center-3.32.2.ebuild 5511 BLAKE2B b49a8fbd28eb99212e2b4421250fff12a8115ede86c8082872db4684394297fd4433ad81c86f886ad188c77ae48689e8d36108bc8e5bed0aae008a1592f6d22d SHA512 8b9e2e077ef321615da8faffec217bea13af6f7f7a255ab337483afd0d1709ea38df8f8dd0e1a3a07739c372d322b0a8b26306416a05a8c65545bb196d393eac
 MISC metadata.xml 588 BLAKE2B 6fb4fefc43b162c8ac2a671ed7a6878ebe19edeaf018bb37f32a0c0aa6208b8cb68392b24fde56e1aaf5227756b157fbfa10470c350bb472c270ac7436827ff3 SHA512 d2891d89abf4a64e97ab84ed45e45b4115ebb1990b2ef8a91f069433a61aea4d97d060376e088aec5e9aec7475c0263ac072f081cb5f0c3d67206ed077051e1d
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
new file mode 100644
index 000000000000..15c2542012ef
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.32.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd v4l wayland"
+REQUIRED_USE="
+	flickr? ( gnome-online-accounts )
+	^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~x86"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# >=polkit-0.114 for .policy files gettext ITS
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+COMMON_DEPEND="
+	>=gui-libs/libhandy-0.0.9:0.0=
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+	>=media-sound/pulseaudio-2.0[glib]
+	>=sys-apps/accountsservice-0.6.39
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gnome-desktop-3.27.90:3=
+	>=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
+	>=gnome-base/gsettings-desktop-schemas-3.31.0
+	dev-libs/libxml2:2
+	>=sys-auth/polkit-0.114
+	>=sys-power/upower-0.99.8:=
+	x11-libs/libX11
+	>=x11-libs/libXi-1.2
+	flickr? ( >=media-libs/grilo-0.3.0:0.3= )
+	>=x11-libs/gtk+-3.22.0:3[X,wayland=]
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	v4l? (
+		>=media-video/cheese-3.28.0 )
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	wayland? ( virtual/libgudev )
+	networkmanager? (
+		>=gnome-extra/nm-applet-1.8.0
+		>=net-misc/networkmanager-1.10.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	kerberos? ( app-crypt/mit-krb5 )
+
+	x11-libs/cairo[glib]
+	>=x11-libs/colord-gtk-0.1.24
+	net-libs/libsoup:2.4
+	media-libs/fontconfig
+	gnome-base/libgtop:2=
+	>=sys-fs/udisks-2.1.8:2
+	app-crypt/libsecret
+	media-libs/gsound
+	>=dev-libs/libpwquality-1.2.2
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${COMMON_DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( app-admin/openrc-settingsd
+		sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	>=gnome-extra/gnome-color-manager-3.1.2
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+
+	!<gnome-base/gdm-2.91.94
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	x11-base/xorg-proto
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Patches from gnome-3-32 branch on top of 3.32.2
+	# Makes some panels and dependencies optional
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		$(meson_use v4l cheese)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		-Dgrilo=$(usex flickr enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		$(meson_use networkmanager network_manager)
+		$(meson_use debug tracing)
+		$(meson_use input_devices_wacom wacom)
+		$(meson_use wayland)
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
index 913d40ff4cf0..38595270c635 100644
--- a/gnome-base/gnome-core-libs/Manifest
+++ b/gnome-base/gnome-core-libs/Manifest
@@ -1,2 +1,3 @@
 EBUILD gnome-core-libs-3.30.2.ebuild 1153 BLAKE2B 33d95d463dd035be5025a64f4cad3760b29fed14d53af7b1ce02ed4e272f4542ec7522bd0df9deec24a0ab1b0a67da270578f336b3fdd246cb53198118d4152a SHA512 cf220028cf5c89287955faa0d06d4e6592d31ef3824d85a3c3d262c2a056bd537d674ea3a260643a9d5eaf87deaa6438d0d5448d29f6cf27a4dfce6ab59ef7f2
+EBUILD gnome-core-libs-3.32.2.ebuild 1166 BLAKE2B 7c627259c1d9a44b07b9b561bbad19372c963639be937116cd2f8d3aced61df9bc9d86170e647df858e0d7f3fab58d39facc0ccbb09d28aac2f11c0c0503c222 SHA512 9ce3a671364c45aa559b6fc3c9625c9d3cc5446b57252504c2396e8699a64dffd8f62f57d8f7e1cfb360214667a11f2bc16c639161c3c41215290c83b1e1510d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
new file mode 100644
index 000000000000..5fdcc803674c
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.32.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="cups python"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME 3
+RDEPEND="
+	>=dev-libs/glib-2.60.2:2
+	>=x11-libs/gdk-pixbuf-2.38.1:2
+	>=x11-libs/pango-1.42.4
+	>=x11-libs/gtk+-3.24.8:3[cups?]
+	>=dev-libs/atk-2.32.0
+	>=gnome-base/librsvg-2.40.20
+	>=gnome-base/gnome-desktop-${PV}:3
+	>=x11-libs/startup-notification-0.12
+
+	>=gnome-base/gvfs-1.40.1
+	>=gnome-base/dconf-0.32.0
+
+	>=media-libs/gstreamer-1.14.4:1.0
+	>=media-libs/gst-plugins-base-1.14.4:1.0
+	>=media-libs/gst-plugins-good-1.14.4:1.0
+
+	python? ( >=dev-python/pygobject-3.32.1:3 )
+"
+DEPEND=""
+BDEPEND=""
+
+# >=x11-libs/libwnck-3.24.1:3 - not used by core packages anymore
+# librsvg kept back on non-rust version; should move on at some point for non-exotic arches.
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index bf546f4435b1..3879b88bff53 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,8 +1,13 @@
+AUX 3.32.2-fix-tests-without-locale.patch 2883 BLAKE2B 437a89de9d59781e0a3d6ceb46401abb8cca1d0325ace9f081b90f8e32c81ee283c3062e53a107129f00716d30e3ecc48df8be9889d7828bfcd0d4f38dc27622 SHA512 a33ed8fab6b4c0dba96250aabe56075e2f3ded3354f533e23dd9a222981d351a9900f7d3cf3427a2f24912ff78e843a5f08e9aaf94d71a16c7e81e99e08a8d81
+AUX 3.32.2-optional-introspection.patch 1376 BLAKE2B de57d769aab0cdc6a7fda25c0265f34d5d0fd555ae60a519273512021cf4f065db1e22ab72ce9004a914a47d077551b5a12ffbd5e81a9b8cf098a4762a0e461d SHA512 ea76e41aff067281497b98c86b66d8c382124ceead5b18e729342615a50b6aa3401f4d7c5553023b5d78ca0ea02823c7d6026ba9acca862804351269e4107d18
 AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b
 AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
 DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
 DIST gnome-desktop-3.30.2.3-patchset.tar.xz 3568 BLAKE2B 20d13d7e396d7cddcfb6f761815df7ce6a2d910be5e9588eac519ade536848cfc09d1aca0e4478f97177b8ee26f8049da21542d502b427973991b47c7097bbe3 SHA512 8b9eab01e79e3d67dec51ed07a086f04df1890e638a0c1696742cf5e3b6a42dccbd514fc3cfd3610791c4905346847af83e813845ad14e0b57b790fedd0ae8e0
 DIST gnome-desktop-3.30.2.3.tar.xz 1164500 BLAKE2B e78256bc3319ea9794b4666c82eb466a0c884fd43c3c776fd08aaf789905893ff93acec35a1fb6903c0049b3a169afe5b43a71ac1e93e8c63c013682c3316fa8 SHA512 36303de8fa70e65c40aeb7862156fa404b965d1724171ec5bb0a00cb1049efbfba79cdcff76278f53e4e27199f1ef9dcb574b0f465b0f4e04bb46c50d516ad0f
+DIST gnome-desktop-3.32.2-patchset.tar.xz 7404 BLAKE2B ecc821d3338957d0a123d625607d727019d9500915a76ff6d10d3000e1fc1e51fc7c0382374752582aef641d005cd73d39148466b08c53dc1ce9872e73a21215 SHA512 0471f0a6d9213ea60e867bd4f381575f6a94fa0fde57cc1a360e2d4ef98c11f2f973d3d95347db8f24aacb2249ba84ffc4e35e05bb595d9d3b6debe561ed88da
+DIST gnome-desktop-3.32.2.tar.xz 709128 BLAKE2B f0335d1ad583f0b000c47826cd4b6eb24624862b22b00e9d42759ed1cfcf3dba6f091dd85504c9c8da8b9789bf78cf53d284942ba6e2d3c630db028b4a0a69c6 SHA512 7dfa5c3e4b77637cc40e6244eb8ce8cb314cf92d865b64e36c5dffa8a699e91c81bd359f0a89a725c064eafec965d2b9d119aa05f1de103cd836a4bff9119a99
 EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
 EBUILD gnome-desktop-3.30.2.3.ebuild 2004 BLAKE2B 2fe4f1c41abf2dfd931dcdb196bb1c71d056aeef2c59d774325b79d0d5ea03e8ec9b8cc6b6983ac47cb25d4a6cff1db002fd619de5dadaca70a6baaebbd9b24c SHA512 954954c7d409a2a2fe4c97e353e4dc00431a03d213f30170b57256755c60b8159dc002559f45d022d6819ab5cf1493c0c684a66fba6819c0c6fa1011df8cfceb
+EBUILD gnome-desktop-3.32.2.ebuild 2274 BLAKE2B ada1f3497d05b955fa91890fdcc16da36231d11d7bd87412ab277047df97e1d583ded0f2f9a3108dd71a2e2d5d2ebeaa69b705dd7ea2f17e399c80452c5c8a2f SHA512 aa2c130ade269c2c4a964ef679dddde701b72865fc1612709b9c6aee27c988b63ca92d25d89f8a02c80b84d242fbfe1dc18540146b12bdccca4426a2b51f3c42
 MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
new file mode 100644
index 000000000000..bd4df1ca1a91
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/3.32.2-fix-tests-without-locale.patch
@@ -0,0 +1,82 @@
+From 9ae847ec875efe443d51d584fa6c61966c7c3c7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Wed, 4 Sep 2019 22:09:26 +0100
+Subject: [PATCH] tests/wall*: Do not fail if some of the locales is missing
+
+---
+ tests/wall-clock.c        | 14 ++++++++++++++
+ tests/wallclock-reftest.c |  5 +++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/tests/wall-clock.c b/tests/wall-clock.c
+index 4937ee66..23929ebd 100644
+--- a/tests/wall-clock.c
++++ b/tests/wall-clock.c
+@@ -48,6 +48,7 @@ test_utf8_character (const char *utf8_char,
+ 	/* In the C locale, make sure the time string is formatted with regular
+          * colons */
+ 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
++	g_assert_true (locale != (locale_t)0);
+ 	save_locale = uselocale (locale);
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+@@ -60,6 +61,10 @@ test_utf8_character (const char *utf8_char,
+ 
+ 	/* In a UTF8 locale, we want ratio characters and no colons. */
+ 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
++	if (locale == (locale_t)0) {
++		g_test_skip("en_US.utf8 locale not found, skipping");
++		return;
++	}
+ 	uselocale (locale);
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+@@ -73,6 +78,10 @@ test_utf8_character (const char *utf8_char,
+ 	/* ... and same thing with an RTL locale: should be formatted with
+          * ratio characters */
+ 	locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
++	if (locale == (locale_t)0) {
++		g_test_skip("he_IL.utf8 locale not found, skipping");
++		return;
++	}
+ 	uselocale (locale);
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+@@ -112,6 +121,10 @@ test_clock_format_setting (void)
+ 	const char *str;
+ 
+ 	locale = newlocale (LC_ALL_MASK, "en_US.utf8", (locale_t) 0);
++	if (locale == (locale_t)0) {
++		g_test_skip("en_US.utf8 locale not found, skipping");
++		return;
++	}
+ 	save_locale = uselocale (locale);
+ 
+ 	settings = g_settings_new ("org.gnome.desktop.interface");
+@@ -192,6 +205,7 @@ test_weekday_setting (void)
+ 
+ 	/* Save current locale */
+ 	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
++	g_assert_true (locale != (locale_t)0);
+ 	save_locale = uselocale (locale);
+ 	settings = g_settings_new ("org.gnome.desktop.interface");
+ 
+diff --git a/tests/wallclock-reftest.c b/tests/wallclock-reftest.c
+index 8ac630f2..0a7e812d 100644
+--- a/tests/wallclock-reftest.c
++++ b/tests/wallclock-reftest.c
+@@ -446,6 +446,11 @@ test_ui_file (GFile         *file,
+   locale = get_locale_for_file (ui_file);
+   g_assert (locale);
+   loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
++  if (loc == (locale_t)0)
++    {
++      g_test_skip("locale not found, skipping");
++      return;
++    }
+   previous_locale = uselocale (loc);
+   g_assert_true (previous_locale != (locale_t) 0);
+ 
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
new file mode 100644
index 000000000000..7471a3e6a2dc
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
@@ -0,0 +1,48 @@
+From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Sep 2019 22:28:21 +0300
+Subject: [PATCH] build: Add optionality for introspection
+
+---
+ libgnome-desktop/meson.build | 2 ++
+ meson_options.txt            | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
+index c365b448..a7355f31 100644
+--- a/libgnome-desktop/meson.build
++++ b/libgnome-desktop/meson.build
+@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency(
+   link_with: libgnome_desktop
+ )
+ 
++if get_option('introspection')
+ gnome.generate_gir(libgnome_desktop,
+   sources: introspection_sources + libgnome_desktop_headers,
+   export_packages: 'gnome-desktop-3.0',
+@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop,
+   symbol_prefix: 'gnome',
+   install: true
+ )
++endif
+ 
+ desktop_pc = pkg.generate(
+   libraries: libgnome_desktop,
+diff --git a/meson_options.txt b/meson_options.txt
+index e3402a11..7efe43ce 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,6 +17,10 @@ option('debug_tools',
+   type: 'boolean', value: true, description: 'Build debug tools'
+ )
+ 
++option('introspection',
++  type: 'boolean', value: true, description: 'Whether to build introspection files'
++)
++
+ option('udev',
+   type: 'feature', description: 'Udev support'
+ )
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
new file mode 100644
index 000000000000..c33b430ccf5a
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.32.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/17" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# cairo[X] needed for gnome-bg
+COMMON_DEPEND="
+	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
+	>=dev-libs/glib-2.53.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+	x11-misc/xkeyboard-config
+	app-text/iso-codes
+	x11-libs/libX11
+	udev? (
+		sys-apps/hwids
+		virtual/libudev:= )
+	seccomp? ( sys-libs/libseccomp )
+
+	x11-libs/cairo:=[X]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	x11-base/xorg-proto
+	virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
+
+PATCHES=(
+	# Translation updates and nvidia builtin display detection fix from origin/gnome-3-32
+	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${PV}-optional-introspection.patch # add introspection meson option
+	"${FILESDIR}"/${PV}-fix-tests-without-locale.patch # fix tests when he_IL.utf8 or other tested locales not present
+)
+
+src_prepare() {
+	# Don't build manual test programs that will never get run
+	sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgnome_distributor=Gentoo
+		-Ddate_in_gnome_version=true
+		-Ddesktop_docs=true
+		$(meson_use debug debug_tools)
+		$(meson_use introspection)
+		$(meson_feature udev)
+		$(meson_use gtk-doc gtk_doc)
+		-Dinstalled_tests=false
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 1a78fc25177a..140c8f709ab5 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,7 +1,13 @@
+AUX 3.31.91-fix-musl.patch 779 BLAKE2B 72dc9001d17dcec1a2612a19e0edb358398a36dc3bffb8b56f9dc911c3061d37c82a1c58ee94fabaa1ed97464769cce9aa36bd3d835eb557b31e7a89cadd083f SHA512 aa75b3017418d164e5f7014346b6916e618b05b7f444114859a1a914544a28f85eccaaf88e8bdd7defd7175f31e56b9cf203019d151493a2f262c4913b248775
+AUX 3.31.91-race-fix1.patch 1503 BLAKE2B cd90c630835f5e5c85ec6fc432ea10cc17aeec6bf7edbd42a6fecccc2426c4ee54135394f71d8ac8cfcd84062a465baf91dd85c29decd4e9db5c8bf39a719d8d SHA512 64ba00999370283d33f998ee6ed5f26cfaa685ea53a169a3bb0a1a28fe7229331ab388ef86fa3322deb3e454d850bb82c390686fad51cd69dc5005deac8dfb9a
+AUX 3.31.91-race-fix2.patch 3510 BLAKE2B 706a88941bb9beb46209e45cbfbf72e4f8b7a5fb0abaffe55b213dd7d86584d03c50bf317fd5e266e540a9fcf454c44468ab4c03808e15702a301ba9388083e0 SHA512 8e90901cfae13793972eb4be903995ff11bde6d78a0c72db4ecde0dcf76b44496d398cd14c60f689d7720d0356abd85b4ccc523a5b57cede3e97cba394d223d8
+AUX 3.31.91-ssh-tests-fix.patch 3854 BLAKE2B 2cf3f6fc133960f0b4e7d07b0358a3075dd8289b1960164f613ec6aef4d6807302a7424fd770b2f399add63a1d1a32539264ee8625f271f00f557c17c09626fb SHA512 29b50f3530c29b158d65dadfdbac8a45fdf06e22b0f6e8de0596aca78e4e410ca99cadf0aeb7a6b23b6d7c1df1e40ae179fe380c5a3a9d89f7425a222d1ca444
 DIST gnome-keyring-3.20.0.tar.xz 1215324 BLAKE2B 97a4663fac7d3e854a742ac2f160fda2b40c5ff9f7316b52197955aa1970732ef323252325a021469d4944e962b1f1b868d300476b854f21cc5636961e3972da SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b
 DIST gnome-keyring-3.20.1.tar.xz 1219800 BLAKE2B b0c633575ee35a733bbf04322e4413675bc40d4de256b66183138483f50c1d399a450cd4d06a3d76707948a7c541ef129a3385044f109a37677af6a7fc01e9af SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177
 DIST gnome-keyring-3.28.2.tar.xz 1322108 BLAKE2B 416697befb7670c3b854ff8d70626d495f5ba77691a062f854360e25a76766f5023e998b86114d36965023a5efefc2eb0ab1dca9aa03d73351eafebaa4920784 SHA512 a51bc9d6bc9203b86febe99bdbf893d3ba0eeaad976ece2bd49efc3869bd1d15f440a01999ce969f845f8336538de22e9f1161da990d707cbadb99d5cc3549bc
+DIST gnome-keyring-3.31.91.tar.xz 1365052 BLAKE2B fed6ac7bb5a509e268180d047cd5df1564d5a90672f5240fa98773f43d9ca7eb63c598d81c4a9de8e988ee5886679bceeb4be1c43acce876680aeb3df4385856 SHA512 c66ad13fd84764f01e75de2d6142ecb42954d6111f86738c27e7b5b94e702be2af5af7f83ba4e4b9aae58cfa04f3973e272c8177179d1f8a54f63c037aea0210
 EBUILD gnome-keyring-3.20.0.ebuild 2149 BLAKE2B b0b14027766ee97e3352465c496e5495da2ee6a60eff01ec108f0ea8e45b04212c3a9e4535392cb5a2547dc2fe4c7b03b99f4f89b8a37b3694d4cfb913c8767c SHA512 3498b100ddfc190e0994963f8f5f892948e1af570069417d2b3eb7df51ade7d5b82ec9b6e6ce617a761274baddb87d8495f8e5a438bf22f0fc88b2a7619497b5
 EBUILD gnome-keyring-3.20.1.ebuild 2150 BLAKE2B 9b7f568fea159895924f5266728f685abffcb2c0f35f19725b9fb40ff481ec099d12c036fe4903ec3233f06502fdd3120a3a05d70bfe19b8922963e3827c9a63 SHA512 bc08c5581b9aff79fd0d610e57020c6772723a6e643dea8da4ede325c6231e91e36d9756dc1c505c1a483e9fe6a2c93bb0de946147748370fbcea45650763020
 EBUILD gnome-keyring-3.28.2.ebuild 2152 BLAKE2B a9c31fab90f47193a55eeba49f87c85dcf6991a36fcc048cb55c43ff913247168f25d1d50410c31a4a568e45802a10719befed5830b20d0ace1034be60466557 SHA512 3438279a10b1bb8d3c35fe67fb97819d05bdc56ed347d4ed2dc378cfac8d072c83415880dea70dc7a2d36cb516878abe331b119f1048c54070118ae622afb7f9
+EBUILD gnome-keyring-3.31.91-r1.ebuild 2388 BLAKE2B 094cb925b0356ebd01181097b81aafc00ed4e2241e1ffa10384c6ce9ebee9aa7dc5d6fbce318c6888c3c08642037fd674225eeca723857d487ef29e4908c738d SHA512 55c5d25e7e41a4d891bcce0ef2d9bba45e298939d7b28c65b4afdad6d276a8e38994d57cc82080d78bc00013b12b7f03b83f29fa611b342adba941a14786a715
 MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch b/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch
new file mode 100644
index 000000000000..85aebcd30012
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/3.31.91-fix-musl.patch
@@ -0,0 +1,27 @@
+From 7a8b7d2ebfbb831840e6d58dbb1109f4c31d6ba4 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@src.gnome.org>
+Date: Fri, 10 May 2019 15:47:33 +0200
+Subject: [PATCH] rpc-layer: fix build with musl-libc
+
+The recent POSIX suggests to include <sys/select.h> for select().
+
+Reported by Anthony G. Basile.
+---
+ pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
+index 5024e1e1..b3fb6707 100644
+--- a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
++++ b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c
+@@ -34,6 +34,7 @@
+ 
+ #include <dlfcn.h>
+ #include <pthread.h>
++#include <sys/select.h>
+ 
+ #define SOCKET_PATH "/tmp/gkm-rpc-daemon.sock"
+ 
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch b/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch
new file mode 100644
index 000000000000..d965fd712770
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/3.31.91-race-fix1.patch
@@ -0,0 +1,37 @@
+From 8a948b3ac17f7d1b0ff31b0cf22e655054eb5c6b Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 14 May 2019 17:36:56 +0200
+Subject: [PATCH 1/2] dbus-environment: Log Setenv call failure after
+ initialization
+
+When the GNOME session is already initialized at the point that Setenv
+is called, then an error is returned. Hidding this error makes it hard
+to understand why the environment was not setup if things failed.
+---
+ daemon/dbus/gkd-dbus-environment.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c
+index 93e2b878..051de953 100644
+--- a/daemon/dbus/gkd-dbus-environment.c
++++ b/daemon/dbus/gkd-dbus-environment.c
+@@ -49,15 +49,11 @@ on_setenv_reply (GObject *source,
+ 	res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
+ 
+ 	if (error != NULL) {
+-		gchar *dbus_error;
+-		dbus_error = g_dbus_error_get_remote_error (error);
+-		if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN) ||
+-		    g_strcmp0 (dbus_error, "org.gnome.SessionManager.NotInInitialization") == 0)
++		if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
+ 			g_debug ("couldn't set environment variable in session: %s", error->message);
+ 		else
+ 			g_message ("couldn't set environment variable in session: %s", error->message);
+ 		g_error_free (error);
+-		g_free (dbus_error);
+ 	}
+ 
+ 	g_clear_pointer (&res, g_variant_unref);
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch b/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch
new file mode 100644
index 000000000000..c51ffbef44ad
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/3.31.91-race-fix2.patch
@@ -0,0 +1,104 @@
+From 5d088356a9473c06564bd2cef18ca370437a17bc Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 14 May 2019 17:42:29 +0200
+Subject: [PATCH 2/2] dbus-environment: Make Setenv request synchronuous
+
+Currently there is a potential race condition where the Setenv request
+races further session startup. i.e. the clients that are started with
+--start on login may quit before the Setenv DBus call is delivered. This
+opens a theoretical race condition where gnome-session is already past
+the initialization phase when it serves the Setenv request.
+---
+ daemon/dbus/gkd-dbus-environment.c | 62 +++++++++++++++---------------
+ 1 file changed, 30 insertions(+), 32 deletions(-)
+
+diff --git a/daemon/dbus/gkd-dbus-environment.c b/daemon/dbus/gkd-dbus-environment.c
+index 051de953..acf398b9 100644
+--- a/daemon/dbus/gkd-dbus-environment.c
++++ b/daemon/dbus/gkd-dbus-environment.c
+@@ -38,32 +38,13 @@ gkd_dbus_environment_cleanup (GDBusConnection *conn)
+ 	/* Nothing to do here */
+ }
+ 
+-static void
+-on_setenv_reply (GObject *source,
+-		 GAsyncResult *result,
+-		 gpointer user_data)
+-{
+-	GError *error = NULL;
+-	GVariant *res;
+-
+-	res = g_dbus_connection_call_finish (G_DBUS_CONNECTION (source), result, &error);
+-
+-	if (error != NULL) {
+-		if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
+-			g_debug ("couldn't set environment variable in session: %s", error->message);
+-		else
+-			g_message ("couldn't set environment variable in session: %s", error->message);
+-		g_error_free (error);
+-	}
+-
+-	g_clear_pointer (&res, g_variant_unref);
+-}
+-
+ static void
+ setenv_request (GDBusConnection *conn, const gchar *env)
+ {
+ 	const gchar *value;
+ 	gchar *name;
++	GVariant *res;
++	GError *error = NULL;
+ 
+ 	/* Find the value part of the environment variable */
+ 	value = strchr (env, '=');
+@@ -73,19 +54,36 @@ setenv_request (GDBusConnection *conn, const gchar *env)
+ 	name = g_strndup (env, value - env);
+ 	++value;
+ 
+-	g_dbus_connection_call (conn,
+-				SERVICE_SESSION_MANAGER,
+-				PATH_SESSION_MANAGER,
+-				IFACE_SESSION_MANAGER,
+-				"Setenv",
+-				g_variant_new ("(ss)",
+-					       name,
+-					       value),
+-				NULL, G_DBUS_CALL_FLAGS_NONE,
+-				-1, NULL,
+-				on_setenv_reply, NULL);
++	/* Note: This call does not neccessarily need to be a sync call. However
++	 *       under certain conditions the process will quit immediately
++	 *       after emitting the call. This ensures that we wait long enough
++	 *       for the message to be sent out (could also be done using
++	 *       g_dbus_connection_flush() in the exit handler when called with
++	 *       --start) and also ensures that gnome-session has processed the
++	 *       DBus message before possibly thinking that the startup of
++	 *       gnome-keyring has finished and continuing with forking the
++	 *       shell. */
++	res = g_dbus_connection_call_sync (conn,
++					   SERVICE_SESSION_MANAGER,
++					   PATH_SESSION_MANAGER,
++					   IFACE_SESSION_MANAGER,
++					   "Setenv",
++					   g_variant_new ("(ss)",
++							  name,
++							  value),
++					   NULL, G_DBUS_CALL_FLAGS_NONE,
++					   -1, NULL, &error);
++
++	if (error != NULL) {
++		if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_SERVICE_UNKNOWN))
++			g_debug ("couldn't set environment variable in session: %s", error->message);
++		else
++			g_message ("couldn't set environment variable in session: %s", error->message);
++		g_error_free (error);
++	}
+ 
+ 	g_free (name);
++	g_clear_pointer (&res, g_variant_unref);
+ }
+ 
+ static void
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch b/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch
new file mode 100644
index 000000000000..f5344d349fee
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/3.31.91-ssh-tests-fix.patch
@@ -0,0 +1,112 @@
+From 91bc9368ca2eedef0dec3f5aa81f641ced07a9b6 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 9 Mar 2019 17:56:55 +0000
+Subject: [PATCH] test-gkd-ssh-agent-service: Avoid race condition with server
+ thread
+
+These tests create a server thread in setup() and join it in teardown(),
+but there are various race conditions between them that can cause the
+test to hang. These are particularly reproducible when building on a
+single-CPU machine or VM, and particularly in the startup_shutdown
+test (which doesn't do anything, so it runs teardown() immediately
+after setup()).
+
+It's possible to get this preemption pattern:
+
+     ___ Main thread ___                ___ Server thread ___
+     g_thread_new()                     (starts)
+     g_cond_wait() (blocks)
+                                        ...
+                                        g_cond_signal()
+                                        (gets preempted here)
+     exit setup()
+     enter teardown()
+     g_main_loop_quit()
+                                        g_main_loop_run()
+
+which means g_main_loop_run() will never terminate, because it wasn't
+running yet when the main thread told the GMainLoop to quit, and the
+main thread won't tell it to quit again.
+
+One way to solve this would be for the server thread to signal
+test->cond from an idle callback instead of directly from
+server_thread(), to guarantee that the GMainLoop is already running.
+However, it seems easier to reason about if we avoid GMainLoop and
+iterate the main context directly.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Bug-Debian: https://bugs.debian.org/909416
+---
+ daemon/ssh-agent/test-gkd-ssh-agent-service.c | 23 +++++++++----------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/daemon/ssh-agent/test-gkd-ssh-agent-service.c b/daemon/ssh-agent/test-gkd-ssh-agent-service.c
+index 9a9ead99..5c7a6179 100644
+--- a/daemon/ssh-agent/test-gkd-ssh-agent-service.c
++++ b/daemon/ssh-agent/test-gkd-ssh-agent-service.c
+@@ -38,7 +38,8 @@ typedef struct {
+ 	EggBuffer req;
+ 	EggBuffer resp;
+ 	GkdSshAgentService *service;
+-	GMainLoop *loop;
++	GMainContext *server_thread_context;
++	volatile gint server_thread_stop;
+ 	GSocketConnection *connection;
+ 	GThread *thread;
+ 	GMutex lock;
+@@ -49,13 +50,9 @@ static gpointer
+ server_thread (gpointer data)
+ {
+ 	Test *test = data;
+-	GMainContext *context;
+ 	gboolean ret;
+ 
+-	context = g_main_context_new ();
+-	test->loop = g_main_loop_new (context, FALSE);
+-
+-	g_main_context_push_thread_default (context);
++	g_main_context_push_thread_default (test->server_thread_context);
+ 
+ 	ret = gkd_ssh_agent_service_start (test->service);
+ 	g_assert_true (ret);
+@@ -64,12 +61,10 @@ server_thread (gpointer data)
+ 	g_cond_signal (&test->cond);
+ 	g_mutex_unlock (&test->lock);
+ 
+-	g_main_loop_run (test->loop);
++	while (g_atomic_int_get (&test->server_thread_stop) == 0)
++		g_main_context_iteration (test->server_thread_context, TRUE);
+ 
+-	g_main_context_pop_thread_default (context);
+-
+-	g_main_context_unref (context);
+-	g_main_loop_unref (test->loop);
++	g_main_context_pop_thread_default (test->server_thread_context);
+ 
+ 	return NULL;
+ }
+@@ -139,6 +134,7 @@ setup (Test *test, gconstpointer unused)
+ 
+ 	g_mutex_init (&test->lock);
+ 	g_cond_init (&test->cond);
++	test->server_thread_context = g_main_context_new ();
+ 
+ 	test->thread = g_thread_new ("ssh-agent", server_thread, test);
+ 
+@@ -151,9 +147,12 @@ setup (Test *test, gconstpointer unused)
+ static void
+ teardown (Test *test, gconstpointer unused)
+ {
+-	g_main_loop_quit (test->loop);
++	g_atomic_int_set (&test->server_thread_stop, 1);
++	g_main_context_wakeup (test->server_thread_context);
+ 	g_thread_join (test->thread);
+ 
++	g_main_context_unref (test->server_thread_context);
++
+ 	g_clear_object (&test->connection);
+ 
+ 	gkd_ssh_agent_service_stop (test->service);
+-- 
+2.20.1
+
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
new file mode 100644
index 000000000000..e71fe8099eb0
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.31.91-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps pam selinux +ssh-agent test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+RDEPEND="
+	>=app-crypt/gcr-3.27.90:=[gtk]
+	>=dev-libs/glib-2.44:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-gnome )
+	>=app-crypt/gnupg-2.0.28:=
+	ssh-agent? ( net-misc/openssh )
+"
+DEPEND="${RDEPEND}
+	>=app-eselect/eselect-pinentry-0.5
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-race-fix{1,2}.patch # fix race issues on start, where sometimes keyring doesn't work after login; from origin/master
+	"${FILESDIR}"/${PV}-ssh-tests-fix.patch
+	"${FILESDIR}"/${PV}-fix-musl.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS with debug enabled
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc
+}
+
+src_test() {
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+
+	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
+		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+		ewarn " # eselect pinentry set pinentry-gnome3"
+	fi
+}
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 33df14b39d27..948c57b43766 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -5,5 +5,7 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r4 18853 BLAKE2B abf7b422bf6e0e7dc04e26416d54018f3fb04ff6b4bfe8aed122e3b918cf840e5b8df8bb68c5ebb5ffed9d95b530581e10c03f7b4454ffe23fd8993253ce2898 SHA512 1d282ab6a139f6e0f0309263ca736dc2eeca0490f25a740583a24cd4f84a21531aaa0bd916d0809844e928029a434acdb3922305ce1253241ff62938c13c4eae
 DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a
+DIST gnome-session-3.32.0.tar.xz 485916 BLAKE2B f9c36fbc56adb5c18b674be31ebfc0236f4a0e125d82fb1ddf8277d599eada2b57bbb06d9e538dc3b101d942472628fe80e10f57be1cbf326ff7acc24cd445f2 SHA512 53d5f84ba8ddbac5cfe0e4e3115c76008a3571779cad62a5fe064a409a507497a9ab93a46d6ba7ee4238ac0efb2f2c1379647855ac8058a945350c88400daf34
 EBUILD gnome-session-3.30.1-r1.ebuild 3913 BLAKE2B 273bcbe62ac444b2e2898fb3dc1c93d6456999807a6f46677b028194aa224ab181766387c3a4bbb7d5e3704429f2b328d000debdb26b45d22488b0f9e5fd72d1 SHA512 489a779174640d275ff02115d3dd0b6fddd88c5043484f679a3dd3d4d84dd3289f3419c9c7411ae1843436f425123381da8cf4f1e9927205572b44289befad12
+EBUILD gnome-session-3.32.0.ebuild 3887 BLAKE2B 25b4eee562f7253e00f76c836c6b91d5708ca5534d1aa2c4d0252beb13439b08b654a31140287cf2fc610542e216160086e97d01577eb9ca6751d8c898186377 SHA512 224a5881404312084fecc1856611a71c157c38b6a7ab6ec51aa1d17523eaf65050bc9e857403c3779593814d17193c49eea209b2fa3e9c9325d3f6e318cc9703
 MISC metadata.xml 440 BLAKE2B 83fb0d37323db0c6105b3c231b6ecb7c4344bcd40577f23581af437fb4c4c330a77d2b8b19c9c69a5b586fd4638e55a9153014c32214547bf2437da7c3a161e6 SHA512 93f57253eccec50c77ad84960af623482bb34ad7d1f00463b29ccb54c3f034b95aa1a489acbf5075aa97e37e9303c2973e126cb201c15b2785416d882810378b
diff --git a/gnome-base/gnome-session/gnome-session-3.32.0.ebuild b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
new file mode 100644
index 000000000000..7c7814e1e3cf
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-3.32.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="consolekit doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=x11-libs/gtk+-3.18.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=gnome-base/gnome-desktop-3.18:3=
+	>=dev-libs/json-glib-0.10
+	media-libs/mesa[egl,gles2,X(+)]
+	media-libs/libepoxy
+	x11-libs/libXcomposite
+
+	systemd? ( >=sys-apps/systemd-183:0= )
+	elogind? ( >=sys-auth/elogind-239.4 )
+	consolekit? ( >=dev-libs/dbus-glib-0.76 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here
+# Otherwise, things like gdm pull in gnome-shell.
+# gnome-settings-daemon is assumed to be >=3.27.90, but this is about
+# removed components, so no need to strictly require it (older just
+# won't have those daemons loaded by gnome-session).
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+# sys-apps/dbus[X] is needed for session management.
+# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
+RDEPEND="${DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.23.2
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[X]
+	consolekit? ( sys-auth/consolekit )
+
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	x11-libs/xtrans
+	virtual/pkgconfig
+	doc? ( app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.30.1-elogind-support.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Install USE=doc in $PF if enabled
+	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddeprecation_flags=false
+		$(meson_use elogind)
+		-Dsession_selector=true # gnome-custom-session
+		$(meson_use systemd)
+		$(meson_use systemd systemd_journal)
+		$(meson_use consolekit)
+		$(meson_use doc docbook)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	dodir /etc/X11/Sessions
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	insinto /usr/share/applications
+	newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
+
+	# This should be done here as discussed in bug #270852
+	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
+
+	# Set XCURSOR_THEME from current dconf setting instead of installing
+	# default cursor symlink globally and affecting other DEs (bug #543488)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
+	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
+		ewarn "If you use a custom .xinitrc for your X session,"
+		ewarn "make sure that the commands in the xinitrc.d scripts are run."
+	fi
+
+	if ! use systemd && ! use elogind && ! use consolekit; then
+		ewarn "You are building without systemd, elogind and/or consolekit support."
+		ewarn "gnome-session won't be able to correctly track and manage your session."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 895a3ae27aeb..3b93e96c016c 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -12,5 +12,5 @@ AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
 AUX gnome-vfs-2.24.4-openssl-1.1.patch 839 BLAKE2B ebb91d34946354c2995a04b6c784be9cce1c93429d9ece7ac93c93795411d3c85ee8cf5ccfdfd53f15775df496ea83dfcd75d443d524442071e5412ca85aa307 SHA512 77c00b421f7026cf2ad3a05866ab9afb8cef78da3497604823c3eab1830475ad1a0d460b80f9599f579e7e789b9ef2b3a00887f6313148698a4ec4e4c98d3345
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4217 BLAKE2B 393963131dfbbcb976a1b891672aadf06b70c10eb63ac3574290e47ecd74d17d297a25d29aa9fec2e1ab865939f94d61fd7bd8aaf31b2a98fa4d7f9512220606 SHA512 800467db92068e5e50368c5fe396fc2e9295599655f9d6cc9cb6ab3b6c861b06f2f33c7075d795dc3aa05646433f7ea1ccff9284a86a089ca708fac6f025bc0d
+EBUILD gnome-vfs-2.24.4-r5.ebuild 4222 BLAKE2B 5bd31696162085f66b239bbfedee05c4df1eb3bed2bb7c087623003a16d3752dae9f1e8d1ea242c9b77eccea1c82f4a13712da1f58ef8e1963d5940aca1b552b SHA512 32209abac28214f80b38dca58e06241a17eb13b568a3fb93a8d38e98d631cd2890a98b7be99a7b37c883f23e3a24e0f6441b6d81b973652f9208040778f1bbe7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 6d393236a8b7..8195abdc226c 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,7 +37,7 @@ RDEPEND="
 			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
 			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
 			!gnome-extra/gnome-vfs-sftp ) )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	dev-util/glib-utils
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 0dea384b9841..1d14a1867401 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -5,7 +5,7 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa
 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
 DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175
 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c
-EBUILD gvfs-1.32.2.ebuild 3811 BLAKE2B e0980669a87db9f15e07e81e281ecec55ce72aa98f924acf182fbf9aef851dc8b7566ae15b81f635fca1150da730aa17f1d20e5242e4116f08d16117cd80d174 SHA512 a7e156297e36658b14b9c76c2c78318ea135a4be914ff06f587cafe3cedd5b9c44d6e946117ad520a65551b15fba5fdfd65de2862f3d8ad10fd6f729f983ddb4
-EBUILD gvfs-1.38.3.ebuild 3769 BLAKE2B b8d9a194313ffcf85e4e4364bcc658f5c8e8874fa0c24338f0214685a7d3f4f3930220bc9764bdd06fcf5de70b1babd7e12a2d2c86247288074db30b46af41e8 SHA512 352e5b0800c192ab6e629318c2b975d2d1149e5d9613bee39812d6a7ae3213a0cf1b92397bc46c1a7b59643cc8eff197773306c8ed4ebd7c7293db37e2dff77c
-EBUILD gvfs-1.40.2.ebuild 3805 BLAKE2B 5131cb590cf6b4d104cf6856077cf471ab7903fa71fe1704cb035fe7618d41ee515cc169b1a6bfe0f3df31533cde03832282067b61a10caff8ba6ae8347f2991 SHA512 979785f4954a085afcfad90d727f9f86d4bacc02eb4789974a4fe8e20fcdfd4731cc1128a92edc5560fccd30e2a1b560594e2fa115a3e1e6a7ee5de5e97f5c5b
+EBUILD gvfs-1.32.2.ebuild 3817 BLAKE2B cc34335728255ad00d94d07c54c688c3726087f22c24cb953c9c8665b4828630b918b5979b6ae691c05f558eb7368e8719a509e4060ebf823338ced2c3c6bb46 SHA512 c4128d4025b38738492802b713e927cfc7d2084a7911a7504ad8cc115ac32c445085761ebf483abe15581c609a517d3c1ff8330d110e236e1730133dc2ea3576
+EBUILD gvfs-1.38.3.ebuild 3775 BLAKE2B 45564d0084c02f875597a1dcc12bc5f6ee9ffd09c4a0182385421dc3e1cb7858785a115e7421f3d34858bff84d174de7cf6dd40f152c1789e12d0ecd46929ec3 SHA512 b52da884bab6fb91bff321a4eac7e66be3c363c20123565ca66a48570e0974c4251ff0ee0e1cd11a67177b1f58929a678a5b496525462333e51bef0ff86d1d69
+EBUILD gvfs-1.40.2.ebuild 3810 BLAKE2B 98b641202e0456c08a74c0fa2ff62cc018de7b4985a826de103049d9ad7e13ab0237f4b4e5e3977fcf48778a214cc0ccacdee802a5ad1642bb0168206103d861 SHA512 242c531ee81bf2fc9e4a1d626586470f81f42b22e585bba2b2a550e2b21d6614144c5e8b7df6507cd44298cba279528d5a3c87e47740e99cc6f2ccc00a6c0d57
 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
index f723d5916d31..1ce70934c752 100644
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.32.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -60,7 +60,7 @@ RDEPEND="
 		>=virtual/libgudev-147:=
 		virtual/libudev:= )
 	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild
index 268370f19184..95672992cf1d 100644
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.38.3.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	http? (
 		dev-libs/libxml2:2
 		>=net-libs/libsoup-2.42.0:2.4 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
 	udev? ( >=virtual/libgudev-147:= )
 	fuse? ( >=sys-fs/fuse-2.8.0:0 )
 	udisks? ( >=sys-fs/udisks-1.97:2 )
diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild
index 5ec4eaa4d7d2..dbf07c77c2de 100644
--- a/gnome-base/gvfs/gvfs-1.40.2.ebuild
+++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.57.2:2
@@ -34,7 +34,7 @@ RDEPEND="
 	http? (
 		dev-libs/libxml2:2
 		>=net-libs/libsoup-2.58.0:2.4 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
 	udev? ( >=virtual/libgudev-147:= )
 	fuse? ( >=sys-fs/fuse-2.8.0:0 )
 	udisks? ( >=sys-fs/udisks-1.97:2 )
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index f55e6a7fc394..7514b0942166 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -3,6 +3,9 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e89404
 AUX 3.30.5-seccomp-sparc32.patch 675 BLAKE2B e8d9d9c4299cd700ea02656bf66f1ddec1801901161f026f78b88cc393793392c0e0af97a8de47a851545b5cd6305160233b952c1a0ba86ccc1d1f7dadf1dea0 SHA512 fe91a78d17a9142b8964d6d52778b32ac0b88e85dc0b1b05b838a1d90396f7c73927f9dce63ebe8585f8d1cdf94ebdc6a123b58196dc1248ce5aa6dce5d73990
 AUX 3.30.5-thumbnailer-updates.patch 3978 BLAKE2B 0c7c7147d5bf947617f32d6f1ec1949941f5f9cf77dd351ddeb3c41871e247eac10855b3075f81f4d3dfe0f692f76e25590d5db5d4823ec4d264b6a65ee3177e SHA512 2a14f9256c3ff5d2744038ede78fafdd27b033ee6576885faab35aff77b60c69035e3aa1400c183f9f0497b0bbb8890e3be6dfae5fa3a77df180601c185939d7
 AUX 3.30.5-thumbnailer-updates2.patch 1841 BLAKE2B 261cabfc7ee8334bbf00b469a601ba61f2ff78f3a4ed6fb860b7854c4198963769df5673cb5cdf2753fbfeeb540aa31f7fd29deda0431075747860068b468dff SHA512 44011606a10bb6d8f45cbc2b20b802ea347d930c44959de33bc0f395dd050e01884ec1b6a85b899b1b30aa6fde07fff8d6ff4dcb4d1a7fe86d27a9721668e8ab
+AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a
 DIST nautilus-3.30.5.tar.xz 3254344 BLAKE2B 64da158ee661fc259a14f890bf6ad343f720245df6b9475ff047993570ea4e7234723eb242f057bc85b7ea95d38a99b5c2f5d546e982a3e3e32b7fc75cabb786 SHA512 e38a8bb380460d902e4ec6219d0e147a4245e790b18fb18ab9474ec2ae002a971243c6b09b8fec267e65c7ecc7bb1217191c4f5cb9547b3b9d5b0793068103cf
+DIST nautilus-3.32.3.tar.xz 3197820 BLAKE2B 28140210a855fe62faba4f0833067a81c4d8f71c0cc870ba4fdcc016754b01df003e45f636836f67cced8515aba8c8fb7922de788a14bfe0f0cc4518010aed5f SHA512 f19710f02bd91edb2d2f6cb8f46be6bebea3edfed14a07612444d5990533bafd032b604d65533727eb377b574d6bd4c82dbe11894d85ad254ee1473b683c4392
 EBUILD nautilus-3.30.5-r1.ebuild 2822 BLAKE2B 6b115495fb078e7eee306575f3a177fad9dee08b898e28980319656d8dd6624e568042ecca60ba164e474eb71fbe24834797460edaaf2ddfaea6d3ec608d195e SHA512 4c3a802cfa10e8315ecd854dc64f7a2bde19c3e2a3a196ff670aa01a40de83abca7ab27c98bae8898343316333192920f3f12450d267e9d38e04b77e1aa2f0e5
-MISC metadata.xml 577 BLAKE2B 16a9d9904b6a1cb02d844b3a90cd87e4398024a16d4cef1a5106190a06b6d60058db172d1ae1ae0b424c3a2c864dfacbedaca696e847f88a1a5ae300a2cb04b7 SHA512 c42d9a07ac2a05a5da2c6c10c49c3810ed3409ac00d5d7e744d15232fb62ec0f84d2ebcb36c5a819a476ae922900d1d8270101b26a766e85c35d3fa2d6531747
+EBUILD nautilus-3.32.3.ebuild 2965 BLAKE2B f0ae2d8d8df70b9e5c7d70027c6b1340ea518f77c3d8625ed9240255a11bd3ccb9ef2e83fbe006b83f2e71d1d26714d8d5dc79314594c1e2a7e33bdd07b3005d SHA512 23ee9d7623c6121e4ec67b8a9db0da41ccb7fca90fd62f76a3012115499c2585c99334d1631f9dce1d150abd1585da203c7d8cc398601fbf48423070e3bcffe3
+MISC metadata.xml 652 BLAKE2B e4161f58861954981a6837a9b6c7f6dd0b76dc84378ce2d9caea1375973d490751ce966753829b7b972a6c75d04519820f4cde8b6d4edc3b9a9abb7477c68a90 SHA512 a1906e74bd47437d2226ffb977f3f3d8c981a32f8d54d0f9e0156932b001b6e205b0e5b78ed5badb0b89c1ed1ff107f67e026bf5c4b088cfe95e2b69de8c6981
diff --git a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch
new file mode 100644
index 000000000000..f28e9575d783
--- /dev/null
+++ b/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch
@@ -0,0 +1,57 @@
+From f2d55bc9a9398ed1c36e1b856bcb33080abbf7c0 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 19 Sep 2019 22:26:08 +0300
+Subject: [PATCH] build: Optional gstreamer
+
+---
+ extensions/meson.build | 4 +++-
+ meson.build            | 2 ++
+ meson_options.txt      | 6 ++++++
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/extensions/meson.build b/extensions/meson.build
+index 5c6f64cef..bd8c41d3e 100644
+--- a/extensions/meson.build
++++ b/extensions/meson.build
+@@ -1,3 +1,5 @@
+ subdir('image-properties')
+-subdir('audio-video-properties')
++if get_option('gstreamer')
++  subdir('audio-video-properties')
++endif
+ subdir('sendto')
+diff --git a/meson.build b/meson.build
+index 0a267d670..ccb2b8cc1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -122,8 +122,10 @@ libm = cc.find_library('m')
+ 
+ if get_option('extensions')
+   gexiv = dependency('gexiv2', version: '>= 0.10.0')
++ if get_option('gstreamer')
+   gst_tag_dep = dependency('gstreamer-tag-1.0')
+   gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
++ endif
+ endif
+ gio = dependency('gio-2.0', version: glib_ver)
+ gio_unix = dependency('gio-unix-2.0', version: glib_ver)
+diff --git a/meson_options.txt b/meson_options.txt
+index fce5f16f9..1fa8f8952 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,6 +13,12 @@ option(
+   value: true,
+   description: 'Build stock extensions',
+ )
++option(
++  'gstreamer',
++  type: 'boolean',
++  value: true,
++  description: 'Build audio-video properties extension (requires "extensions")',
++)
+ option(
+   'introspection',
+   type: 'boolean',
+-- 
+2.20.1
+
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index c5117d64948b..6d7557c2caa1 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
+	<flag name="gstreamer">Enable the Audio/Video file properties page</flag>
 	<flag name="packagekit">Use packagekit to search for programs to open
 		unknown file types</flag>
 	<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
diff --git a/gnome-base/nautilus/nautilus-3.32.3.ebuild b/gnome-base/nautilus/nautilus-3.32.3.ebuild
new file mode 100644
index 000000000000..b73d0c915cca
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.32.3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection packagekit +previewer seccomp selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.58.1:2
+	>=media-libs/gexiv2-0.10.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.2.1
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	seccomp? ( sys-libs/libseccomp )
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-2.0:=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	seccomp? ( >=sys-apps/bubblewrap-0.3.1 )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+	gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
+"
+DEPEND="${COMMON_DEPEND}
+	media-libs/fontconfig
+"
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/${PV}-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		$(meson_use packagekit)
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}