gentoo resync : 04.05.2021

4 files changed, 5 insertions, 128 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 377ffc547b91..536310fdd78c 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -6,9 +6,7 @@ AUX defaults.list-r5 19379 BLAKE2B 9299c535bcb3ce6f291ba66dfe655f7e793d554f5fd7a
 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.38.0.tar.xz 481300 BLAKE2B 1adb6377f66ab64c39aa5e9ca73ebcb7fcfbfa33b5adcd4fe5900624a89a248a4255c507ec0e88baa57b20105a50d6b7e8eb6bea0be6de49295977e4aacbb662 SHA512 f49a7337b64722bc502ff3d952d8e249d2435be662c3bdfb7c7740338585c2e0b292869902be4c10faebde00998d7ead8deb82fe719a38575c6ebec2b94aa19b
-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
+DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
+EBUILD gnome-session-3.38.0-r1.ebuild 3575 BLAKE2B 79815a8eccb23615560340496c234c1e25c21100d66086dbd1ad0a69276a6cb0d182f7caf8aeeb8afcab32f690714130c74f4a5c44018a3b0ac35c300615587c SHA512 d1d76233c952b2ae39ae758a4b522f48b90cc48216f576a2cc25bf9847726d28177b7e14be36ebf33d1ef73189c3ede290272fdbb9e14756cc972240d340873d
+EBUILD gnome-session-40.1.1.ebuild 3455 BLAKE2B dba36285b78f7a581565cec8ca458219141edf1ca4aa8ab9f19153bbd92ab83b7054ae5bce38769a45538a40c991ffbc284d392ee6d9cde4bb4a12c28c1fae4b SHA512 061acb1c9d0ea5425bbf1c872878f4e914bf46e7c567314130efd8767e4226548f546a56471968a7de0275592389c7baa65202631608ed47fab06c7a7249a661
 MISC metadata.xml 348 BLAKE2B e83b29910d01f4a5cc1ddf7587189534a557805ccbc7611230526266ed88202a2ce9e612f8d78f4fb9c9a11217a2eb16e1ce9304d2038c3d2dce65364b5c67b9 SHA512 6bf5331d6f4a8c27e1d17709bb11cad46fd926fc84925c99f7e89eaa236d5b22c95702e6522f868f285b0c9f74a670a839e91b03e3126ace0449b5a5f49fdf8f
diff --git a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
index 9d0bc54583fa..1c215ccd7e5c 100644
--- a/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.38.0-r1.ebuild
@@ -63,7 +63,7 @@ PATCHES=(
 
 src_prepare() {
 	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
+	# Install USE=doc in ${PF} if enabled
 	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
 }
 
diff --git a/gnome-base/gnome-session/gnome-session-40.0.ebuild b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
index 6a5333b3fb7e..13e3613d59ef 100644
--- a/gnome-base/gnome-session/gnome-session-40.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
@@ -61,7 +61,7 @@ PATCHES=(
 
 src_prepare() {
 	xdg_src_prepare
-	# Install USE=doc in $PF if enabled
+	# Install USE=doc in ${PF} if enabled
 	sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
 }
 
diff --git a/gnome-base/gnome-session/gnome-session-40.1.ebuild b/gnome-base/gnome-session/gnome-session-40.1.ebuild
deleted file mode 100644
index 6a5333b3fb7e..000000000000
--- a/gnome-base/gnome-session/gnome-session-40.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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
-}