gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 138 insertions, 0 deletions

diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 30054e68b998..2dedd5581dd5 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -4,6 +4,9 @@ AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81
 AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
 AUX defaults.list-r6 18459 BLAKE2B e219daae31ffebc4301baf21cca9842ff1e9842af302bac4d4cf34cc3b9e9ffba4ca95992cdbb9e47c3f071e4d354f1e8b3801af53fc35d52f994a3a04bb62b1 SHA512 a0cd5f879c2ec16251ea92923470481d87531e3065e8582345dc317a2b20a5dce11ac87810e56eb097090f2c0bd718b0e10a1b9ba309fdf7c91697ed243b9d6b
 AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118edc4c53570acc5e56d59e3073caae7941c54b11c59208675eaa148eb03d437d0edfa0f0d024880b77bc60ba65140422f25319ac132299dfe972 SHA512 2a57894b95662ca4488f95110943076a82ecbe7f3bb8ed4d95e2c8082276839f4b1a7ecc20915557378e73e1947df856e4ff57d9d5b9ae32a9673f2cc3b2fbc2
+AUX gnome-session-46.0-meson-Support-elogind.patch 658 BLAKE2B f93613aabe85c377107978fa0d69bc0602907134ed9cd229304088ca804f9c61798487ff59bc57a19070501ef3f72169b85ba7124339e4b0f2ed8bf6d41e6ae6 SHA512 40a28843efb1eae8127eb468b6c59bad0d3456dc2d4d56b0bce5825b032cccb816210f127002b1832e36013fbcb70dbbe98e7f9b98b88082e33e77ed4f14496f
 DIST gnome-session-45.0.tar.xz 485992 BLAKE2B 473f0b3d94ffa8c1e2bf45884d053c753e5d5ad791b7cd9f889ce7952a273c4631c9867f038edaa6fe8e6ce16b9659c479755ce8028076016a658ad23291eeb7 SHA512 3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba
+DIST gnome-session-46.0.tar.xz 484368 BLAKE2B 9519530abd84957df9b936706647f1b60ed660efa095602ad67e5f84a5047653ed711a73eaa272424c06c8080a46c86aebf9e3fa5bda8c9b09f291b2ca6bda20 SHA512 2187b8ae4ac4ec728283c5dc03edba6472864a704f6c6cd7a3e962515a3925d3a8438f7f89855dd082d2c013868da81e16da280c70b0e07537c8e431301b4bd8
 EBUILD gnome-session-45.0-r1.ebuild 3564 BLAKE2B 4c99f38b0a90a2686afb5c41a067a3b95ec16735d08d0a3986a7da78b4a9409a235932801b0236c8ac2d43aee64e8f82c035587a0fb960253412910da90ffde6 SHA512 b5007cf00934286ce7a77b970d8326e85612879faf02e51e11784fb4f2ee5d905b05ce4153efa75f5eb30a1fcf3f4a887131f216f05f3401464b5ad809dfdb25
+EBUILD gnome-session-46.0-r1.ebuild 3176 BLAKE2B 52908de2da76c258966b4941c2f177cdc899fed4336400c913bd9223ea87f5e00ff351398cf0c1eefcb006d19b2b9eed1564765f0d16d3301186a08d12580a6e SHA512 325299e433b533f82d2d3047bf1b9be01ba3701eb56f57501ceb4db74d7e93a9cfe5e15c7bf313d03acc74f11ce971c92bca890b56c7290c799e13a54f71840f
 MISC metadata.xml 460 BLAKE2B a735510be82f9e08b4002cbf033f75e601ec6f35a860c92728439367e6bdedf747c4fccc0250c89d231aa8e96348ae01275f577a21c958985cdaf0ef47615216 SHA512 df3adfa8e27c264a9bb6ba74ca43345a15f1cb0984461ea1fb831d4b355c77dfa94d491fdf28b34d58fd1d9e60428cfa8c40af2402bb9be42292202b63e7a052
diff --git a/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch b/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch
new file mode 100644
index 000000000000..ac96d521b8f4
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch
@@ -0,0 +1,18 @@
+--- a/meson.build	2024-07-29 16:43:01.812864903 +0200
++++ b/meson.build	2024-07-29 16:54:16.654741387 +0200
+@@ -113,8 +113,13 @@
+                                                  pkgconfig_define: ['prefix', session_prefix])
+ endif
+ 
+-libsystemd_dep = dependency('libsystemd', version: '>= 209', required: true)
+-session_bin_deps += libsystemd_dep
++libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
++if libsystemd_dep.found()
++  session_bin_deps += libsystemd_dep
++else
++  elogind_dep = dependency('libelogind', version: '>=209', required: true)
++  session_bin_deps += elogind_dep
++endif
+ 
+ configure_file(
+   output: 'config.h',
diff --git a/gnome-base/gnome-session/gnome-session-46.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-46.0-r1.ebuild
new file mode 100644
index 000000000000..17cf22e35c43
--- /dev/null
+++ b/gnome-base/gnome-session/gnome-session-46.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit desktop gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Gnome session manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc elogind systemd"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+COMMON_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/libglvnd[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="${COMMON_DEPEND}
+	>=gnome-base/gnome-settings-daemon-3.35.91
+	>=gnome-base/gsettings-desktop-schemas-0.1.7
+	sys-apps/dbus[elogind=,systemd=,X]
+
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+"
+DEPEND="${COMMON_DEPEND}
+	x11-libs/xtrans
+"
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-Support-elogind.patch
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# 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
+		-Dsession_selector=true # gnome-custom-session
+		$(meson_use doc docbook)
+		-Dman=true
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}/Gnome"
+
+	newmenu "${FILESDIR}/defaults.list-r6" 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
+}
+
+pkg_postrm() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}