From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 9 Jul 2022 15:43:36 +0100
Subject: gentoo resync : 09.07.2022

---
 x11-wm/Manifest.gz               | Bin 9799 -> 9795 bytes
 x11-wm/mutter/Manifest           |   4 +-
 x11-wm/mutter/mutter-42.2.ebuild |   2 +-
 x11-wm/mutter/mutter-42.3.ebuild | 190 +++++++++++++++++++++++++++++++++++++++
 x11-wm/page/Manifest             |   2 +-
 x11-wm/page/page-1.9.9-r4.ebuild |   2 +-
 x11-wm/xpra/Manifest             |   2 +-
 x11-wm/xpra/xpra-4.3.3.ebuild    |   2 +-
 8 files changed, 198 insertions(+), 6 deletions(-)
 create mode 100644 x11-wm/mutter/mutter-42.3.ebuild

(limited to 'x11-wm')

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8a862e9cf48b..81c583632160 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 64a3b7028c37..7141da40cacd 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,6 +1,8 @@
 AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61cb0bc26ec22775e87942f88f97af7dbcde63e0d960f5b41afc3de0b358b0c6252de90af4451d4fd6c75b7815ab573c7199b0c82cdd1eb7d SHA512 c066d1b5541078c6cc8d2788b36935b9aff0f1fbb800f39fa4674755a6842be66736c57b43d5edb00e5c18a33c1ff17d54a546134e5aae8ebd9a8967cd46b164
 DIST mutter-42.1.tar.xz 2747056 BLAKE2B 7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689 SHA512 b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
 DIST mutter-42.2.tar.xz 2747612 BLAKE2B 39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683 SHA512 e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957
+DIST mutter-42.3.tar.xz 2746756 BLAKE2B 818b2ac8cd264c6b8e30b6731ef2641dbcbba6dce7628d0a934c3f49a5857874d9e6a97cd53ec689c2a9ae7f52d49ed98b7cc551eafbb32b74cbebbe027d9f43 SHA512 f346d2299143ceb6c9164977df2e23655b1c204f3a2d1f713377f3cc2f3609c56914c5e8a0b940d4fdd3d040a9af210f724350bb4f74ffac293e6a82e2b0785b
 EBUILD mutter-42.1.ebuild 5451 BLAKE2B 1e19e26fb5c7685eb43ca8e49ce9c470d5bf59ef55013d7b9eb34ddbfa8258b74b974fb80900238ce4ab3fa1ed1441f73457fa0b54abcf30f9d8f49de53f4296 SHA512 5f9a049dcf87d30ff0e892da6aa1621c21565b9e3dc56576463abe19a59bcc489e0fec44b5012468b6033747f9bfe58a1b1543a1b7598289b1c3d28293f5f4ec
-EBUILD mutter-42.2.ebuild 5454 BLAKE2B 5bbf7ae350497c55259f50cb4c95e9deda0bee55931ded79291c51f478750fa506f8156e5b0ccfce33cd31e9ca3107143ccece182dc20cc276a129db49ca8f8b SHA512 7a79d7302d8a15658ad5d7d3e49aa039c87356f73311390b0f926e988502e4a8809d257efedb4bac1ba19117c2ba6df7cb98b9e0e0616fbad041c3bac1c27c5a
+EBUILD mutter-42.2.ebuild 5452 BLAKE2B 9a751ae514cf06db0b11de9493f162cec4de44478b87461f6d4dbb24458ad040c5f1de69f8a5c8a86bdfa0d7e39430543b949944cd0da0224a8c09c808792276 SHA512 424f676ec90d97a633aebed703379611d9011168933049b8641553e40bc57728a91be3491a26c73a91ce348484040d87dc755371eade09f2c97abafdd932c16f
+EBUILD mutter-42.3.ebuild 5482 BLAKE2B 8e49e85cfd74814e46458f0fc9fac42a0696b22cd7b2714df0c46ddf2401a7b19b4e86c27ee6c4e0b4a5f600f0c3e5d8be60b24ed65d1661ab82cad6764559a2 SHA512 cf12a5b5170a64939f542a9f9f7dbc889d8f5299f371d1ee77fa0cbfcf0603df6a3a924f1e8f1d1a33db8ab3909d02adc978abe5d3086e15bce69a74839b3b56
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-42.2.ebuild b/x11-wm/mutter/mutter-42.2.ebuild
index 1ea322f5ea67..c071bf22c445 100644
--- a/x11-wm/mutter/mutter-42.2.ebuild
+++ b/x11-wm/mutter/mutter-42.2.ebuild
@@ -18,7 +18,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
diff --git a/x11-wm/mutter/mutter-42.3.ebuild b/x11-wm/mutter/mutter-42.3.ebuild
new file mode 100644
index 000000000000..f47197d0b90f
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.3.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+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+"
+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
+
+IUSE="doc elogind gnome 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-42.0[introspection?]
+	>=dev-libs/glib-2.69.0:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=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
+	gnome? ( gnome-base/gnome-desktop:3= )
+	media-libs/mesa[X(+),egl(+)]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm
+		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
+		>=dev-libs/libinput-1.18.0:=
+		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:= )
+	doc? ( >=dev-util/gi-docgen-2021.1 )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+
+	!<gui-libs/gtk-4.6.4:4
+	!<x11-libs/gtk+-3.24.34:3
+"
+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? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${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}-42.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+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 systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Dlibgnome_desktop=true
+		$(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 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() {
+	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 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
+}
diff --git a/x11-wm/page/Manifest b/x11-wm/page/Manifest
index edbbde1ee32d..0080b6f86350 100644
--- a/x11-wm/page/Manifest
+++ b/x11-wm/page/Manifest
@@ -1,3 +1,3 @@
 DIST page-1.9.9-r1.tar.gz 1009216 BLAKE2B 8248705f9e5eceaeea37889a9859249d9eb236f215da804f5edad3c36007179f63f132c161c1e4a6a97df6240f87799242140c97877775ae00f2e86dd7eed69d SHA512 9e7594590b1fdeadcf59d715d30727bee9f640903a34cadd8c0d92b3e94059c183d931a7d8e96763adb74f59a94acb03f7bfbbd4f1f8b57371fe886e6a227012
-EBUILD page-1.9.9-r4.ebuild 1346 BLAKE2B f2697c20c4907f72bc090e5097215ef62a2ba97f571bcaefcd8cf1177110c7a9547c3d8f624f7f67e0f438a309506d19958cea8c44e0803ac6f4c4035c3963c5 SHA512 eef1999b97739813baf743a06184f38e10318ccc6c71d65564334feeb4a8d1a321bd2b55d9481297e7cad42c35541be262cecf6421575b457cc2852de12797b6
+EBUILD page-1.9.9-r4.ebuild 1338 BLAKE2B 20e8de0b39cbb6acbeb296bdde1db89787adc9e9d80d940123ba061792441d78d9af65712cee3ff44e1ab8c6c51da736e084b138bbe92e6a13ba69bb40b6052c SHA512 38b1834074f53b9964284b9947cba217f14ee538e347c8a0ef236ab4137bc39147c1ca5ccd37ef4d89a7b8186ddca952008545dd37c763d64860d6a3cb4a7ddd
 MISC metadata.xml 529 BLAKE2B 4c6d01f77562ee31d8bd0f72c5217036cdad2b10f1c24fe2a1d3840a68502d130979d21a8a9a4791378f4ccaffd7eb685feb0c3fb81edfd18d08be6bd8aa345d SHA512 d2989494a7f5a4a8d3c48343763098dcb9a5f7fb6754455b008e0cb982b4284d84809d7c299c2c7bcdc1ee76429286efdd03a9ecdfb0163fccaaaaa4ee2b45fc
diff --git a/x11-wm/page/page-1.9.9-r4.ebuild b/x11-wm/page/page-1.9.9-r4.ebuild
index f486626b160b..6f84a55fe81d 100644
--- a/x11-wm/page/page-1.9.9-r4.ebuild
+++ b/x11-wm/page/page-1.9.9-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="A mouse friendly tiling window manager"
-HOMEPAGE="https://www.hzog.net/index.php/Main_Page"
+HOMEPAGE="https://github.com/gschwind/page"
 SRC_URI="http://www.hzog.net/pub/${PN}-1.9.9-r1.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 1cef4e52e827..3a54a236641a 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -10,7 +10,7 @@ DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd4
 DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
 EBUILD xpra-4.2.ebuild 4193 BLAKE2B 1c611de33e8d7f62642d2e06f9ff0714110ef2f1bf436c48f2c9c6ce0a5be54dc5264b67e258e5d21f87393cb18b58866479a8d6f4c55617abaf61d960129862 SHA512 e0a8c60225f6e308bac0670b5b2657156b7f1bb9a04dc5b46cc6a297c68a0d92dbf844945ff376fc53cd13789efccfb474c2f2b852fb7d464c971cf6143c3c5c
-EBUILD xpra-4.3.3.ebuild 5292 BLAKE2B 1e72840535dcad023f03c3a5df40e70a5ef9d653abd983c7244d1fa4fda1c99fe5535dc9ecec0dd711e7f945ebe01c8d3ee6ebefb652352fb86d01f392d3971d SHA512 3829633d6c0aa0b9b8e21d2faa21118baaaa06ca55903a95def3a7a7d7773ffcc79c76f8065fd6712b90578700e1062df537382d7129ad086c20c2a5b18464b0
+EBUILD xpra-4.3.3.ebuild 5291 BLAKE2B bb1884f9766a9433772917278af74e3bc75dccd4a6dc6fce07f8bbe9c0bc4aea541107573074b78e76a8c7ea43bba1cbde332954aa5e944765ac01cb026ea5bb SHA512 c85db59933ddbd2cbc35ac5ab599af2675c680a42cc975b9719d87f26f866921bd1922f79a457c8f89e9aa3521d230d9168e43f8f3cf99202b79e96a564df577
 EBUILD xpra-4.3.4.ebuild 5213 BLAKE2B a225eeb5ef089e0a8522cfd3c58b7775e51e481cff1b0faac1a06cf35640db5f01f2168717026a7363fe5319ea3392ec0002f9ecbce253eb7bc2e80e0aa4cbfe SHA512 9c63a9e981c7cca9c194a860d17da43760eff4201d44ef525ec0f9e27800c62614366126f7c210cc8cb3827a84c8890e373132d0eddbcec81cbf5d04eecbba7b
 EBUILD xpra-9999.ebuild 5148 BLAKE2B 192a4458604d74eec4d5b9e2ca50cbfae7d97a3624bbab18c714099630a91034753bffe8c9841f2d0a794581c978e95cb3480f7a0bbe377897caec33a95a7159 SHA512 e51223bd4d28c196da186bcf201b81204224725c13d8a1d2a437ce937a061d0d5085b227d6961c2849564ac01931fdc58a60e503644c550ba8969f7070953d87
 MISC metadata.xml 1251 BLAKE2B c34d54c0b030f2b1f6feef9bfaa50718f4931488e948d0179cd1846f2e4b78932c4164f9a3b708b13cd90c71c84cdebc6af2dfa3fbb831eed3fc308c2537ff84 SHA512 465e19a532120ed42187e6e053b77fecad5cad408f4f1a57bcd237b7765bafd2fbff7a6e7e66ee4c9cbf50bd979aa989dd364a042e8ecfe5cd2180f2eeab3ba8
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index 6edd3e2ee447..0439786ef126 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{7,8,9,10} )
-- 
cgit v1.2.3