gentoo auto-resync : 10:03:2024 - 00:44:50

2 files changed, 20 insertions, 14 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 600ea860476b..e5bb64385ba0 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,6 +1,6 @@
 AUX 40.0-defaults.patch 1412 BLAKE2B e36f7215cf756586479b8bdc71339beb3bbde53ca9745ddc4ef1c3feb59c720e4920e8aa4aadd7912874c386e7495a4b5d554e0d0616db17a81c4ec52a2baa6b SHA512 d82cf1e329d5974755738e29e6366bb10452620021a5db6c2ec63c4ee38e87a65dada34d57026e9510dbffa78c7060ae6f2ccec1739e3026bb0c67dab95f94a9
-DIST gnome-shell-44.4.tar.xz 1998208 BLAKE2B 951daccd448a353bde0503585393c1e8c870aa3bd86149639d7c85744c4eebfe0c44488bdb0012883ae17e428e895268a0a687c6901c5797f58dfa87ff26779f SHA512 03a29a7e662a93388981f4ae7186e135ce3e687c99318a8a27ba898fcd43114a27b5351227958ce17b239bde88442d9058c64bea2c6b027cc4f6ff2e194777d5
 DIST gnome-shell-45.2.tar.xz 2017124 BLAKE2B b1ee0ecb7babadad1b9abed3c9bb2fda4c47e5bff080cfd92db35530b211449a9e3c8db0f63ccf87ae9df05337b9a69546b880c71d7a4a1fca08b773490bbce1 SHA512 d88cb7e385f69416863a5b1299fdd18f228a6f951ee084e0ae79ed668c856e50f19c537d7b40eaf93b9166fa5ef7797b9babc3b8d4f80941e15d53d862734aec
-EBUILD gnome-shell-44.4.ebuild 6423 BLAKE2B 381618ba2527870df497e99cdf8bcd50be4ad8ad05151fbf6aa25d864054d49c5a56aa37e17b87e76e036081cd68d656d5d58cbfcc883bf960f3bce112811cc0 SHA512 7c206e89bf7417b4d045b70b5d1d99fa065db68a46d3e0bbd02edc47d0332df66d3c6a08888440b7c03a00ef022495c5472a62c8e48ec3b6744e306e97d94a85
+DIST gnome-shell-45.4.tar.xz 2016708 BLAKE2B 1bbc4bc0d5652a3c9332a2f072437919c2cdb3fdf546913d00b65d5806bd7c7f7d7e8f0886fba1b8a6a776598b358882f6285c55f68ec217eb5ac378b73580a3 SHA512 127031302c4f606353292ab2ca2ab7b4c1000eba11bccd30cefb6a0c4a316aac1203d021d713716ad6036e4519700001d564545978f83b1e24668b166dcd66ba
 EBUILD gnome-shell-45.2.ebuild 6622 BLAKE2B 873d703c22fa68390f381c29c86cbc87677b76ef52521e108fb41abf4bd084e19d548734469dcd39f23d6e7a7d3245cd83efa05702ca514994e581bd79a3433e SHA512 e4d05f4d3fdecb80aef9b0de8c080b880ee5bb470681ba52d4400de14dd585ffa5b839b0f585dfe8de452d8801f7b6899e4ee0f155d38913b069c3b235f1a23b
+EBUILD gnome-shell-45.4.ebuild 6625 BLAKE2B b16115afe5ffe2e1640f13d974766e7101b8853622f77b1347676edd7c32d6610a0532b0b71fbbcf005c0ea3ec4bd519152555aafaab17a8afe66fb99be63119 SHA512 a2a1eff30bda467692758622d6cdce2ddabafec704de82d4f645c97d9c49043218ccca08486bf96e4606717859156d1b8ade02542f70e1ad3cd3c27dbe3a34e2
 MISC metadata.xml 1032 BLAKE2B 2089aace6c8db78bc28c445d9eac949fcea533a9abc26b05430d5e4a11a7bd57ffd00cb8b2edefdd3aa0c0f46e56e573e8f2f544b9e205685877fba957a29de0 SHA512 44e5d05ff803a3fdffe9ad9942da3197150da07e6097f0f92ab9f6b8209b6337149da0a4c535950c879e3184615b2d68a866c1a34d7f2ecdb69810dd5ba0fbd9
diff --git a/gnome-base/gnome-shell/gnome-shell-44.4.ebuild b/gnome-base/gnome-shell/gnome-shell-45.4.ebuild
index ad7b7a778316..92b6670d0970 100644
--- a/gnome-base/gnome-shell/gnome-shell-44.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-45.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GN
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-IUSE="elogind gtk-doc +ibus +networkmanager systemd test"
+IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 RESTRICT="!test? ( test )"
@@ -25,21 +25,21 @@ DEPEND="
 	>=dev-libs/glib-2.68:2
 	>=dev-libs/gobject-introspection-1.49.1:=
 	>=dev-libs/gjs-1.73.1[cairo]
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=x11-wm/mutter-44.0:0/12[introspection,test?]
+	>=gui-libs/gtk-4:4[introspection]
+	>=x11-wm/mutter-45.0:0/13[introspection,test?]
 	>=sys-auth/polkit-0.120_p20220509[introspection]
 	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
 	>=x11-libs/startup-notification-0.11
 	>=app-i18n/ibus-1.5.19
-	>=gnome-base/gnome-desktop-40.0:4
+	>=gnome-base/gnome-desktop-40.0:4=
 	networkmanager? (
 		>=net-misc/networkmanager-1.10.4[introspection]
 		net-libs/libnma[introspection]
 		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib
 	)
+	pipewire? ( >=media-video/pipewire-0.3.49:= )
 	systemd? (
-		>=sys-apps/systemd-242:=
+		>=sys-apps/systemd-246:=
 		>=gnome-base/gnome-desktop-3.34.2:3=[systemd]
 	)
 	elogind? ( >=sys-auth/elogind-237 )
@@ -85,12 +85,13 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=sys-apps/accountsservice-0.6.14[introspection]
 	app-accessibility/at-spi2-core:2[introspection]
-	app-misc/geoclue[introspection]
+	app-misc/geoclue:2.0[introspection]
 	media-libs/graphene[introspection]
 	x11-libs/pango[introspection]
 	net-libs/libsoup:3.0[introspection]
 	>=sys-power/upower-0.99:=[introspection]
 	gnome-base/librsvg:2[introspection]
+	gui-libs/libadwaita:1[introspection]
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
@@ -121,7 +122,10 @@ BDEPEND="
 		app-text/docbook-xml-dtd:4.5 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	test? ( x11-wm/mutter[test] )
+	test? (
+		sys-apps/dbus
+		x11-wm/mutter[test]
+	)
 "
 # These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
 # dev-lang/sassc
@@ -141,6 +145,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use pipewire camera_monitor)
 		-Dextensions_tool=true
 		-Dextensions_app=true
 		$(meson_use gtk-doc gtk_doc)
@@ -150,14 +155,15 @@ src_configure() {
 		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
 		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
 		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-		-Dsoup2=false
 	)
 	meson_src_configure
 }
 
 src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	virtx meson_src_test
+	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
 }
 
 pkg_postinst() {