gentoo resync : 19.03.2019

4 files changed, 323 insertions, 56 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index c6da0a3800b0..cd93dc5189a0 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,7 +1,8 @@
 AUX mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 1182 BLAKE2B 38cf9b073cae923cec2797ef8c7b0a5df752ef5ebb11363e5cdd8d23ccef500b1cdd7eee654d48820b78c2e53af1d65d674d2b0b15713f15f6c5f29405b95d15 SHA512 0c2c5bf3b938215ab433e698c253b35a535562ebf8f8be0dc903b4e916224b298d0381e19bae462c75733a078b929173f3074230e1953d5135b7e0721cb5117e
-DIST mesa-demos-8.2.0.tar.bz2 10071635 BLAKE2B 3619738f9aabb8a32e23e96fb3283c1215354f1b45c5c8df315d339b7d3153b0f0042bd0a5e1f45c8ca4c461284a1843615904a6f0d32b108f60c9a043cb99a8 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de
+AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.3.0.tar.bz2 10044647 BLAKE2B 66605d2be7a3e1ea30429b29c574d866961e7df6f17479647d8d4a3cb788f52701ee8c6379c208157348a265d0a3eb90b929415073fa03ba6aefc47f8a45e5c8 SHA512 9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f
-EBUILD mesa-progs-8.2.0.ebuild 1771 BLAKE2B 3a7f9b806bd7498b1d6e50dd4dacb5a24a75069a7357c5784d107da255df7cd65df4425bd9ce15a29dba87d81b0cb8b884c38a7d8c11aaffe1f1ae52d1c91f81 SHA512 406da0678a7da32b5ad7e2b51dd2de696b72726232ec2043adf1d9b511e2ba0df445b817fa7977ac5c06fc9803ae3bf1ee144690bd2c672314dc128d410bb0f8
+DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
 EBUILD mesa-progs-8.3.0.ebuild 1764 BLAKE2B 499172094f77efa68f4d250d9d8cac989f139d948979d88960dcaf878244765ff6d97edc0a395ef9cc80ba3eb702be1a0f0253ada146a52ee7f9541a56b4bcc4 SHA512 b72ae02172f62526e0b3340fb37c84f5863202b17827284bdb0854029dc32c9302ba0160ddd2db85675a33dc9390993a19a32c92fa930a17d6620d2a8a569ddf
-EBUILD mesa-progs-9999.ebuild 1729 BLAKE2B 9c5a305aaee1d42fa12f078e2e262d7f75140f4a30d2566ec0c1899dbbcde4828b5f684619666839260a913b7739017bfb92e631e71e8cae6d5042d5065cc267 SHA512 784a05d1eb56e042e9fbbcd951455816b18b24afc4f599fdf80eb67ab751c96740382fb2cabecc9a14b086fc94c0ba4d01d9b63df6e0c78b43118ef4e1d9ed4e
+EBUILD mesa-progs-8.4.0.ebuild 1690 BLAKE2B 2d68045c551cefc6a3819ccd858282b7fdacb940c9a212eb9ea9f84e7dbade0c22d0d88e373a00f0abb22f107e553f523b48e2ba110e7ff7b73c491c65c9bb0c SHA512 e2128e8efd0ee114a8a52c657b05d0ce4494efde81f83d5d38c8b76b28fa5c36b192db495398ba0806459414bd5c187fcee4721be242c7409b63a8d17f097937
+EBUILD mesa-progs-9999.ebuild 1634 BLAKE2B 23d16deafcc3cca997565213dec89a82e47647bc80be53e7287abd3814d94868bd48d1efb255a300a12eaa6cbcc488ec1f403ca914119c630cb40d5745833689 SHA512 7908691734f8d17fa25f086c97d51da5b0337a2f05e0a8b0b96ebaf251e586847dd83eee069c667bbbf66f3ce075a4b770831f070e3cf76fa00592d6460edac7
 MISC metadata.xml 475 BLAKE2B 4275e3d7871f0b092559ddf5c898bad781441267b093d55bdb14d7e9795ac070aa7d9a87cf7248d58b75798eb28a4413d588492bb6ab092ef79373434fb1652e SHA512 624480e9601ad6ad1cb996b25074c3e47a539113af39633de80c9eb0330322453f545ecfede9d602de7259d66047f507bf3a1cb115becb5f5e7d0613cb5bc675
diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch b/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
new file mode 100644
index 000000000000..ffc4d3fa28d7
--- /dev/null
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
@@ -0,0 +1,289 @@
+From aa9e66f2d1e96937c56e4141bf8c966a8a59983f Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Wed, 28 Feb 2018 11:14:34 -0700
+Subject: [PATCH 1/4] glxinfo/wglinfo: remove print_shader_limits() code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+And add queries of GL 2.0 limits.  All the VS, FS, GS limits which were
+reported with print_shader_limits() are also covered by the GL 2.0 and
+3.2 queries.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 89 +++++---------------------------------
+ 1 file changed, 11 insertions(+), 78 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 3668026b..7ffbeac5 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -378,74 +378,6 @@ struct token_name
+ };
+ 
+ 
+-static void
+-print_shader_limit_list(const struct token_name *lim)
+-{
+-   GLint max[1];
+-   unsigned i;
+-
+-   for (i = 0; lim[i].token; i++) {
+-      glGetIntegerv(lim[i].token, max);
+-      if (glGetError() == GL_NO_ERROR) {
+-	 printf("        %s = %d\n", lim[i].name, max[0]);
+-      }
+-   }
+-}
+-
+-
+-/**
+- * Print interesting limits for vertex/fragment shaders.
+- */
+-static void
+-print_shader_limits(GLenum target)
+-{
+-   static const struct token_name vertex_limits[] = {
+-      { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB" },
+-      { GL_MAX_VARYING_FLOATS_ARB, "GL_MAX_VARYING_FLOATS_ARB" },
+-      { GL_MAX_VERTEX_ATTRIBS_ARB, "GL_MAX_VERTEX_ATTRIBS_ARB" },
+-      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
+-      { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
+-      { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" },
+-      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
+-      { GL_MAX_VERTEX_OUTPUT_COMPONENTS  , "GL_MAX_VERTEX_OUTPUT_COMPONENTS  " },
+-      { (GLenum) 0, NULL }
+-   };
+-   static const struct token_name fragment_limits[] = {
+-      { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" },
+-      { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
+-      { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
+-      { GL_MAX_FRAGMENT_INPUT_COMPONENTS , "GL_MAX_FRAGMENT_INPUT_COMPONENTS " },
+-      { (GLenum) 0, NULL }
+-   };
+-   static const struct token_name geometry_limits[] = {
+-      { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, "GL_MAX_GEOMETRY_UNIFORM_COMPONENTS" },
+-      { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, "GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS" },
+-      { GL_MAX_GEOMETRY_OUTPUT_VERTICES  , "GL_MAX_GEOMETRY_OUTPUT_VERTICES  " },
+-      { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS" },
+-      { GL_MAX_GEOMETRY_INPUT_COMPONENTS , "GL_MAX_GEOMETRY_INPUT_COMPONENTS " },
+-      { GL_MAX_GEOMETRY_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_OUTPUT_COMPONENTS" },
+-      { (GLenum) 0, NULL }
+-   };
+-
+-   switch (target) {
+-   case GL_VERTEX_SHADER:
+-      printf("    GL_VERTEX_SHADER_ARB:\n");
+-      print_shader_limit_list(vertex_limits);
+-      break;
+-
+-   case GL_FRAGMENT_SHADER:
+-      printf("    GL_FRAGMENT_SHADER_ARB:\n");
+-      print_shader_limit_list(fragment_limits);
+-      break;
+-
+-   case GL_GEOMETRY_SHADER:
+-      printf("    GL_GEOMETRY_SHADER:\n");
+-      print_shader_limit_list(geometry_limits);
+-      break;
+-   }
+-}
+-
+-
+ /**
+  * Print interesting limits for vertex/fragment programs.
+  */
+@@ -627,7 +559,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
+       { 1, GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS, "GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS", "GL_ARB_tessellation_shader" },
+       { 1, GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS, "GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS", "GL_ARB_tessellation_shader" },
+ #endif
+-
++#if defined(GL_VERSION_2_0)
++      { 1, GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS", "2.0" },
++      { 1, GL_MAX_DRAW_BUFFERS, "GL_MAX_DRAW_BUFFERS", "2.0" },
++      { 1, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS", "2.0" },
++      { 1, GL_MAX_TEXTURE_COORDS, "GL_MAX_TEXTURE_COORDS", "2.0" },
++      { 1, GL_MAX_TEXTURE_IMAGE_UNITS, "GL_MAX_TEXTURE_IMAGE_UNITS", "2.0" },
++      { 1, GL_MAX_VARYING_FLOATS, "GL_MAX_VARYING_FLOATS", "2.0" },
++      { 1, GL_MAX_VERTEX_ATTRIBS, "GL_MAX_VERTEX_ATTRIBS", "2.0" },
++      { 1, GL_MAX_VERTEX_UNIFORM_COMPONENTS, "GL_MAX_VERTEX_UNIFORM_COMPONENTS", "2.0" },
++      { 1, GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS", "2.0" },
++#endif
+ #if defined(GL_VERSION_3_0)
+       { 1, GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS, "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS", "3.0" },
+       { 1, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", "3.0" },
+@@ -819,15 +761,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
+       print_program_limits(GL_FRAGMENT_PROGRAM_ARB, extfuncs);
+    }
+ #endif
+-   if (extension_supported("GL_ARB_vertex_shader", extensions)) {
+-      print_shader_limits(GL_VERTEX_SHADER_ARB);
+-   }
+-   if (extension_supported("GL_ARB_fragment_shader", extensions)) {
+-      print_shader_limits(GL_FRAGMENT_SHADER_ARB);
+-   }
+-   if (version >= 32) {
+-      print_shader_limits(GL_GEOMETRY_SHADER);
+-   }
+ }
+ 
+ 
+-- 
+2.19.2
+
+From 9804a083feb676cf810905a6826f708f54a15be2 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Wed, 28 Feb 2018 11:19:43 -0700
+Subject: [PATCH 2/4] glxinfo/wglinfo: fix VP/FP strings, indentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Print extensions string instead of program target.
+Use less indentation to match other sections.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 7ffbeac5..57dccc82 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -419,10 +419,10 @@ print_program_limits(GLenum target,
+    int i;
+ 
+    if (target == GL_VERTEX_PROGRAM_ARB) {
+-      printf("    GL_VERTEX_PROGRAM_ARB:\n");
++      printf("  GL_ARB_vertex_program:\n");
+    }
+    else if (target == GL_FRAGMENT_PROGRAM_ARB) {
+-      printf("    GL_FRAGMENT_PROGRAM_ARB:\n");
++      printf("  GL_ARB_fragment_program:\n");
+    }
+    else {
+       return; /* something's wrong */
+@@ -431,14 +431,14 @@ print_program_limits(GLenum target,
+    for (i = 0; common_limits[i].token; i++) {
+       extfuncs->GetProgramivARB(target, common_limits[i].token, max);
+       if (glGetError() == GL_NO_ERROR) {
+-         printf("        %s = %d\n", common_limits[i].name, max[0]);
++         printf("    %s = %d\n", common_limits[i].name, max[0]);
+       }
+    }
+    if (target == GL_FRAGMENT_PROGRAM_ARB) {
+       for (i = 0; fragment_limits[i].token; i++) {
+          extfuncs->GetProgramivARB(target, fragment_limits[i].token, max);
+          if (glGetError() == GL_NO_ERROR) {
+-            printf("        %s = %d\n", fragment_limits[i].name, max[0]);
++            printf("    %s = %d\n", fragment_limits[i].name, max[0]);
+          }
+       }
+    }
+-- 
+2.19.2
+
+From 6a7cee63b714699b98a31b3e57039d26506465ae Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 5 Mar 2018 09:37:17 -0700
+Subject: [PATCH 3/4] glxinfo/wglinfo: print (110) instead of empty line
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The GL_SHADING_LANGUAGE_VERSION query returns an empty string for
+GLSL 1.10.  Instead of printing an empty line, print (110).
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 57dccc82..a8ec12e7 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -745,8 +745,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
+       glGetIntegerv(GL_NUM_SHADING_LANGUAGE_VERSIONS, &n);
+       printf("    GL_NUM_SHADING_LANGUAGE_VERSIONS = %d\n", n);
+       for (i = 0; i < n; i++) {
+-         printf("      %s\n", (const char *)
+-                extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i));
++         const char *lang = (const char *)
++            extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i);
++         if (lang[0] == 0) {
++            /* The empty string is really GLSL 1.10.  Instead of
++             * printing an empty line, print (110).  For more info,
++             * see the GL 4.3 compatibility profile specification,
++             * page 628.
++             */
++            lang = "(110)";
++         }
++         printf("      %s\n", lang);
+       }
+    }
+ #endif
+-- 
+2.19.2
+
+From 27a0e5af804b3d28c51bd05ad38d25a2c8b4112d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 5 Mar 2018 09:44:41 -0700
+Subject: [PATCH 4/4] glxinfo/wglinfo: improve GL_ARB_imaging query code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Print GL_MAX_CONVOLUTION_WIDTH, HEIGHT on separate lines.
+Print GL_MAX_COLOR_MATRIX_STACK_DEPTH in same section.
+
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index a8ec12e7..92467d67 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -464,7 +464,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
+       { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH", NULL },
+       { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", NULL },
+       { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES", NULL },
+-      { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH", "GL_ARB_imaging" },
+       { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES", NULL },
+       { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES", NULL },
+       { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER", NULL },
+@@ -716,12 +715,16 @@ print_limits(const char *extensions, const char *oglstring, int version,
+ 
+    /* these don't fit into the above mechanism, unfortunately */
+    if (extension_supported("GL_ARB_imaging", extensions)) {
++      GLint d;
++      printf("  GL_ARB_imaging:\n");
+       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
+-                                          GL_MAX_CONVOLUTION_WIDTH, max);
++                                          GL_MAX_CONVOLUTION_WIDTH, &d);
++      printf("    GL_MAX_CONVOLUTION_WIDTH = %d\n", d);
+       extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
+-                                          GL_MAX_CONVOLUTION_HEIGHT, max+1);
+-      printf("  GL_ARB_imaging:\n");
+-      printf("    GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
++                                          GL_MAX_CONVOLUTION_HEIGHT, &d);
++      printf("    GL_MAX_CONVOLUTION_HEIGHT = %d\n", d);
++      glGetIntegerv(GL_MAX_COLOR_MATRIX_STACK_DEPTH, &d);
++      printf("    GL_MAX_COLOR_MATRIX_STACK_DEPTH = %d\n", d);
+    }
+ 
+    if (extension_supported("GL_ARB_texture_compression", extensions)) {
+-- 
+2.19.2
+
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
index ea5356de6cb9..a2a56e359cd4 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -1,28 +1,26 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MY_PN=${PN/progs/demos}
-MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+inherit toolchain-funcs
 
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit base autotools toolchain-funcs ${GIT_ECLASS}
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+	EGIT_CHECKOUT_DIR="${S}"
+	EXPERIMENTAL="true"
 else
-	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
+		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
 fi
-
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="egl gles2"
@@ -36,21 +34,12 @@ DEPEND="${RDEPEND}
 	virtual/glu
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${MY_P}
-EGIT_CHECKOUT_DIR=${S}
-
 PATCHES=(
-	"${FILESDIR}"/${P}-remove-EGL_SCREEN_BIT_MESA.patch
+	"${FILESDIR}"/${P}-improve-printing.patch
 )
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
-	base_src_prepare
-
+	default
 	[[ $PV = 9999* ]] && eautoreconf
 }
 
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 5d949f23bd54..248a1db51fcb 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MY_PN=${PN/progs/demos}
-MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/demos.git"
+inherit toolchain-funcs
 
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-
-inherit base autotools toolchain-funcs ${GIT_ECLASS}
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+	EGIT_CHECKOUT_DIR="${S}"
+	EXPERIMENTAL="true"
 else
-	SRC_URI="https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
+		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
 fi
-
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="egl gles2"
@@ -37,17 +34,8 @@ DEPEND="${RDEPEND}
 	virtual/glu
 	x11-base/xorg-proto"
 
-S=${WORKDIR}/${MY_P}
-EGIT_CHECKOUT_DIR=${S}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
-	base_src_prepare
-
+	default
 	[[ $PV = 9999* ]] && eautoreconf
 }