gentoo resync : 25.08.2020

4 files changed, 171 insertions, 18 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index bcefb1547381..5e5852cf2f98 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,11 +1,14 @@
 AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
 AUX 3.34.6-XInitThreads.patch 1625 BLAKE2B 5b9ff02d96643105d0b865da0821ed6d4a849c8a42d5787c0eadbee4f7943ba5028471bb8424b87ee716d7ae9581b29f6f219c65371a6307da8eb04e0a5a94a2 SHA512 b223845da63ddbba5eaffa9b2a85e1cdaaee9126707d10c902814d35596857fca733ac290b86648ec506cc7bea2432b95ed5c5ea18dd598e539fcd0670620065
 AUX 3.34.6-tests-dontreq-gdkwayland.patch 1730 BLAKE2B d796a4dc91d756ac4af24c411e9f6ef33fcd02443585a3662bf58f04498305aa6b458ab0ace5191a97d9c66ba81cec9ee75099d7e77436eb39c3bec33bb68e26 SHA512 841f59c00f061302f411ce5ed5c25ef041f13a57d44da011815cfb2c1f80cccea1963675dc023d82aac4824b620861876ca628b6165db74b150564222b786b22
-DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
 DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
 DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
-EBUILD mutter-3.34.5.ebuild 4601 BLAKE2B bc7d2781611d8653fdab53b787f370232f7fce34ad9e981d570fcb3b862d6fb53742097735be12f1c338f24dc7e8d4f7fb3b18f9966d3e1e6f7abe63e802268e SHA512 c0c3779418ecbc68cb5a7cc3b54ae2b944b7f2cd64248e647d1f19104c7e344d797da5255c944cc5b21b88c53823bcbd5df0982944657ba2ee5157d2d959b9d0
+DIST mutter-3.36.4-patchset.tar.xz 9064 BLAKE2B 62a66010a2daf8584ae6bc79d81425e4283ebf3a97d9bbf4e52d486dc3460c9f501f1d18adcf95fc5016678b235931ed095c1edfa3f86374d826c8808927956a SHA512 fb84a44e7676f14b906c54c36696f7c4c0b154ff8e08786d87ae2320ddec2aa8f275b7d5481e434d4ea6c4a06d3221cfe53f8642bc7e98037937f3ff921b33c8
+DIST mutter-3.36.4.tar.xz 2687224 BLAKE2B edf86573bcecaff67b666205460ce8748e0e58f03a14f3f04ae01e0afed6e2909d16d4c2bc53d2e95e9ad2d5b3a8223d06245e01c7dbcc51dc6e04b463767935 SHA512 e7130e59d5539a53ac8a349a38ce1ce757c6eee2ba672fc9eab9330bde32217674a9a206bd977db03195dc42b6c327147467407dd0159c4e8585332d9c1daabb
+DIST mutter-3.36.5.tar.xz 2687916 BLAKE2B 15eedc6b1a7c5fdb3a355b8aa4b5586491d0fc50ef293b200b747e9d2a8540df9dcb5d492edb30d1a51b779bf4faceba9448535475c65864d08219eb94e71599 SHA512 cf02003578ebe4d025006b7dc8c277e5a2240373d41fd21e9e7a0ea3d7f323454925a09a5f77117e63a95d4f7663fc4ad7b6e21b042044a8a1a5238713f8d5ec
 EBUILD mutter-3.34.6-r1.ebuild 4693 BLAKE2B f5ec4765d9f830be04ff211c47bd90bcaa22b872907adefe4017f1dcb6c2ac6160c6e3d41b203c5863e5ba0fc9a21285b2ed2de66234bf1c8af73f9c6635f3fe SHA512 b0f35b7b730b90f9dd64ab2e1749904b9fd287d58ca80e1b16accdea79eff5d7fb8a369da495341bcc5c6d0d51fa1ed801fd282d84014be5722354940358701e
 EBUILD mutter-3.34.6-r2.ebuild 4758 BLAKE2B e1d099094f754a2554ef29263f6a2fe7573bcf6ea03f268a2d29b22047d4f1bc025ad1991e216da7329331de7216819afe703759670b9391c16b955a49c83a7e SHA512 06b01e1998c4c2b45ea91e4b96382ddadf28c841f0aef43becd078b239c8cc83b8543b34f452be16ed079f0ab9642979604bb2ca76ab55642e3992e1c3b83601
-EBUILD mutter-3.34.6.ebuild 4603 BLAKE2B 888ff9338623e03e37f9ca1bc3df553361c35ffe79aa85f7dfec96182436c1c4154fdabb5d7be36166322f996cfc6bc877fa2d42d7ccd4cbf38295a5ff50afbe SHA512 8840607602e87567e2cd8307196269655b5cc516834cce262ee2841debdbd8151b6889a901e39d6ce251eaf2261295326fd31d17d284dace45da618436e1ef59
+EBUILD mutter-3.36.4-r1.ebuild 4772 BLAKE2B 8fbe6abab388bb25743cef1fb2cfb3f533540330a49a4ff6600e69be1ef7bbb8ff02d5978cea9891c3553ce95027bd3214a8556b1b9287c72a438cdd84ccf1ac SHA512 939bf6555a4f030feafa231c5ccdbd31cccd757f96c07a1cdf2ecf96ce9b9fee9e8c61f23934d03ff11008a710aa2c6cef15d6d2f24579170a0a891caa5e2930
+EBUILD mutter-3.36.4.ebuild 4661 BLAKE2B e0e5d0a05570c74d936cb1257f41d1a0bcca8f5cbb2a455c2cd5ab19b0773b65560a395323145afbe11814770ed4abbf7790abc7149d6142c0afe4f9d153ea91 SHA512 ce2d1390285e22b2866fd4abb2aa6b0597d40375f67d02d85548150bab0c7359b057057cfd9faeb35169d835e5b719f24987bfed0eacc0ba3924a713e6e7a228
+EBUILD mutter-3.36.5.ebuild 4633 BLAKE2B b339ba281c3a153619156c7b69add8056abd50af5f356a8d46537e33810ff3cd061bba04c2a5ab1eaea0d671fd4197cf11b5ff43794ea5e8a7b1398a9683dfcf SHA512 7dd8fae79e9242ef11d624fb8296a2190ad720bf72cb2dede6cbca0871c598e8928ee64c8af52f54abad825f785bac0339cecf52f185b5b5513dde5d7eaa691b
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-3.34.5.ebuild b/x11-wm/mutter/mutter-3.36.4-r1.ebuild
index 72c020d0f4a9..1378bd57cf53 100644
--- a/x11-wm/mutter/mutter-3.34.5.ebuild
+++ b/x11-wm/mutter/mutter-3.36.4-r1.ebuild
@@ -6,9 +6,10 @@ inherit gnome.org gnome2-utils meson virtualx xdg
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/6" # 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"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
@@ -17,13 +18,14 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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
+	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.30[introspection?]
@@ -52,13 +54,14 @@ DEPEND="
 	x11-libs/libICE
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
 	wayland? (
-		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.13.0
 		x11-libs/libdrm:=
 		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
+		>=dev-libs/libinput-1.7
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
@@ -68,7 +71,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -76,8 +79,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
@@ -93,7 +95,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${WORKDIR}"/patches/ # various gnome-3-36 patches for screencast
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
 )
 
 src_configure() {
diff --git a/x11-wm/mutter/mutter-3.36.4.ebuild b/x11-wm/mutter/mutter-3.36.4.ebuild
new file mode 100644
index 000000000000..e85b8ba36518
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.36.4.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/6" # 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 +sysprof systemd test udev wayland"
+# 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~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
+	>=media-libs/graphene-1.9.3[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+	>=dev-libs/glib-2.61.1: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]
+	wayland? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-libs/wayland-1.13.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+		>=dev-libs/libinput-1.7
+		systemd? ( sys-apps/systemd )
+		elogind? ( sys-auth/elogind )
+		x11-base/xorg-server[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
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+	dev-libs/wayland
+	>=dev-util/meson-0.50.0
+	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-base/xorg-server )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.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)
+		-Dremote_desktop=false # TODO: Re-enable with pipewire:0.3, but first get patches from gnome-3-36 for screencast on top of 3.36.4
+		-Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+		-Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+		$(meson_use udev)
+		$(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
+		$(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
+	)
+	meson_src_configure
+}
+
+src_test() {
+	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-3.34.6.ebuild b/x11-wm/mutter/mutter-3.36.5.ebuild
index 0d1a9f2d48c9..c4f63fe179e3 100644
--- a/x11-wm/mutter/mutter-3.34.6.ebuild
+++ b/x11-wm/mutter/mutter-3.36.5.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
 
 LICENSE="GPL-2+"
-SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+SLOT="0/6" # 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"
 # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
@@ -24,6 +24,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # 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
+	>=media-libs/graphene-1.9.3[introspection?]
 	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.30[introspection?]
@@ -52,13 +53,14 @@ DEPEND="
 	x11-libs/libICE
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
 	media-libs/mesa[X(+),egl]
 	wayland? (
-		>=dev-libs/wayland-protocols-1.18
+		>=dev-libs/wayland-protocols-1.19
 		>=dev-libs/wayland-1.13.0
 		x11-libs/libdrm:=
 		>=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
-		>=dev-libs/libinput-1.4
+		>=dev-libs/libinput-1.7
 		systemd? ( sys-apps/systemd )
 		elogind? ( sys-auth/elogind )
 		x11-base/xorg-server[wayland]
@@ -68,7 +70,7 @@ DEPEND="
 	x11-libs/libSM
 	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
 	>=x11-libs/startup-notification-0.7
-	screencast? ( >=media-video/pipewire-0.2.2:0/0.2 )
+	screencast? ( >=media-video/pipewire-0.3.0:0/0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -76,8 +78,7 @@ RDEPEND="${DEPEND}
 "
 DEPEND="${DEPEND}
 	x11-base/xorg-proto
-	sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3
-		<dev-util/sysprof-capture-3.35:3 )
+	sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 )
 "
 # wayland bdepend for wayland-scanner, xorg-server for cvt utility
 BDEPEND="
@@ -93,7 +94,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/3.32-eglmesaext-include.patch
+	"${FILESDIR}"/3.34.6-tests-dontreq-gdkwayland.patch
 )
 
 src_configure() {