gentoo resync : 15.12.2019

6 files changed, 149 insertions, 4 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 915fce04dedf..02997052c4c4 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,7 @@
 AUX 3.26.2-non-wayland-build.patch 1035 BLAKE2B 7c9beb268c2f1b5784bbb2b44d8199f9821462c0be7678b69c9feb05171f46a2ccf96c18e8ed45b32c7ce576a7693839d03a90b4beb787f5291e7853b28b514c SHA512 88bda28953ba08bb6cf7847de49356d7896d554169d0039b599963eb333a0c688b49dc9d55c8b8e497b15d54ad3bed495bf18ded00d09d6510bb399d20750ca0
 AUX 3.28.3-no-gles2-fix.patch 1442 BLAKE2B f5cdaa84bf635d3f729f77ab0d5150a35c19fb52df5fad3a2b3fa7fe7d87cc36ab31f302fe0170870e9471e0ede55875a7d741be920e884f91406334477a495d SHA512 534915f1646773182c2f724d7c07b5e92b95549627d5d5cb7efc8222209d7c990e27fff40e997f189de22409383ff71d0a05e5f4c9379697aa09a14d7aacc4cb
+AUX 3.30-eglmesaext-include.patch 2013 BLAKE2B 35f1976d73bf4190896a85346088ef98a396d28ee68da3562c5e049cfa7c7817c0abf5cbcc41f65ba535245fff05164d59da3c32d25ecfd5ee5b0e7464ac3f0d SHA512 856db08f41c77bcc72109646cd327b46fc2696e3bdebffd66b036297174b9f3f0f1eea0e95458280fc598bc533814669cdac6cffe9188b42838801aaea8f8a17
+AUX 3.32-eglmesaext-include.patch 2078 BLAKE2B cea9ba1a8d2749eb3590dd17a598aace69ad96897cbc5a6c1061c4041a8fe3809ff9f5bcc99cbdc33611a3a3319cda20f74f88434e71f03f2a1cac108185f3fb SHA512 23296f0e0b6ffd4610be3f0c6e1d524d15a5d259c5607a7ded4a8c39846f555dee92e5a8bb9c766211b758f8bc7483715a9640718bb9b7daa42905d802b2ee71
 AUX 3.32.2-no-cogl-gles2.patch 2350 BLAKE2B 3d78e408009fe7486542127162b3ea580ccc070bf46addb5799b3bcecd435d364bdf942ebfd463360be0c9105c51dcd8cb86aeae0d5599fc50f8d322376add56 SHA512 0210fdd7c5a716788918987a2e61ef765a5ae0c6268a05cfbb75ce5b469336109c4677696cab94ec12006ac4abc616222ddb62a719c2e5cac59d4833b0794beb
 DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef49a983403fd176b229a75bcc7691e83e76a3dd87b7663ece0fcdc4077becd3ffa5e33217584f156456813769646730bf9 SHA512 2eeb9dfe137d6ea65f957ed19aa5ef83106aa16a049531c0c41d3ab6afac6c1b345cc68f2a9a9c41658172cc0dde61b946e6bf2507979ff4155e79770adf5e90
 DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b
@@ -7,7 +9,7 @@ DIST mutter-3.30.2-r4-patchset.tar.xz 44820 BLAKE2B 2448dcd6bca338dbe2b87a93ca43
 DIST mutter-3.30.2.tar.xz 3725692 BLAKE2B 280b7a6319e5d4705baee965936df6f31ba8ca96ce3812cf640578c6817aaa82b6ff8fde7b2740ecd8edb6c4746f4608f997772a24d67f12fcb0c5c77fc9b29a SHA512 3890270b7eb4b8753274d30ad26693b829a69b31f36501845c59b000deb174be58b5167f6754767dba02ebc44688697fbe7344a327879a073955047b69333a2e
 DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5
 DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269
-EBUILD mutter-3.26.2-r1.ebuild 4082 BLAKE2B 3523b775405ff372d8ee13f84f75264e6b79b4b1a9e1e9873f7e13921033a8a5489be6b48d7f7a086b06b39db7cbcaa5ed545c446d109e0ef7d79c45f1f85243 SHA512 1985c0798f2dbffad04ed461dafe0ae02a3ee635feb7b9cad5308c51eaebcdb66d630e7ad7c4e1a57fa5fdda438a6682ff32186700fe78b4399807a492b51303
-EBUILD mutter-3.30.2-r4.ebuild 4866 BLAKE2B a4a73ae8eda0c858baef747c90c8ed0f31a8d5b55d37f8386b398b69beee3d56c8374098abbd91276aa3ef6a1e7c32f41ddcdc115bf6a2c88b475b6122c357b0 SHA512 cee4214b253c458686f626baf1a0bfe7067d635883964f76623a82a7ca3475d9d5e40e8a4977a80da63a71ae43f14493d28e4b9e5584fcf5ae431fa60c95a65a
-EBUILD mutter-3.32.2.ebuild 4572 BLAKE2B a1c621f50cede09389c655f493f6525bc4ee6e4f3e426ce21a4a4b80d9457d89646f29b5563a848c46b2eb77ac57ee21a9417bb3910de0b80a28f84defc188b8 SHA512 d67fb6e699a6caf6d0d79862b03da25bfe7efe45e026cce0cea23f22909a7f30a68aff51cc5b50745384d40fba882a703fd22731f1f64d893ee09d58ab7aa6c8
+EBUILD mutter-3.26.2-r1.ebuild 4109 BLAKE2B a4073e48c06b2185bf37a22c509c1959c0855cb838151d91d9b697e4679bc7ec9438b92eaa6499ecfa0f6e389415254b64621d24efa6df9c0abc1a8711ec7c14 SHA512 05266bd54e4bc87fc0bab475354dae4670da1c1d64a6db7cfae3dace6069b78515c5a904d6542cfc471f5cc056b2204dbf95cdabbdf5d49e7854b0c98d8e3592
+EBUILD mutter-3.30.2-r4.ebuild 4939 BLAKE2B d5de93e534ce0aa95ecf522144b1339165341da4c40625f76e89b448b44daaea9ba2e239f3b07895f776c8d8d6ab75f53bc398428b9b7415b8d2252cb45936b0 SHA512 58c1617818b288f9a0a212979d12e7ba841ca77faa16aa349d29a304209e30cb85fcc08c6a223f9ed0e59f9967f96d5e3807ab27aca67d26a00ab72dbe5458e5
+EBUILD mutter-3.32.2.ebuild 4616 BLAKE2B 8cd6df26f4acf74802c805735f5055eab857f32532b4ed267e1aa5b87120b6dff51d88e78c54d1745dc3244323c291c26a8abc9693a184ebf43730cb20357109 SHA512 68a16d5a4282d3db04c24914bedbf1e413910f4519db96dd5646bf1fa971c7f07c606803df34ac6c0c3bcd687f41fa8d09f1d9b099bf0a09c44acb78d016431e
 MISC metadata.xml 552 BLAKE2B 1e0ae54a432b5f0882ec17726ae8753e0168a8191c57fe204f7dbbd54ead1eb543224a46e42644508b7c69d6969d8849bf80dd16f0af2f5075f1942725851e40 SHA512 cf8d304399b4af16bcfb43c5ba3b1ea94ea9bf92be925fab584b4febf8ede21bb0f95dd590b12e1a5528f48372792da2ca31c5c469ad443c7fd20e5b8f7cc700
diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
new file mode 100644
index 000000000000..884d57cc6f05
--- /dev/null
+++ b/x11-wm/mutter/files/3.30-eglmesaext-include.patch
@@ -0,0 +1,69 @@
+From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/configure.ac           | 3 ++-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index 3be282fc2..f333b0512 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+           )
+ 
+         COGL_EGL_INCLUDES="#include <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 755ec4908..bd253c956 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -31,6 +31,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index 060c7cd2d..2fef2642e 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.23.0
+
diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
new file mode 100644
index 000000000000..c91c56235f31
--- /dev/null
+++ b/x11-wm/mutter/files/3.32-eglmesaext-include.patch
@@ -0,0 +1,68 @@
+From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: [PATCH] EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+---
+ cogl/cogl/meson.build       | 2 +-
+ src/backends/meta-egl-ext.h | 1 +
+ src/backends/meta-egl.c     | 1 +
+ src/backends/meta-egl.h     | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
+index 261955796..b0e66bff3 100644
+--- a/cogl/cogl/meson.build
++++ b/cogl/cogl/meson.build
+@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file(
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d5b..db0b74f76 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 6554be935..fdeff4f77 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index f2a816445..4591e7d85 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -28,6 +28,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
+-- 
+2.22.0
+
diff --git a/x11-wm/mutter/mutter-3.26.2-r1.ebuild b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
index 6cf45b571911..412f34a9e30f 100644
--- a/x11-wm/mutter/mutter-3.26.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.26.2-r1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0/1" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="debug gles2 input_devices_wacom +introspection test udev wayland"
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
diff --git a/x11-wm/mutter/mutter-3.30.2-r4.ebuild b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
index 8f07d9a2c971..12b4bdab7b32 100644
--- a/x11-wm/mutter/mutter-3.30.2-r4.ebuild
+++ b/x11-wm/mutter/mutter-3.30.2-r4.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0/3" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
 
 IUSE="debug elogind gles2 input_devices_wacom +introspection screencast systemd test udev wayland"
+RESTRICT="!test? ( test )"
 # native backend requires gles3 for hybrid graphics blitting support and a logind provider
 REQUIRED_USE="
 	wayland? ( ^^ ( elogind systemd ) )"
@@ -88,6 +89,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/
 	# Hack to not fail USE="-wayland,-gles2" builds with no mesa[gles2]
 	"${FILESDIR}"/3.28.3-no-gles2-fix.patch # requires eautoreconf
+
+	"${FILESDIR}"/3.30-eglmesaext-include.patch
 )
 
 src_prepare() {
diff --git a/x11-wm/mutter/mutter-3.32.2.ebuild b/x11-wm/mutter/mutter-3.32.2.ebuild
index 4685bb23716c..46696dc11813 100644
--- a/x11-wm/mutter/mutter-3.32.2.ebuild
+++ b/x11-wm/mutter/mutter-3.32.2.ebuild
@@ -18,7 +18,7 @@ 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"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944 - https://gitlab.gnome.org/GNOME/mutter/merge_requests/766
@@ -97,6 +97,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/
 	# Allow building USE=wayland without cogl-gles2 from USE=gles2
 	"${FILESDIR}"/${PV}-no-cogl-gles2.patch
+
+	"${FILESDIR}"/3.32-eglmesaext-include.patch
 )
 
 src_configure() {