gentoo auto-resync : 22:04:2024 - 12:05:36

5 files changed, 243 insertions, 2 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 5b896330ff52..769aec108a3c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 0a5c4d38d18f..087bd9083502 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -3,6 +3,6 @@ AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bc
 DIST dwm-6.4.tar.gz 25321 BLAKE2B 23c8b0fbbdbf417a2ed79727b0001e812a2e022f8bc29b4ec7711711ae995a8d71283aad23f2d11454407ada29e545c302d66bf239d3598498d93335cd32775f SHA512 b13ac4390c7945cfb4e06bbec2cf69a9bf55867fe2babcba1a4945803a12bea88db31ad06dd06627445f8456950deb26f2d631f946c4207ae92e13f273051a51
 DIST dwm-6.5.tar.gz 25588 BLAKE2B 5f837e49026d3213cfa98411f301c134bccf0299b892d9cb0d54a77d1785c905a4d6bcea941f240bc713122a37d61061eeafc594c27b9f486ca7187558479394 SHA512 6cc3efd8d8a5e96517474fdcb1c1a6192fdf669c1bb02de6aea0a9f1a951360bf73c9576a5a0f06b00e2f839bacc304d60548d5ead0996bf46d82be4121ed248
 EBUILD dwm-6.4.ebuild 1323 BLAKE2B 2a4c4bac2f49b2e795be93495ebc0a9e2c24519f126c9bb1bc9b44bc9d4853dc33f88db0ac4cfee38be83d877d666f8e09228f15e748030c16793b0d73a28977 SHA512 31a0e46653c87ea4a0782f164f2d41cb5023e335a2e7f018acdfcb84461d6282d1cfb91112d3ddd32407b8dfcd64bb9143d025a153879c54e5666e32b4adce1c
-EBUILD dwm-6.5.ebuild 1349 BLAKE2B 1ffc5817f9c092dac37e68d0f75d92ebfd3eb9679b036d59c4d4d1f93f56c6ea5ed4ee56a3d5cbddf8d970aca03612cc38621222c552823575069829e60cdf77 SHA512 137b4e80dc3b335c156f10bb12eb754287fe17338fa923cdf5f020e13934965fc58bc35ebb64811e8b3552f966e49827eb8cedba8a78b0a431961afb92d5043c
+EBUILD dwm-6.5.ebuild 1344 BLAKE2B d9846795e0244e0183f0346d4b649c561b99c9413cd0ae8a1c127d9e1499000b7dfcbcc4d17b5db1ee45eb98fc44af6472de6663a939c9e33e4ffdecd57911a7 SHA512 b1c587833d91360c68414faa6895003302526a176e87b96a4a542d13aa378f607eb7ebb7c918e890d838e2e39914336b3446f3983fd05afea7edb852cf4021c9
 EBUILD dwm-9999.ebuild 1349 BLAKE2B 1ffc5817f9c092dac37e68d0f75d92ebfd3eb9679b036d59c4d4d1f93f56c6ea5ed4ee56a3d5cbddf8d970aca03612cc38621222c552823575069829e60cdf77 SHA512 137b4e80dc3b335c156f10bb12eb754287fe17338fa923cdf5f020e13934965fc58bc35ebb64811e8b3552f966e49827eb8cedba8a78b0a431961afb92d5043c
 MISC metadata.xml 497 BLAKE2B 9f22d404a0bebbb1b95a91ff5dd1000d2e940cf133d2dfcd1da924e243ea2cb347e6785e2a1592cad65797c5c9e9719d2643206ddf8fcd509e0673c4249582ac SHA512 c5ca3cc6a55b339be3c5046b5717f3f6dff9252713f09405f73b2580cbcd9407bfc3c7bd63668650b166af5796e5cc9e04ee5608f743e3653c17afd0624daff2
diff --git a/x11-wm/dwm/dwm-6.5.ebuild b/x11-wm/dwm/dwm-6.5.ebuild
index 5881e52a6091..989c843bacc8 100644
--- a/x11-wm/dwm/dwm-6.5.ebuild
+++ b/x11-wm/dwm/dwm-6.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.suckless.org/dwm"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index ec7f734944d6..8ff7393bcabc 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -4,8 +4,10 @@ DIST mutter-45.2-r1-patchset.tar.xz 21864 BLAKE2B c09566f75a816f6599ac4bf99879cc
 DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195f526ab88102c831df693cb8dfa5b55bb1590a54e68f41eab392e69bb833221480578a2fba4b1e4bdc5ed030d SHA512 2111ad0645d2da58dedb30d94e99b52045f38b31a9de7314a5d8b41a5525612d88d2fbaafd3658eb6f734c143ad12176367c26533237199d9a5c1ad3dea743c7
 DIST mutter-45.4.tar.xz 2886300 BLAKE2B 62fe0c08e92f8cab0bcf64a52a9d1bdf16754deae5fb00018f29c596ab2e26a5b75eee46f1c0206ae1773fe5b7ed48abc755b6070d35dc22536dcb11e8955e95 SHA512 3fdd44dfcb504a84d402065987fb8bdec84d639260c66c0cb2e88ef2deb56fadf2ae91bdeae782793728e54803a455ab38943b68693124d728b0c52ba8698e3c
 DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4b5168e863843ca5b08a6d726be9b7a94b94763e6b4c10b48355ed845accd9ae63704aefaf3f8e2bb361855b8 SHA512 15fb5589e2b971ac94b3d8f549643f2998375943c419114907c317761c8250089751dea65c35be44435350e6bb02bb238fcf2eef17bf7d6a5b41053a64ffba05
+DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738
 EBUILD mutter-45.2-r1.ebuild 7271 BLAKE2B 47dd9d2e527a3ec275ddfb30f03bc32dbac84d3f1311fdb7a703269db8950aa401b6939f3a471d19da2d3b6c1173ec402b33573bd94d5e436d958b01598f20fb SHA512 8c6908307c82c6e542cdc8e87616fc9e9581e50cf31a2b85bf5dc4741b3d8b119b5b77d171f90774ba85e0209fedf58cb49fe33a6e557d092b19206086bc8e83
 EBUILD mutter-45.4.ebuild 7068 BLAKE2B 48a72d702edf822680a340ff739a6a779f10adf245a5aaff21463f50aa220c8949cfe5d33952eda85ebb1f1f21d9537af41009d870e38b53336b75b70dfab6da SHA512 162014d375b4dd556bc8fb853ae40b82eb7883eeb26e3d3ecf552226eb37886a946d27dd0976378129a2541179f5f9ae866b2c548c6413b5457d717b1c54da6b
 EBUILD mutter-45.5.ebuild 7076 BLAKE2B de0ac32c8d68f73b4d5820f6f6619b23cb1930dcecc9788e711b04db7619ce5636952175f88d10957a5bb4f5c562c47a26634982cbb21b5310533884b88b43fc SHA512 7475b18a9a6872067f44a56b3e461443ca2b5a21dcf094c31f759a0386ab812b9001bfb009825957d874be322911e86e9ec16778cf2d5dd42d027bf0a81850e7
+EBUILD mutter-45.6.ebuild 7322 BLAKE2B 3dddfccc11c61c52aeb306507db8d0a3026b41a752d4e634cb552a7bfc8ee8bd2f09f50cf0f6c25749d3fe794a38f204f3cc2dbd5e09e78dad22e8de5e3ee3de SHA512 e975761ac57511c483b8997b9d607eba8bd575892dcec7a7d0bf6080dfd3f8980fc53521ab39692cbd6c8b4416b20e05099fccc0e72114b286aa3ced6203fcc6
 EBUILD mutter-9999.ebuild 7108 BLAKE2B a91ea047d22a4a79d164d30d5a5a0d966cb652061c1a97fa17762262e6736c45949993b5805ab90d63e07bcb5ba7a50d625783d1aa1a2e5c818347bbae4c5286 SHA512 f6490a571afc2c25b9c22d38858b9a02d0167f49f789d7f20ca4724580ed38b1bbaa794722a42e7141f49e44adac31cf4b77f374dd29dc703caed0d56e61e2a0
 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/mutter-45.6.ebuild b/x11-wm/mutter/mutter-45.6.ebuild
new file mode 100644
index 000000000000..ebbdabe366e2
--- /dev/null
+++ b/x11-wm/mutter/mutter-45.6.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+LICENSE="GPL-2+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
+	SRC_URI=""
+	SLOT="0/13" # This can get easily out of date, but better than 9967
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+fi
+
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
+# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
+# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
+# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
+# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=media-libs/graphene-1.10.2[introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=x11-libs/cairo-1.14[X]
+	>=dev-libs/fribidi-1.0.0
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.75.1:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=x11-libs/libxkbcommon-0.4.3
+	x11-libs/libICE
+	>=app-accessibility/at-spi2-core-2.46:2[introspection?]
+	sys-apps/dbus
+	>=x11-misc/colord-1.4.5:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/harfbuzz-2.6.0:=
+	>=dev-libs/libei-1.0.901
+
+	gnome? ( gnome-base/gnome-desktop:4= )
+
+	>=media-libs/libcanberra-0.26
+
+	media-libs/libglvnd[X]
+
+	wayland? (
+		>=dev-libs/wayland-protocols-1.32
+		>=dev-libs/wayland-1.21.0
+
+		x11-libs/libdrm
+		media-libs/mesa[gbm(+)]
+		>=dev-libs/libinput-1.19.0:=
+
+		elogind? ( sys-auth/elogind )
+		>=x11-base/xwayland-23.2.1[libei(+)]
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? (
+		>=virtual/libudev-232-r1:=
+		>=dev-libs/libgudev-232
+	)
+	systemd? ( sys-apps/systemd )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.33:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+"
+# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
+#	X? (
+DEPEND+="
+		>=gui-libs/gtk-4.0.0:4[X,introspection?]
+		>=x11-libs/libX11-1.7.0
+		>=x11-libs/libXcomposite-0.4
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		>=x11-libs/libXfixes-6
+		>=x11-libs/libXi-1.7.4
+		x11-libs/libXtst
+		x11-libs/libxkbfile
+		x11-misc/xkeyboard-config
+		>=x11-libs/libxkbcommon-0.4.3[X]
+		>=x11-libs/libXrandr-1.5.0
+		x11-libs/libxcb:=
+		x11-libs/libXinerama
+		x11-libs/libXau
+"
+#	)"
+
+RDEPEND="${DEPEND}
+	!<gui-libs/gtk-4.6.4:4
+	sys-auth/rtkit
+"
+# dev-util/sysprof just for sysprof-6.pc or sysprof-4.pc at build time: https://gitlab.gnome.org/GNOME/mutter/-/issues/3453
+# x11-libs/libXrender for an obsolete build dependency check: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3716
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXrender
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 >=dev-util/sysprof-3.46.0 )
+	test? (
+		>=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland]
+		gnome-extra/zenity
+	)
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		# Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+		#
+		#   -Dopengl_libname=libOpenGL.so.0
+		#
+		# while we build the x11 renderer, as we currently enable gles2 only
+		# with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+		# in a configuration where wayland is disabled, as libOpenGL doesn't
+		# include them.
+		#
+		# See
+		# - https://bugs.gentoo.org/835786
+		# - https://forums.gentoo.org/viewtopic-p-8695669.html
+
+		-Dbuildtype=$(usex debug debug plain)
+		-Dopengl=true
+		$(meson_use wayland gles2)
+		#gles2_libname
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use wayland xwayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		$(meson_use gnome libgnome_desktop)
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dsound_player=true
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use gtk-doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	# Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
+	gnome2_environment_reset
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	use udev && udev_reload
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}