gentoo resync : 20.03.2022

3 files changed, 4 insertions, 173 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 31bcd949e2c5..19b8e66b9c11 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,7 +1,4 @@
 AUX mutter-40.0-Disable-anonymous-file-test.patch 862 BLAKE2B bb7a0f0dfa5f0543c9187fe8c3aa8d1251fbb9c74dcf4c518a4674758a22da70a94de688f4b01d7673c679a2e96cbdfa5c33de3d009c85fecd2498061121dcf3 SHA512 d2d7ec9e1fcc3fad9dc058edf611fe16a3180a8d6694a9f3257b22eb3885dc0b311bc48054de0d183c661658e226d1b04e4ad81b1314a60a3f441a6f4c06bed8
-DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8
-DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
-DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338
-EBUILD mutter-40.5-r6.ebuild 5008 BLAKE2B 6e8a4f71d89f0394f584f84c28e6f2241928ff1140485bb8c7fba58a7e9f3f8cc7913c8807215f32810ccd362c611dd83ea9595be0fd8f8196ce37acbb3cf07f SHA512 43207ac1262909fd3c8f84b374efbefc5b9d5d0a784f6017679fc3cbfa149949a2b68df9379b944fb1f0d987afbdca52a01d368bc52daeac17fc62d2195c354f
-EBUILD mutter-41.3.ebuild 4975 BLAKE2B a8f837597e1ddaa78db2e07360b5ad4ca02cc7061f39cd4ba9eeedad07992985d1b48fe76795ffef848a9e1989d8dd14d24e5dbdfef5bb90a67c94bd7a6d7d59 SHA512 0c07d7730a58652e4d31807b40cbb066d40645e66aff76e2eb8e64f985c3ef0367d7210ab20c903b6edb17cc74cba2cdce9ae41239d72ac89b2986dda02077f2
+DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
+EBUILD mutter-41.4.ebuild 4973 BLAKE2B cf7432698172a8ec8baff3d665201e3f531c888acf9cca24eee2dbb33b743f536161a9ad88c7d83a5b6564594794c4ec6c5bb4346e38344a9adac8edc69f2baf SHA512 f8566f3a13911e970ca52e5fd057a8d80b9d782d5ef5bd1a85ab310514a7afa9f6c4bb5d1c4042b421f819ef0a9e02b0d623b531fb9d76a49147f4c24f1f9532
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-40.5-r6.ebuild b/x11-wm/mutter/mutter-40.5-r6.ebuild
deleted file mode 100644
index c21be09d0bb7..000000000000
--- a/x11-wm/mutter/mutter-40.5-r6.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev virtualx xdg
-
-DESCRIPTION="GNOME compositing window manager based on Clutter"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-r1-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
-
-IUSE="elogind 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="
-	wayland? ( ^^ ( elogind systemd ) udev )
-	test? ( wayland )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland
-# 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="
-	>=x11-libs/libX11-1.7.0
-	>=media-libs/graphene-1.10.2[introspection?]
-	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/pango-1.46[introspection?]
-	>=dev-libs/fribidi-1.0.0
-	>=x11-libs/cairo-1.14[X]
-	>=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
-	>=dev-libs/glib-2.67.3:2
-	gnome-base/gnome-settings-daemon
-	>=dev-libs/json-glib-0.12.0[introspection?]
-	gnome-base/gnome-desktop:3=
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=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/libXrender
-	>=x11-libs/libXrandr-1.5.0
-	x11-libs/libxcb
-	x11-libs/libXinerama
-	x11-libs/libXau
-	x11-libs/libICE
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=media-libs/libcanberra-0.26
-	sys-apps/dbus
-	media-libs/mesa[X(+),egl(+)]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	wayland? (
-		>=dev-libs/wayland-protocols-1.19
-		>=dev-libs/wayland-1.18.0
-		x11-libs/libdrm:=
-		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
-		>=dev-libs/libinput-1.15.0
-		systemd? ( sys-apps/systemd )
-		elogind? ( sys-auth/elogind )
-		x11-base/xwayland
-		video_cards_nvidia? ( gui-libs/egl-wayland )
-	)
-	udev? ( >=dev-libs/libgudev-232:=
-		>=virtual/libudev-232-r1:= )
-	x11-libs/libSM
-	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
-	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.3.21:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	gnome-extra/zenity
-"
-DEPEND="${DEPEND}
-	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
-"
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
-BDEPEND="
-	dev-libs/wayland
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? (
-		>=sys-kernel/linux-headers-4.4
-		x11-libs/libxcvt
-	)
-"
-
-PATCHES=(
-	"${WORKDIR}"/patches/
-	"${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
-)
-
-src_configure() {
-	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
-	local emesonargs=(
-		-Dopengl=true
-		#opengl_libname
-		#gles2_libname
-		$(meson_use wayland gles2)
-		-Degl=true
-		-Dglx=true
-		$(meson_use wayland)
-		$(meson_use wayland native_backend)
-		$(meson_use screencast remote_desktop)
-		$(meson_use udev)
-		-Dudev_dir=$(get_udevdir)
-		$(meson_use input_devices_wacom libwacom)
-		-Dpango_ft2=true
-		-Dstartup_notification=true
-		-Dsm=true
-		$(meson_use introspection)
-		$(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)
-		$(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
-		emsonargs+=(
-			-Degl_device=false
-			-Dwayland_eglstream=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_test() {
-	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
-	glib-compile-schemas "${BUILD_DIR}"/data
-	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/x11-wm/mutter/mutter-41.3.ebuild b/x11-wm/mutter/mutter-41.4.ebuild
index 1c8c1b5985a9..e32a368da43b 100644
--- a/x11-wm/mutter/mutter-41.3.ebuild
+++ b/x11-wm/mutter/mutter-41.4.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
@@ -142,7 +142,7 @@ src_configure() {
 			-Dwayland_eglstream=true
 		)
 	else
-		emsonargs+=(
+		emesonargs+=(
 			-Degl_device=false
 			-Dwayland_eglstream=false
 		)