gentoo resync : 28.04.2021

5 files changed, 192 insertions, 16 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index a3de66aed9ea..377ffc547b91 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -3,10 +3,12 @@ AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5b
 AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a5df5e8db665e43372f8c08a5ea8480e63e318befc5b2e56e4b027ca873947972aa2b19d14ba85f0ec3e SHA512 edee1126e11c3b49ebcea1e1a6929d55a28d09b6c382666d6d6a32271a4cf22af23927f7a5e15ecbd4a4cdaa41ac2f1ffc09350f4e48257e2e5e29ade08635ac
+AUX gnome-session-3.38.0-exit-conflict-systemd247.patch 2229 BLAKE2B aeac31dd5d50d2e8eac6fe2bdcbabe82eb90f0a16f396da5ec45466f519fe3b565bebbcb818a0b41607df9ce6ecb46bd637c8ee9e72ba9d28fd315189820f31e SHA512 36e9640be8c04e9442609da36696895efec57a073792622eac7ded8c463e622b932d8693130f19491b4649cdc333d7d269c8732ebb12702ab2b574bc0dc6cc43
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
-DIST gnome-session-3.36.0-patchset.tar.xz 22624 BLAKE2B 33518973a5e7c810b9aef165bcd62d41641908fa329dcefc784073966514aad5aa8919037722043c6cb0ddca86b4c2444b614d773aa777d737d49fdb3acad8e5 SHA512 c80ae41bcaa876ebb2c2d2a47d7bbcb58a3fe417ce0727e1aa3f384c4ae848bd3f1e27bd706af478f8e93c921efef578085d2c999efd06fd8d7c8704e170a56a
-DIST gnome-session-3.36.0.tar.xz 475492 BLAKE2B b539c4646b746198aceba65708f758fc875614d342b66f8b12643a7235dcc043b78d7e2502ca9f45159f5b4080528ff8b92c98b67acb77fe7f71386ec282b773 SHA512 234456e8617524a3b95afb505246823ced4eca3ca009d48fc0bde70f8c620814495b04509c134bfb72760619990cc7cb7363ba13f0d90d9f038e8a43eadb6e9d
 DIST gnome-session-3.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
-EBUILD gnome-session-3.36.0-r1.ebuild 3641 BLAKE2B 71a516e956cf90e844d5d2c110c228c5354cee59738e0971e3a141e9c17433a7f4d43fcc7fe697b1a62e3106fa40e350e0a2e7bd546f5bef535f200bfeafb071 SHA512 776ecba1621b824625a2644ca757b844bfbb49c744c757906d33e9c160fb2cbd379d8c9c0b6c3a387fc1cdd0e76ec14637fe182996e97b87133f838ba5364d3e
-EBUILD gnome-session-3.38.0.ebuild 3444 BLAKE2B be1626829a5a8273a0aef4f1bd0b6b5582aec37519e6ca34976e6ae43627ef44bd5c1e4637516b69e86ae54d2089a53d990d2e892c99a44a660dadde4bf69333 SHA512 73e084d047f0f46f1207431e4e2fda9ab2d082f1e73de555e640be34df488d7176ef26c44541d6f3dfa2b89b00bf8fb73b6553689a502ad8ee002b6412016492
+DIST gnome-session-40.0.tar.xz 481996 BLAKE2B b59e08c5b49321a44b1dd012051ec4bfdcecbbdc9c84b65c703131fb01634d69b303b26c29517afcb516eb60cbd2c4e9c3715a1a584c904463150ed428b4d600 SHA512 121fdf5dcc2b5a9e87b8119f6e217dea9db53fdaee1144f74dbdf2ef8856114e983cac32871214ecde08bbfc8212b3535ffd584c07a24cc648bc4db142b60de4
+DIST gnome-session-40.1.tar.xz 482424 BLAKE2B 7ce5b5d50900a23880e92d3a0d24fbc80532b9894e03c613137526da6bd0f7f3c86a0d66484177279612782a97f3ead5f10709d9625cff6c04bdfb12fe6725a2 SHA512 2f39eea8e1cc41c543ac5c068dca1c8b7b0add244c6c223ed1205b186c785d353d3cc9d380fc4061893531413017755907050f660de17ea1f9289d6c3ed9df2f
+EBUILD gnome-session-3.38.0-r1.ebuild 3573 BLAKE2B be9446b680df5882d9ebea8b4bac48c004a71a06548abfd9bb8d837d61851c7d47196d9d3d9e4cb6fd8f9c86e1f736617f3fc9916d447df12b7cea95337c3d26 SHA512 e711397b4230b3b03125d521362e63e067433ba15ef2e0b240fa781a2e7924d2241cb9e7762f77369fe5eae0d8960337cad44017a6609d19f9d39e27dbf3dd1b
+EBUILD gnome-session-40.0.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
+EBUILD gnome-session-40.1.ebuild 3453 BLAKE2B b0f35aa307fa0517d87bf001e2d61c8cdde78ebd779310e3cb0ff138f3707106860d240c93541fc62041717e5e7f833a198da1a6e6563ea116c4169c674c0581 SHA512 be5ca9beaa306b62e624982a067f8a57448090473acb825b1026b360ac89cf831b20a55283a331730b086807bddb82c5bf4febd5e61aa9a8c1455e78caa8034f
 MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
new file mode 100644
index 000000000000..a4a99640f374
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.38.0-exit-conflict-systemd247.patch
@@ -0,0 +1,56 @@
+From 9de6e40f12e8878f524f8d429d85724c156a0517 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Thu, 3 Dec 2020 13:45:36 +0100
+Subject: [PATCH] data: Fix indirect conflict with exit.target via app.slice
+
+systemd v247 now puts services into app.slice by default. But app.slice
+will have a conflict with exit.target, which in turn means that we still
+get a conflict with exit.target indirectly.
+
+Fix it by adding the appropriate Slice=-.slice into
+gnome-session-restart-dbus.service. Also update the note in
+gnome-session-shutdown.service to point out the requirements.
+
+Closes: #74
+---
+ data/gnome-session-restart-dbus.service.in | 5 +++--
+ data/gnome-session-shutdown.target         | 5 +++--
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/data/gnome-session-restart-dbus.service.in b/data/gnome-session-restart-dbus.service.in
+index e90f6bc8..6389c321 100644
+--- a/data/gnome-session-restart-dbus.service.in
++++ b/data/gnome-session-restart-dbus.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=Restart DBus after GNOME Session shutdown
+ 
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# Also put it into a slice that doesn't have such implicit dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# For this to work, we also need to be in the root slice.
+ DefaultDependencies=no
+ 
+ [Service]
+ Type=notify
+ ExecStart=@libexecdir@/gnome-session-ctl --restart-dbus
++Slice=-.slice
+diff --git a/data/gnome-session-shutdown.target b/data/gnome-session-shutdown.target
+index 607dc6e7..2c3d1963 100644
+--- a/data/gnome-session-shutdown.target
++++ b/data/gnome-session-shutdown.target
+@@ -1,8 +1,9 @@
+ [Unit]
+ Description=Shutdown running GNOME Session
+ 
+-# Allow exit.target to start even if this unit is started with replace-irreversibly
+-# The same is needed for all (weak) dependencies
++# Allow exit.target to start even if this unit is started with replace-irreversibly.
++# All (weak) dependencies need to do the same. Services also need to ensure they
++# are in the root slice by setting Slice=-.slice.
+ DefaultDependencies=no
+ 
+ Conflicts=graphical-session.target graphical-session-pre.target
+-- 
+GitLab
+
diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
index 65e9940099b1..9d0bc54583fa 100644
--- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+inherit desktop gnome.org gnome2-utils meson xdg
 
 DESCRIPTION="Gnome session manager"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,7 +16,7 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/glib-2.46.0:2
-	>=x11-libs/gtk+-3.18.0:3
+	>=x11-libs/gtk+-3.22.0:3
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -27,7 +26,7 @@ DEPEND="
 	media-libs/libepoxy
 	x11-libs/libXcomposite
 
-	systemd? ( >=sys-apps/systemd-183:0= )
+	systemd? ( >=sys-apps/systemd-242:0= )
 	elogind? ( >=sys-auth/elogind-239.4 )
 "
 
@@ -57,8 +56,9 @@ BDEPEND="
 "
 
 PATCHES=(
-	# Various patches from master (no 3-36 branch yet) + elogind support
-	"${WORKDIR}"/patches/
+	"${FILESDIR}"/${P}-meson-Support-elogind.patch
+	# Fix indirect conflict with exit.target via app.slice (from 'master')
+	"${FILESDIR}"/${PN}-3.38.0-exit-conflict-systemd247.patch
 )
 
 src_prepare() {
@@ -85,14 +85,11 @@ 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-r5" gnome-mimeapps.list
+	newmenu "${FILESDIR}/defaults.list-r5" 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
 
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0.ebuild b/gnome-base/gnome-session/gnome-session-40.0.ebuild
index 451436341742..6a5333b3fb7e 100644
--- a/gnome-base/gnome-session/gnome-session-3.38.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
@@ -56,7 +56,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-meson-Support-elogind.patch
+	"${FILESDIR}"/${PN}-3.38.0-meson-Support-elogind.patch
 )
 
 src_prepare() {
diff --git a/gnome-base/gnome-session/gnome-session-40.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.ebuild
new file mode 100644
index 000000000000..6a5333b3fb7e
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-40.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop 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 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc elogind systemd"
+# There is a null backend available, thus ?? not ^^
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/glib-2.46.0:2
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=gnome-base/gnome-desktop-3.34.2:3=
+	>=dev-libs/json-glib-0.10
+	media-libs/mesa[egl,gles2,X(+)]
+	media-libs/libepoxy
+	x11-libs/libXcomposite
+
+	systemd? ( >=sys-apps/systemd-242:0= )
+	elogind? ( >=sys-auth/elogind-239.4 )
+"
+
+# Pure-runtime deps from the session files should *NOT* be added here.
+# >=gnome-settings-daemon-3.35.91 for UsbProtection required component.
+# 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.35.91
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[X]
+
+	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}"/${PN}-3.38.0-meson-Support-elogind.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)
+		-Dsystemd_session=$(usex systemd default disable)
+		$(meson_use systemd systemd_journal)
+		$(meson_use doc docbook)
+		-Dconsolekit=false
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+
+	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; then
+		ewarn "You are building without systemd or elogind support."
+		ewarn "gnome-session won't be able to correctly track and manage your session."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}