gentoo resync : 19.03.2019

26 files changed, 515 insertions, 70 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5474b7e001c9..c066bb45b295 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index c92a8acd5b74..6348b96ea478 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,3 +1,3 @@
 DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
-EBUILD listres-1.0.4.ebuild 336 BLAKE2B 075eaba7cf254aab6e44632734afcce458004d6925b1d7acea3f84a00313055760dfd67bcf29baa7a370da3bd9171dbe4ed2f97841c5a49c00ff7177ae1fd8cd SHA512 06e59504299c060d6aa89f97c6a55fe0dc89700e6d3c5517fd2654810daeb842dc07296228f2411cb2afe35d5565ba245fda818d18cbbdba1fd2df3641021f02
+EBUILD listres-1.0.4.ebuild 333 BLAKE2B f99df135f4785c20dbb5f7ba91dd3344119b36fd87c3237adfda8f33739a8a02a98ef8f60d88687e051ad9196809c9ad69fb3ef60f76256601d8e733f6e14e58 SHA512 e6981565d085abfb9e54216bbfefbd4aa28e91036b7744077454e459b977a64de16479f50f794350d55a4080276de16507abe72849e47d8ed4566af73b0d7246
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
index 5e74d8d310e1..d06a8dcf2808 100644
--- a/x11-apps/listres/listres-1.0.4.ebuild
+++ b/x11-apps/listres/listres-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit xorg-2
+inherit xorg-3
 
 DESCRIPTION="list resources in widgets"
 KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index 2d9ad4d97bf3..4df6a1dfe769 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,3 +1,3 @@
 DIST luit-1.1.1.tar.bz2 140044 BLAKE2B 5abf18955b753182198b4ebfa981e34b57707c578f1093f855e201b69b04b6a70fe189c0dcda43338a07d47f892eb3acb8278aba0e739d00e3cf164806d56ca4 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6
 EBUILD luit-1.1.1.ebuild 667 BLAKE2B bf9567c21c799e5babec6f57a5552735f101bfc901c9dfdddc4e07c9b367f4f409ccc48b65029092d50cf1056137ee651bfd6a2e3c0a6b42c674338cca84c9ce SHA512 16c37b80ab3b53553e852f4122a4f593ccbdd21e39c181464ced8c0ee0ed18335299b658bb3c3a4c3db69cfa9d407fee6b86da4b6552e797f1825a1b8e058375
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
index e943b72b8a48..15fd2f3a22be 100644
--- a/x11-apps/luit/metadata.xml
+++ b/x11-apps/luit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 </pkgmetadata>
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
 }
 
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index 45ac133a6700..782f243b9d32 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,6 @@
+AUX mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch 1396 BLAKE2B d30ad031ae808179fc73b0bceee1d8c227fd8f624a677114621338ca886d5c7c554fe38f82381f3deb650b6d2061d16ca0410a797be32931e6258146e172b868 SHA512 cdf672907371ee7347c61d825270774301857f656cdad682810bada1c6d955b09da383d83a88168c2f9469b010688ad96a75fd76a091f7f92eca0dd6e435b73b
 DIST mkfontscale-1.1.3.tar.bz2 144386 BLAKE2B 8cf4a61472b9357888ef355e89c3087102c4928884ecc6b5671202ad09284a2dc188b81faba6b1727b1a28ccaa6c3c36649c53659faf7a3fae4a2b32ab5a2420 SHA512 509e2f9cd55cf87cc3968c8767bf3f2386016278db8b7be75b7df34bf61f52519dd2778f3b9881ffbe30cc2fe26089c0a5b2c33af46bc7727f46dad83f030a62
 DIST mkfontscale-1.2.0.tar.bz2 150646 BLAKE2B 7f4a0b279f0759b2d8faac584603488c9e405b92b43457b301aa6ba252bdef2cbfe65f58a1fb837e61113cfea139b6fcde1084450333864175e2cc4da84b6626 SHA512 3d02db7e031fe6730a07ed481d2a744592a7d542d75fedf55a4f5ad50d03d92e3534b4105af09d0a8f863bdc0321758222baf5b943de77ce4972978d86a5013f
 EBUILD mkfontscale-1.1.3.ebuild 600 BLAKE2B 1be6ee6b55382ed63fc6464fd83d3a6d90cd39c41952e0a35c2e46f3d88a41e5baed46669260bbd0084073f647ffb66ab18904dad7d1579c4f7afb035b42cb8a SHA512 222722cc686d874d3f457e6a908084fd5dfbeaff3a438f94cfc2f86b2545fec009a559fdfa68fd2ae9a86d80f13e93e980d0194cd858407f3f7ba2d49701cddd
-EBUILD mkfontscale-1.2.0.ebuild 636 BLAKE2B 2ae337a35debc23962c0f1e45bdb4b1a3c45cbc45a888a6eada210b265797e8398be9eecd02288b027866771d5598dde9f09caa396083db8ace8d71089caf3c3 SHA512 7d9d8f8ea83e0c3e955bca7af4bf6e8beca982090ec16fa46a5227dc58162ed3a56adabfae97f5349a004530ebb32b1314d471ed5432ba161726ca94f377dfa0
+EBUILD mkfontscale-1.2.0-r1.ebuild 758 BLAKE2B 3da498f61aa28df9e8512c7f1e1045d3416cd1b6247cdbf8b10518dceaa60ac80ed854c93e6c2fb490ff40eaec6351b2bb36254b34dbff9676a210638763bdac SHA512 ef7d582c8e2e6d1d3285009e5c103ed6685eafc63845eda6038557efbdf8469cb2cd98c7d501d321f8c9d53efab1b04c07aed650e5888e3f9595e535d74e263a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch b/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch
new file mode 100644
index 000000000000..fdeea14e31dc
--- /dev/null
+++ b/x11-apps/mkfontscale/files/mkfontscale-1.2.0-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch
@@ -0,0 +1,51 @@
+From 29cab25240cf30f546671f265167a2eeadfd4c75 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu, 7 Mar 2019 13:23:00 -0800
+Subject: [PATCH app/mkfontscale] Revert "Use autoconf instead of sed to
+ substitute @bindir@ in mkfontdir.in"
+
+This reverts commit 1f9d14bec07092d62da29a5a233cefbf84d47289.
+It caused https://gitlab.freedesktop.org/xorg/app/mkfontscale/issues/5
+---
+ Makefile.am  | 9 ++++++++-
+ configure.ac | 1 -
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 7bb11ea..c36d171 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -23,6 +23,13 @@ SUBDIRS = man
+ bin_PROGRAMS = mkfontscale
+ bin_SCRIPTS = mkfontdir
+ 
++CLEANFILES = $(bin_SCRIPTS)
++EXTRA_DIST = $(bin_SCRIPTS:=.in)
++DIR_SUBSTS = -e 's|@bindir[@]|$(bindir)|g'
++
++mkfontdir: mkfontdir.in
++	$(AM_V_GEN)$(SED) $(DIR_SUBSTS) < $(srcdir)/mkfontdir.in > $@
++
+ AM_CPPFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE
+ AM_CFLAGS = $(CWARNFLAGS)
+ mkfontscale_LDADD  = @MKFONTSCALE_LIBS@
+@@ -59,4 +66,4 @@ lint:
+ 	$(LINT) $(ALL_LINT_FLAGS) $(mkfontscale_SOURCES)
+ endif LINT
+ 
+-EXTRA_DIST = README.md
++EXTRA_DIST += README.md
+diff --git a/configure.ac b/configure.ac
+index 5f5e463..7363bba 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,6 +63,5 @@ XORG_WITH_LINT
+ 
+ AC_CONFIG_FILES([
+ 	Makefile
+-	mkfontdir
+ 	man/Makefile])
+ AC_OUTPUT
+-- 
+2.19.2
+
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild
index c0f737d6f423..2a83d1cb6f7e 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.0.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.0-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+XORG_EAUTORECONF="yes"
 inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
@@ -15,11 +16,15 @@ COMMON_DEPEND="
 	media-libs/freetype:2
 	sys-libs/zlib
 	app-arch/bzip2"
-DEPEND="x11-base/xorg-proto"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
 RDEPEND="${COMMON_DEPEND}
-	${DEPEND}
 	!<x11-apps/mkfontdir-1.2.0"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-Revert-Use-autoconf-instead-of-sed-to-substitute-bin.patch
+)
+
 XORG_CONFIGURE_OPTIONS=(
 	--with-bzip2
 )
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 8b2c4735a0e5..b9f47c393b64 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,3 +1,5 @@
 DIST x11perf-1.6.0.tar.bz2 191086 BLAKE2B accdbc4899a28a76bc1487d2f6fa04f5309337eee5e650455c9c3bd4a5187cd7ad42565bb2713c7f5974542bf8b9a2297db0ada81659479487b4a1a2e6227f25 SHA512 a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623
+DIST x11perf-1.6.1.tar.bz2 189446 BLAKE2B 2a36bea5e1c9a414d9a1ce798e4f0481aeab86522c5924fb7520c0bc917b832f3e4c63c70a5430cd3fd92cac4374691a64db4542180e0917a0617bae7f783a6f SHA512 b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b
 EBUILD x11perf-1.6.0.ebuild 418 BLAKE2B b2940ce8477cfdfd28963bb373b4801caf6fb4c7401f2f3a82618063c6430ba8f6216743385c26cbba5fb042bde5d260637ec9c5315e7ec533e2fb23f64d4116 SHA512 6e2adbd3d46ea817008f6a06367d287a6165f55fff4f98486ac471ef3b86916cff6e299b77f48a4bdf781f6a1b350deebfdd86d3019e9a9302cd6e32aafa6877
+EBUILD x11perf-1.6.1.ebuild 446 BLAKE2B 8e1b8149abd68e36e052f899220e783fe7addc9ece66abddd9f847808c2f4f48c3b59cf4673ece5607bba1104105f6930e6c14a74480b3341439ffacd1beefef SHA512 d31ba17090f85ff56870b5377e363229c57b71240098b80f3f09aff149fcae7d13b8384000035f6d9b416f3e2389148b4c14bf505f7520f08f22cc9bce68145e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/x11perf/x11perf-1.6.1.ebuild b/x11-apps/x11perf/x11perf-1.6.1.ebuild
new file mode 100644
index 000000000000..e16a97600d85
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.6.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X rendering operation stress test utility"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXft
+	x11-libs/libXrender
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index bb95ef0237c4..9d3fba963c0c 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,5 +1,7 @@
 DIST xditview-1.0.3.tar.bz2 143012 BLAKE2B 07b52ae693625e7ba916921668067b22ac516be010fcd554fee4f23cf247ab23ff93b328473efb33545dd01454b28255b61e1b38b9318c51eceabedcd4e8561a SHA512 74b7a7a483eda731840d2150bfab75628b91407f176b6cb64b03b992c05b6ff2426837489a12b12566b05450fc446e7433a541a4d0c52e27f843bef06fc91f67
 DIST xditview-1.0.4.tar.bz2 148842 BLAKE2B 307d6c3eea0523f035e6cf3ebfbaa64645972613c8276735dd4ef0b446ed743a2ee42e6a9e63a611afc750cc9d7e3b3bb2937fc3ec3d7fcc65fdfc4177ca658d SHA512 7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2
+DIST xditview-1.0.5.tar.bz2 151313 BLAKE2B 53d96b874230dde6f4f13a7a61420e1b9da86fea18e49e7084212353d9de64aab30bda6bc790282127af961db66873d6fafec1f6c7a986776c30eaad260ad98f SHA512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d
 EBUILD xditview-1.0.3.ebuild 336 BLAKE2B 154336bc4362495552cea84695f67088b9811edf6553aa5bd4909fcba98fb79ada25af1697acd80b178818b215cd321ec49d7d42017edc542a10d41e3b2cd188 SHA512 75d962edbd5ffb82571c0793f4a7a715764d05c2fa38f24297e10c7a42d7b8dff02cbcbc7ccff995413b60a927e7ea4fb456e3422c55c3bb6365cb3095d56e3f
 EBUILD xditview-1.0.4.ebuild 336 BLAKE2B 84d6536945a9c50ee1a944c355fdb9b83734a3c2fe45d189e7666148f988b44a2cd762869dabc26bd16c4ab6bd204c5e3ffa0198fb48fbc0393484608a2b4328 SHA512 ff0ad2ea95412ccf84a575978295395b0ecb9ecb1220f3c8e047a39e04477e4d4092594410cc6479147c012b2b25acec13cb4d2ff89c59f51cb209c1e8241053
+EBUILD xditview-1.0.5.ebuild 340 BLAKE2B ddb2cf9de973359e74a322681a038295aaf61c8d1f73b6b2a332067df05a0dda80a331593b4ba60fb4c761dd722bd50f4b446c2518bc339a6d58a714b4576ede SHA512 19a7e2fe08bf17cc1ac10348042061385cb2629846869c60db1d1ed01b5a8383ae84d213833790fd53668e646adea61c12f73f8eeefad29bf783d6d5c2472ede
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xditview/xditview-1.0.5.ebuild b/x11-apps/xditview/xditview-1.0.5.ebuild
new file mode 100644
index 000000000000..a50a37525169
--- /dev/null
+++ b/x11-apps/xditview/xditview-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="display ditroff output"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 65a8adedc4f3..412d42bd4477 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -8,5 +8,5 @@ AUX xdm-consolekit.patch 5712 BLAKE2B 0526aad6742c86d878ca01204a2e6c781dc4532f7d
 DIST xdm-1.1.11.tar.bz2 446612 BLAKE2B ce9bed568e036a882ecc56d75f7ce8646d14ae00c754d6e5542ea5b186c3ef1ce8499e2d70190b4fbc4b344e0c70fd36deab5aacc5f1f55501db709300aee520 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5
 DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
 EBUILD xdm-1.1.11-r3.ebuild 1807 BLAKE2B 1c98b7e9ea0bb96ccd82c355d3e4fb16641eadc41167fd5d559927405c95b7153f0aea14d3a906540d053c2f88d289330007bf312c1e8470fa98d04efd68c78c SHA512 7d30353885804970be0e0fd31c455d9ff52615ad1ae2611da2ab30705e048114221bf78de639bc05923ea3eeca4af251fa3b6935e7100c3a987db6e01532ab8a
-EBUILD xdm-1.1.12.ebuild 1962 BLAKE2B e1a1052aa6085fe6fd9dcba43cd36ef12c4f11de44be96154c4e088ac3a6a452e7d0f1c62a76bc9f30420b7d26f305307cefae3acb3cd8918cc097d170214292 SHA512 479c779494675dc951e1f0f9c54fc58ea514beb1743544f4949723d92099008c8955b4148f14313f3cccf717f462d74e547e10cbfa594155337496a713062822
+EBUILD xdm-1.1.12.ebuild 1953 BLAKE2B 6670f63cf1242d0e959a2b85ca3787fb0c3f7257b32a6498052edbe1d5a2afe2a99cefe984a1a7068ebf0e172be2dd7059067ba712c4ec29a178917f8dcd0ec2 SHA512 6a231e58f312d34a82b1f7dc80700e321f58cb5bde7a5ebb4e76fbdbd94e3358af2bd49f6dcc6e8c952f0143d5c48c8ebe36747ec5613af094326f7a9ccbf47c
 MISC metadata.xml 414 BLAKE2B 6e4d9441a5a392ed6a989fbfd08b9e664dfd6843fa6b6f4f9644b4ace383cd5ed8ea859a0f6e1d34580fd8acac06333eb566bf6460144128494a046991fe08c0 SHA512 f3acd7a9e8f8e1d93ca5c657409efbaeb5695dc81528926d9ecdc517cff8a7c2f597b9ac8b856cb81246ff39c2ceaac5bd72587db68a5d260c3117599e24c38c
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index e7d6bd756525..6ac0148c9143 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 XORG_EAUTORECONF=yes
 
-inherit multilib xorg-3 pam systemd
+inherit xorg-3 pam systemd
 
 DEFAULTVT=vt7
 
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
index 8bdfe5a83bde..646a7111e3d2 100644
--- a/x11-apps/xfd/Manifest
+++ b/x11-apps/xfd/Manifest
@@ -1,3 +1,5 @@
 DIST xfd-1.1.2.tar.bz2 137632 BLAKE2B dc84377efc97a3ed84447560c05d180f22631dc0e88342d5ea306a954df1557bba17ce2492a0e498e145006b68d62408b4212597a07d9ea71711057aa33e198b SHA512 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745
+DIST xfd-1.1.3.tar.bz2 141312 BLAKE2B 742b6a1fff10593252dc27aa352ac500d9a17952e0415de80ea265322cfff7ef2c4c2435005a82c12f1b50003920322cfa27dab3af30b60575d4ae7a1b20f787 SHA512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0
 EBUILD xfd-1.1.2.ebuild 421 BLAKE2B db04c670b311ba6f2dbb573e0baafd06ae3bc194f10de10fb60a34289774b08cb2846b37fa07157c896ca4d390782ef5199b37c8e01a859f2b24578ea88a31e5 SHA512 6e6b30c95188d3cf25984cb7047b98430e7e37253cc47bc967f191ac8a21bb466b34f7cc5da4b8b86bcff1c7958d4e66b221c4c9b4c0e80b885c54601cb96916
+EBUILD xfd-1.1.3.ebuild 433 BLAKE2B 3bea9680aea249b5ee5044a6680935c1c695fbe39b8ebecd6552dea3e5c8fae49a6aad82c3b056164df13518ba3ea1ee3a7d9f87d2bc4be3fc5798fe59a08106 SHA512 4b9518991a5010617ef95abd2710d397b6d4fadad6921fe67f4ed18041892045977a0d22107af3824134da2ac46bd4f96d22b896f488f77ffc015816ff07b0ab
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xfd/xfd-1.1.3.ebuild b/x11-apps/xfd/xfd-1.1.3.ebuild
new file mode 100644
index 000000000000..1cc884518a97
--- /dev/null
+++ b/x11-apps/xfd/xfd-1.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X.Org xfd application"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="media-libs/freetype:2
+	media-libs/fontconfig
+	x11-libs/libXft
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXaw"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index c7cb0418f2dc..2dbc14554bbb 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,3 +1,5 @@
 DIST xlogo-1.0.4.tar.bz2 125967 BLAKE2B 721de083217e420151771fe91b6b52d0f6cbe56427859d79e6ec1d1d1c3c9fbfa1d35015ab364b8c00af66f65aa987aebebfa7fe2738e661d9fd52224906d084 SHA512 cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d
+DIST xlogo-1.0.5.tar.bz2 135608 BLAKE2B eeaa9dfdca57bd5b60035dc31981f3b3e390862b5e8f695422505059f657cfe727d491c757e8ef4dba4a913179c92827741f04e3fc6765b0257d63f1382fc69f SHA512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b
 EBUILD xlogo-1.0.4.ebuild 456 BLAKE2B 189943d17d0717798e2548871489482f4737f3d2c555fa80c2fe7f872188b18e7d20011a022fecad0fabb45f3235b72638f7632ee27b017813799b55d4509a71 SHA512 0a5e2bc7349a76121bf014bf7cc1e2ac08882b0c85b0cac8bd312d846724ddefa75367e1e8e22957ebbf050e9ec4f3f338643e7cb91d1f490876ad5bdc74c585
+EBUILD xlogo-1.0.5.ebuild 464 BLAKE2B 35ff036187a4b38c7e0ecbc90e6c40825f9b836d1fc8cb75bb8b36afd0a2111726f5251b5c5135d2b2ef0996cca2451728db574acceebeebe6e83a1264b61242 SHA512 55e25f9ac815272b8a823784d2665567b77ffed872f572d2e74f19fa72dfbd16a41ff0000824286ec63c48a62fd5456783a7755e5b3e4cd4dde25d1216c494b9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xlogo/xlogo-1.0.5.ebuild b/x11-apps/xlogo/xlogo-1.0.5.ebuild
new file mode 100644
index 000000000000..4153dc24bc6e
--- /dev/null
+++ b/x11-apps/xlogo/xlogo-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="X Window System logo"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXaw
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS="--with-render"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index 0e55bf8c9a9a..0949eaeb5de8 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,3 +1,5 @@
 DIST xmore-1.0.2.tar.bz2 107340 BLAKE2B 35dd82edf2f00d861d4b8df4175626fe7c72f2e27b0a0621184f86bdd57d84406fbd1d4724466779e31ae58b0045bb71b669b0524d2909c9a87f28598d14ee5f SHA512 718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb
+DIST xmore-1.0.3.tar.bz2 127587 BLAKE2B f59c9b6b7a134694dc7df5540c75a4331785ef7da0c5b40618923a3d1d53a543f7a54b7b8383f2e816b4f478056f6c0b1c6a4ce212c50b4fca75a307057c3f54 SHA512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3
 EBUILD xmore-1.0.2.ebuild 332 BLAKE2B d1872b27e20c024c96152ed7db9c79d510e2dde9d33379032be35c6b32f0c8b4679a5c5f808f535aa6b2a7323a144352b9a34b6b455f97d071b5d265ccd8d3d4 SHA512 de96bd49e3ae92e68cb58835f37dd43d29811d08b4577eeaf43a9f671216d959187e96a8867516f79e3e72fd644b272a93a0088419fecf40c06487e1eb48b49d
+EBUILD xmore-1.0.3.ebuild 337 BLAKE2B 3e337292c988482dbb09bf2e06dde283e064a86adc9f80500999c9d76becf8ee85b1559f3d49ebeccef778aa9aad30ccbf683822dcc7540dac184c5a0a7be478 SHA512 23df4200faa3d52f30f6f0b1942702c10b489919c544474dfd0811d503286e63bf12b8a62f13c5cb5ed564b93228a93bcd175708692127fccc278656e78f0721
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xmore/xmore-1.0.3.ebuild b/x11-apps/xmore/xmore-1.0.3.ebuild
new file mode 100644
index 000000000000..48c94ef7a873
--- /dev/null
+++ b/x11-apps/xmore/xmore-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="plain text display program for the X Window System"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libXaw
+	x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 48bba5217a65..e5dc4bf66563 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,5 +1,7 @@
 DIST xprop-1.2.2.tar.bz2 145556 BLAKE2B f1560f7688b4c9a5c2cc55a29aa15181f09d65883f44f63a3761988cc1b905c768a1cfebe9303b3f5e12d0c84e0e6a0ced79d69e49e2d5ab99087c16157d4c41 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572
 DIST xprop-1.2.3.tar.bz2 149202 BLAKE2B 57c6459b873ecb91adb2bd01c350918abf95b8eb33ad1de05ded1f49350bbf3be2c46f597d9f559d473c9dd41dab2b327ca2c3e8a0fe742498e5a2c94ca1ca22 SHA512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a
+DIST xprop-1.2.4.tar.bz2 149930 BLAKE2B 93bd20c7c91d6abd9e2fdeca7864b9885ae7248c7ee3ef80a5efa1706bfef2220244b1443764fdbc042f66be8d589b111fd942c732922f05f4143e1c893da183 SHA512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7
 EBUILD xprop-1.2.2.ebuild 422 BLAKE2B a8ed96999843e54ec1bd01955e07ccff6da81d607fb1b3863d402e4bbcc9912c293f4e85b9c77874729d23370c6539604d46db45252f43f55957ef80499b0314 SHA512 4b54e9d116c08282c8d08f321d2725a76b48d8afb4a38916682fcd8b2c2a3e726e6609a3e7de0546bdb9ee06fdb6bf4b4e81f2e4fa37080ffc13f4f24810de17
 EBUILD xprop-1.2.3.ebuild 422 BLAKE2B a8ed96999843e54ec1bd01955e07ccff6da81d607fb1b3863d402e4bbcc9912c293f4e85b9c77874729d23370c6539604d46db45252f43f55957ef80499b0314 SHA512 4b54e9d116c08282c8d08f321d2725a76b48d8afb4a38916682fcd8b2c2a3e726e6609a3e7de0546bdb9ee06fdb6bf4b4e81f2e4fa37080ffc13f4f24810de17
+EBUILD xprop-1.2.4.ebuild 432 BLAKE2B e96094e7105bc00a26239965bd8116afae5398d8ec6a9288104bbc30c1b1dd5c38133afcc8812a56afd3fc48d11d8a33f09084fb13e2077d58d6c2ff908e2315 SHA512 2770644549af7497bfc74715dfe02e7a7f36695de76f1b5239dac94324da061ab51979f7db22982747d264d51af658d1fccfe40dff33cdee2a78058b97842f85
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xprop/xprop-1.2.4.ebuild b/x11-apps/xprop/xprop-1.2.4.ebuild
new file mode 100644
index 000000000000..744d68586825
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.2.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="property displayer for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"