gentoo resync : 22.05.2018

10 files changed, 5 insertions, 754 deletions

diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index fd4b077bd48d..55eacb1d97f2 100644
--- a/x11-base/Manifest.gz
+++ b/x11-base/Manifest.gz
diff --git a/x11-base/xcb-proto/Manifest b/x11-base/xcb-proto/Manifest
index d393e785e15b..d7717e39d2ce 100644
--- a/x11-base/xcb-proto/Manifest
+++ b/x11-base/xcb-proto/Manifest
@@ -1,8 +1,3 @@
-AUX xcb-proto-1.12-make-whitespace-usage-consistent.patch 8518 BLAKE2B 599038dc8a91ef9a5c345767d35784815f1ece4f233781576d2684f7ec1aeacbcaf9e971d6fbf1ad3537a618ef98d768c34a4b51c070dc72869621dd177ce42d SHA512 de0b5eda7ea2a0a19743305ca080c7492f90360a3f178a6d12724a3eb6abc48f7f6b687f0ca3c6478c9b43fa722f82ae69cc1cb150761014969a4777fc06e158
-AUX xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch 3328 BLAKE2B 30b6fd8e44056b62a67442612c905f2ac2dea5ff67f549326ef3c00ad526efac13c0a4708b38434497c8106b84d369f49812095dafb6d6a286a2c5075a24945c SHA512 b541295721d8cf87d1079c3366401dff3830bc953082b9f9c0376163ef5893a1f111d278904caed8d54f2796b255c6f12043d7353bd3605e040a2a355e76f15e
-AUX xcb-proto-1.12-update-xml-schema.patch 6196 BLAKE2B 86026b2845d897fa58101915433a73e733fae54f9526892f2bf5ed0cfd710e5b06219054f8668df8ae4a9b6d8df7fab5491f3f1fef50651423453c4bd0ddc024 SHA512 7b4875e528fa0bd07a1d4ab214b7fa059ae8180b02262ca608bb6d07f98ef05bc66e5188b84cb2ab795589328d2ab8a63282785611d073f09e31b554d264fab4
-DIST xcb-proto-1.12.tar.bz2 153890 BLAKE2B cdb4b245e838ca56bfdcaa9a0618ce45e5d4da8ee10f7ae3389ff297325c3d81ba446a6385737cc9b053ecb06a0c829d99ab27dceecfec49ac1591c25c832c46 SHA512 1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c
 DIST xcb-proto-1.13.tar.bz2 151981 BLAKE2B 04d90838f8a892103e6d7aa807f1b0b6794f1538c6c986ad3cba67cff3a963ff680e45c2137c5d6330736a3aa1a387d61fc247f23487de9dada2f4013590b4a1 SHA512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7
-EBUILD xcb-proto-1.12-r2.ebuild 1726 BLAKE2B 4e1e6655bd74fb4234f56b710080f60d8e48af80d1bb13b3bf3c9884eb759a4df8b764feaa519961d473c1353cdd78a14ff27f79b027548b7aed52119fa29c84 SHA512 5b5090d8a5534738cab449688ad37b251896c1f375a3c19eb5f6744e5303dae820e9af7ba6e4fea6c6ac5076358fd1de2668e5c06b2a7dfdeae45bce1a1a2b6f
-EBUILD xcb-proto-1.13.ebuild 1543 BLAKE2B a233b9bbad851716aa1cd6da840b266f3e1a7a497d8f0f0c0fc806fb378b5b11cfa4739d561bfcebf91a5678165ebc6159c9e5daa2ba4c39af6011f754de4dd0 SHA512 ff34db0113cd361f4aa37a9a1561cd8ddc0d53c110e5e9e0dc2fc2569bc10460b9f6a41f13b6ea40051093bc69bba7e92299f9a7f98df57e0a235c504a9f1ca0
+EBUILD xcb-proto-1.13.ebuild 1542 BLAKE2B 63c7193c9c63926e8ce4daeb15023384e09eca902fecb3c820da330d4b8562a9eee6e2e57603c7c355b0d9f4ad784cfbc6eb3bf4724f76e0ad3bec6095081f0e SHA512 720dd077157d2fb6afb4778d784526c7eca861eadfa4322fa4eb7b072c1d24bccaefae975088956407ae9b0c1b6ca2d722d74aa7882ce5e79fa519c16b264385
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
deleted file mode 100644
index 695794864da7..000000000000
--- a/x11-base/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@NetBSD.org>
-Date: Thu, 19 May 2016 17:30:04 +0200
-Subject: Make whitespace use consistent.
-
-At least python-3.5.x complains about this forcefully.
-
-Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/xcbgen/align.py b/xcbgen/align.py
-index 5e31838..d4c12ee 100644
---- a/xcbgen/align.py
-+++ b/xcbgen/align.py
-@@ -16,12 +16,12 @@ class Alignment(object):
-         return self.align == other.align and self.offset == other.offset
- 
-     def __str__(self):
--	return "(align=%d, offset=%d)" % (self.align, self.offset)
-+        return "(align=%d, offset=%d)" % (self.align, self.offset)
- 
-     @staticmethod
-     def for_primitive_type(size):
--	# compute the required start_alignment based on the size of the type
--	if size % 8 == 0:
-+        # compute the required start_alignment based on the size of the type
-+        if size % 8 == 0:
-             # do 8-byte primitives require 8-byte alignment in X11?
-             return Alignment(8,0)
-         elif size % 4 == 0:
-@@ -33,7 +33,7 @@ class Alignment(object):
- 
- 
-     def align_after_fixed_size(self, size):
--	new_offset = (self.offset + size) % self.align
-+        new_offset = (self.offset + size) % self.align
-         return Alignment(self.align, new_offset)
- 
- 
-@@ -41,7 +41,7 @@ class Alignment(object):
-         '''
-         Assuming the given external_align, checks whether
-         self is fulfilled for all cases.
--	Returns True if yes, False otherwise.
-+        Returns True if yes, False otherwise.
-         '''
-         if self.align == 1 and self.offset == 0:
-             # alignment 1 with offset 0 is always fulfilled
-@@ -55,9 +55,9 @@ class Alignment(object):
-             # the external align guarantees less alignment -> not guaranteed
-             return False
- 
--	if external_align.align % self.align != 0:
-+        if external_align.align % self.align != 0:
-             # the external align cannot be divided by our align
--	    # -> not guaranteed
-+            # -> not guaranteed
-             # (this can only happen if there are alignments that are not
-             # a power of 2, which is highly discouraged. But better be
-             # safe and check for it)
-@@ -72,7 +72,7 @@ class Alignment(object):
- 
-     def combine_with(self, other):
-         # returns the alignment that is guaranteed when
--	# both, self or other, can happen
-+        # both, self or other, can happen
-         new_align = gcd(self.align, other.align)
-         new_offset_candidate1 = self.offset % new_align
-         new_offset_candidate2 = other.offset % new_align
-@@ -83,8 +83,8 @@ class Alignment(object):
-             new_align = gcd(new_align, offset_diff)
-             new_offset_candidate1 = self.offset % new_align
-             new_offset_candidate2 = other.offset % new_align
--	    assert new_offset_candidate1 == new_offset_candidate2
--	    new_offset = new_offset_candidate1
-+            assert new_offset_candidate1 == new_offset_candidate2
-+            new_offset = new_offset_candidate1
-         # return the result
-         return Alignment(new_align, new_offset)
- 
-@@ -92,44 +92,44 @@ class Alignment(object):
- class AlignmentLog(object):
- 
-     def __init__(self):
--	self.ok_list = []
--	self.fail_list = []
--	self.verbosity = 1
-+        self.ok_list = []
-+        self.fail_list = []
-+        self.verbosity = 1
- 
-     def __str__(self):
--	result = ""
-+        result = ""
- 
--	# output the OK-list
--	for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
--	    stacksize = len(callstack)
-+        # output the OK-list
-+        for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list:
-+            stacksize = len(callstack)
-             indent = '  ' * stacksize
--	    if self.ok_callstack_is_relevant(callstack):
-+            if self.ok_callstack_is_relevant(callstack):
-                 if field_name is None or field_name == "":
--	            result += ("    %sok: %s:\n\t%sbefore: %s, after: %s\n"
--		        % (indent, str(type_obj), indent, str(align_before), str(align_after)))
--	        else:
--		    result += ("    %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
--		        % (indent, str(field_name), str(type_obj),
--		           indent, str(align_before), str(align_after)))
-+                    result += ("    %sok: %s:\n\t%sbefore: %s, after: %s\n"
-+                        % (indent, str(type_obj), indent, str(align_before), str(align_after)))
-+                else:
-+                    result += ("    %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n"
-+                        % (indent, str(field_name), str(type_obj),
-+                           indent, str(align_before), str(align_after)))
-                 if self.verbosity >= 1:
--		    result += self.callstack_to_str(indent, callstack)
-+                    result += self.callstack_to_str(indent, callstack)
- 
--	# output the fail-list
--	for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
--	    stacksize = len(callstack)
-+        # output the fail-list
-+        for (align_before, field_name, type_obj, callstack, reason) in self.fail_list:
-+            stacksize = len(callstack)
-             indent = '  ' * stacksize
--	    if field_name is None or field_name == "":
--	        result += ("    %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
--		    % (indent, str(align_before), indent, str(type_obj), indent, reason))
--	    else:
--		result += ("    %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
--		    % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
-+            if field_name is None or field_name == "":
-+                result += ("    %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n"
-+                    % (indent, str(align_before), indent, str(type_obj), indent, reason))
-+            else:
-+                result += ("    %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n"
-+                    % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason))
- 
-             if self.verbosity >= 1:
--	        result += self.callstack_to_str(indent, callstack)
-+                result += self.callstack_to_str(indent, callstack)
- 
- 
--	return result
-+        return result
- 
- 
-     def callstack_to_str(self, indent, callstack):
-@@ -137,41 +137,41 @@ class AlignmentLog(object):
-         for stack_elem in callstack:
-             result += "\t  %s%s\n" % (indent, str(stack_elem))
-         result += "\t%s]\n" % indent
--	return result
-+        return result
- 
- 
-     def ok_callstack_is_relevant(self, ok_callstack):
-         # determine whether an ok callstack is relevant for logging
--	if self.verbosity >= 2:
--	    return True
-+        if self.verbosity >= 2:
-+            return True
- 
-         # empty callstacks are always relevant
--	if len(ok_callstack) == 0:
-+        if len(ok_callstack) == 0:
-             return True
- 
--	# check whether the ok_callstack is a subset or equal to a fail_callstack
-+        # check whether the ok_callstack is a subset or equal to a fail_callstack
-         for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list:
-             if len(ok_callstack) <= len(fail_callstack):
-                 zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)])
--		is_subset = all([i == j for i, j in zipped])
--		if is_subset:
-+                is_subset = all([i == j for i, j in zipped])
-+                if is_subset:
-                     return True
- 
-         return False
- 
- 
-     def ok(self, align_before, field_name, type_obj, callstack, align_after):
--	self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
-+        self.ok_list.append((align_before, field_name, type_obj, callstack, align_after))
- 
-     def fail(self, align_before, field_name, type_obj, callstack, reason):
--	self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
-+        self.fail_list.append((align_before, field_name, type_obj, callstack, reason))
- 
-     def append(self, other):
--	self.ok_list.extend(other.ok_list)
--	self.fail_list.extend(other.fail_list)
-+        self.ok_list.extend(other.ok_list)
-+        self.fail_list.extend(other.fail_list)
- 
-     def ok_count(self):
--	return len(self.ok_list)
-+        return len(self.ok_list)
- 
- 
- 
--- 
-cgit v0.10.2
-
diff --git a/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch
deleted file mode 100644
index fed0745a5e9c..000000000000
--- a/x11-base/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <wiz@NetBSD.org>
-Date: Thu, 19 May 2016 17:30:05 +0200
-Subject: print() is a function and needs parentheses.
-
-Fixes build with python-3.x.
-
-Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py
-index c3b5758..b83b119 100644
---- a/xcbgen/xtypes.py
-+++ b/xcbgen/xtypes.py
-@@ -501,7 +501,7 @@ class ComplexType(Type):
-                 int(required_start_align_element.get('align', "4"), 0),
-                 int(required_start_align_element.get('offset', "0"), 0))
-             if verbose_align_log:
--                print "Explicit start-align for %s: %s\n" % (self, self.required_start_align)
-+                print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align))
- 
-     def resolve(self, module):
-         if self.resolved:
-@@ -592,7 +592,7 @@ class ComplexType(Type):
-                 if verbose_align_log:
-                     print ("calc_required_start_align: %s has start-align %s"
-                         % (str(self), str(self.required_start_align)))
--                    print "Details:\n" + str(log)
-+                    print ("Details:\n" + str(log))
-                 if self.required_start_align.offset != 0:
-                     print (("WARNING: %s\n\thas start-align with non-zero offset: %s"
-                         + "\n\tsuggest to add explicit definition with:"
-@@ -619,12 +619,12 @@ class ComplexType(Type):
-             for offset in range(0,align):
-                 align_candidate = Alignment(align, offset)
-                 if verbose_align_log:
--                    print "trying %s for %s" % (str(align_candidate), str(self))
-+                    print ("trying %s for %s" % (str(align_candidate), str(self)))
-                 my_log = AlignmentLog()
-                 if self.is_possible_start_align(align_candidate, callstack, my_log):
-                     log.append(my_log)
-                     if verbose_align_log:
--                        print "found start-align %s for %s" % (str(align_candidate), str(self))
-+                        print ("found start-align %s for %s" % (str(align_candidate), str(self)))
-                     return align_candidate
-                 else:
-                     my_ok_count = my_log.ok_count()
-@@ -641,7 +641,7 @@ class ComplexType(Type):
-         # none of the candidates applies
-         # this type has illegal internal aligns for all possible start_aligns
-         if verbose_align_log:
--            print "didn't find start-align for %s" % str(self)
-+            print ("didn't find start-align for %s" % str(self))
-         log.append(best_log)
-         return None
- 
-@@ -900,7 +900,7 @@ class SwitchType(ComplexType):
-     # aux function for unchecked_get_alignment_after
-     def get_align_for_selected_case_field(self, case_field, start_align, callstack, log):
-         if verbose_align_log:
--            print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))
-+            print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)))
-         total_align = start_align
-         for field in self.bitcases:
-             my_callstack = callstack[:]
--- 
-cgit v0.10.2
-
diff --git a/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch b/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch
deleted file mode 100644
index deb6673fe1eb..000000000000
--- a/x11-base/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 95a262e0e66cd88b9d7a133917b3ba70ace77301 Mon Sep 17 00:00:00 2001
-From: Jon Turney <jon.turney@dronecode.org.uk>
-Date: Wed, 3 Feb 2016 16:41:57 +0000
-Subject: Update XML schema to fix 'make check'
-
-Here is an attempt at updating the schema to add serialize attribute to pad
-element and required_start_align element.
-
-Not sure if I've added required_start_align element in the right place. The
-default case in the switch element is removed as it doesn't seem to be used, and
-otherwise makes the schema ambiguous.
-
-$ make check
-Making check in src
-make[1]: Entering directory '/jhbuild/x86_64-pc-cygwin/build/xcb/proto/src'
-make  check-local
-make[2]: Entering directory '/jhbuild/x86_64-pc-cygwin/build/xcb/proto/src'
-/usr/bin/xmllint --noout --schema /jhbuild/checkout/xcb/proto/src/xcb.xsd
-/jhbuild/checkout/xcb/proto/src/*.xml
-/jhbuild/checkout/xcb/proto/src/bigreq.xml validates
-/jhbuild/checkout/xcb/proto/src/composite.xml validates
-/jhbuild/checkout/xcb/proto/src/damage.xml validates
-/jhbuild/checkout/xcb/proto/src/dpms.xml validates
-/jhbuild/checkout/xcb/proto/src/dri2.xml validates
-/jhbuild/checkout/xcb/proto/src/dri3.xml validates
-/jhbuild/checkout/xcb/proto/src/ge.xml validates
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd ).
-/jhbuild/checkout/xcb/proto/src/glx.xml fails to validate
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd, exprfield, switch, reply, doc ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd, exprfield, switch, reply, doc ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd, doc ).
-Element 'required_start_align': This element is not expected. Expected is one of ( pad, field, list, fd, doc ).
-/jhbuild/checkout/xcb/proto/src/present.xml fails to validate
-/jhbuild/checkout/xcb/proto/src/randr.xml validates
-/jhbuild/checkout/xcb/proto/src/record.xml validates
-/jhbuild/checkout/xcb/proto/src/render.xml validates
-/jhbuild/checkout/xcb/proto/src/res.xml validates
-/jhbuild/checkout/xcb/proto/src/screensaver.xml validates
-/jhbuild/checkout/xcb/proto/src/shape.xml validates
-/jhbuild/checkout/xcb/proto/src/shm.xml validates
-/jhbuild/checkout/xcb/proto/src/sync.xml validates
-/jhbuild/checkout/xcb/proto/src/xc_misc.xml validates
-/jhbuild/checkout/xcb/proto/src/xevie.xml validates
-/jhbuild/checkout/xcb/proto/src/xf86dri.xml validates
-/jhbuild/checkout/xcb/proto/src/xf86vidmode.xml validates
-/jhbuild/checkout/xcb/proto/src/xfixes.xml validates
-/jhbuild/checkout/xcb/proto/src/xinerama.xml validates
-Element 'required_start_align': This element is not expected. Expected is one of ( bitcase, case, pad, field, list, fd ).
-Element 'required_start_align': This element is not expected. Expected is one of ( bitcase, case, pad, field, list, fd ).
-Element 'required_start_align': This element is not expected. Expected is one of ( bitcase, case, pad, field, list, fd ).
-/jhbuild/checkout/xcb/proto/src/xinput.xml fails to validate
-Element 'pad', attribute 'serialize': The attribute 'serialize' is not allowed.
-Element 'pad', attribute 'serialize': The attribute 'serialize' is not allowed.
-Element 'pad', attribute 'serialize': The attribute 'serialize' is not allowed.
-Element 'pad', attribute 'serialize': The attribute 'serialize' is not allowed.
-Element 'pad', attribute 'serialize': The attribute 'serialize' is not allowed.
-/jhbuild/checkout/xcb/proto/src/xkb.xml fails to validate
-/jhbuild/checkout/xcb/proto/src/xprint.xml validates
-/jhbuild/checkout/xcb/proto/src/xproto.xml validates
-/jhbuild/checkout/xcb/proto/src/xselinux.xml validates
-/jhbuild/checkout/xcb/proto/src/xtest.xml validates
-/jhbuild/checkout/xcb/proto/src/xv.xml validates
-/jhbuild/checkout/xcb/proto/src/xvmc.xml validates
-Makefile:534: recipe for target 'check-local' failed
-
-Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95494
-Reviewd-by: Ran Benita <ran234@gmail.com>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
-
-diff --git a/src/xcb.xsd b/src/xcb.xsd
-index c1dce3e..f0c5f44 100644
---- a/src/xcb.xsd
-+++ b/src/xcb.xsd
-@@ -44,6 +44,15 @@ authorization from the authors.
-     <xsd:complexType>
-       <xsd:attribute name="bytes" type="xsd:integer" use="optional" />
-       <xsd:attribute name="align" type="xsd:integer" use="optional" />
-+      <xsd:attribute name="serialize" type="xsd:boolean" use="optional" />
-+    </xsd:complexType>
-+  </xsd:element>
-+
-+  <!-- Alignment -->
-+  <xsd:element name="required_start_align" >
-+    <xsd:complexType>
-+      <xsd:attribute name="align" type="xsd:integer" use="required" />
-+      <xsd:attribute name="offset" type="xsd:integer" use="optional" />
-     </xsd:complexType>
-   </xsd:element>
- 
-@@ -76,14 +85,13 @@ authorization from the authors.
-     <xsd:sequence>
-       <!-- switch(expression) -->
-       <xsd:group ref="expression" minOccurs="1" maxOccurs="1" />
-+      <xsd:element ref="required_start_align" minOccurs="0" maxOccurs="1" />
-       <xsd:choice>
-         <!-- bitcase expression - bit test -->
-         <xsd:element name="bitcase" type="caseexpr" minOccurs="0" maxOccurs="unbounded" />
-         <!-- case expression - value test -->
-         <xsd:element name="case" type="caseexpr" minOccurs="0" maxOccurs="unbounded" />
-       </xsd:choice>
--      <!-- default: -->
--      <xsd:group ref="fields" minOccurs="0" maxOccurs="1" />
-     </xsd:sequence>
-     <xsd:attribute name="name" type="xsd:string" use="required" />
-   </xsd:complexType>
-@@ -201,6 +209,7 @@ authorization from the authors.
-       <xsd:element ref="field" />
-       <xsd:element ref="list" />
-       <xsd:element ref="fd" />
-+      <xsd:element ref="required_start_align" />
-     </xsd:choice>
-   </xsd:group>
- 
--- 
-cgit v0.10.2
-
diff --git a/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild b/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild
deleted file mode 100644
index e32dfd29e7b1..000000000000
--- a/x11-base/xcb-proto/xcb-proto-1.12-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-XORG_MULTILIB=yes
-XORG_STATIC=no
-
-inherit python-r1 xorg-2
-
-DESCRIPTION="X C-language Bindings protocol headers"
-HOMEPAGE="https://xcb.freedesktop.org/"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-make-whitespace-usage-consistent.patch
-	"${FILESDIR}"/${P}-print-is-a-function-and-needs-parentheses.patch
-	"${FILESDIR}"/${P}-update-xml-schema.patch
-)
-
-src_configure() {
-	python_setup
-	xorg-2_src_configure
-}
-
-multilib_src_configure() {
-	autotools-utils_src_configure
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_configure
-	fi
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_compile -C xcbgen \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
-
-src_install() {
-	xorg-2_src_install
-
-	# pkg-config file hardcodes python sitedir, bug 486512
-	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
-		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi; then
-		python_foreach_impl autotools-utils_src_install -C xcbgen \
-			top_builddir="${BUILD_DIR}"
-	fi
-}
diff --git a/x11-base/xcb-proto/xcb-proto-1.13.ebuild b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
index 7d3b0706efcf..984ce92413d6 100644
--- a/x11-base/xcb-proto/xcb-proto-1.13.ebuild
+++ b/x11-base/xcb-proto/xcb-proto-1.13.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/proto.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3eb6fdb384fb..c9c931338719 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -8,8 +8,7 @@ AUX xorg-server-1.19.5-glx-do-not-pick-sRGB-config-for-32-bit-RGBA-visual.patch
 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD xorg-server-1.19.5-r1.ebuild 6484 BLAKE2B a8188fbf1974531bfb2aae98e7e43a2c66a70e02456f08e7daf04fdeb2a37d0445d0ab1857be0e560be716634d77c7ef18e932a510bd5c6b781ad5c72fa239bb SHA512 219dd0b969e99d1e96ce61b45c836be8be1050fd02eb7cdbdb42afa78973845df160c9b30bc034b4c15170dc4943775f72170b1a3eb487cd07b8b6c4788eb20d
-EBUILD xorg-server-1.19.5-r2.ebuild 6578 BLAKE2B 4e0712a20601545832b97938ada53c92e437d1fcc4bc1076c53ab02de9154a4984291bf7bdb99e87218594b576cbba53103e54f44220bd9a4904a19383388c4e SHA512 3980169450b6602264068c8cc7c93141c72a2416673e8ba8ae3f4a4108da761c31a3ee72640bb0875d19442ce1e28344c5976f2b12a95af2530542d27db2290a
+EBUILD xorg-server-1.19.5-r2.ebuild 5778 BLAKE2B b69bb4fa8dfb9bb52803785fab791a9c976c56cd8a7536b7480017bbefc9f297392d07575af68e5922f6c53dc98105935a0554739d3daf9a638c122f3231a902 SHA512 7dbe59ed9002bb1553ce699dfa4bc14cfddc8d7893d58a59ddf69707cc8ca2b134b48fe07608df7ffd01d7307a3c55275a0ae3564fc9baf1d89d60b3e26727df
 EBUILD xorg-server-1.20.0.ebuild 5527 BLAKE2B 9ecf7e16160da27f61917a9333ee27522bbe23123dfb1ab4aa0ea362006d20bd5990431e2568cee623e8baf6ce247feb8f7256a2374b7db36cc0572e3b91384e SHA512 476b7aee6d2fe130f95cfef76fef0639126a596790a75d1ee6248e880f88a57d99a67318c6eef9a8990e669cd8c52cb69de2aad0071414ff4c451a3020a5eae2
 EBUILD xorg-server-9999.ebuild 5553 BLAKE2B 2b29cb7d785839c40f1357671c07bf8ea2685862ac8375f36ba9888fabd27258745e54b6ef1b126098eda8e155415a816f73b9331881ff975b327216948489b6 SHA512 9d8f5af8959c2635d40b8c9bc75947a1c5765032751a2169fac84af529e82168d111856586b00447704bd46835e1a817527788460e4e8dee6d2d8c9fc0804b1e
 MISC metadata.xml 934 BLAKE2B ffffcceb822cadfd48ff18063acd7adfeba6b651099c91f14159b2af4486b1475578da54865d99ef0acc78e34bfc3b1e7e6bca1d179ab7f151417c53c1a05a35 SHA512 97fffbdf402a70c9cb84062ac6c906b8a9d35ceebbe35b28547387e4a9e2706c595f842f64bee92925415bd49593f3a3b0213072ff2c0ab22209dc37e243d4ac
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
deleted file mode 100644
index 42a6d291f967..000000000000
--- a/x11-base/xorg-server/xorg-server-1.19.5-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
-
-CDEPEND=">=app-eselect/eselect-opengl-1.3.0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-libs/xtrans-1.3.5
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	dmx? (
-		x11-libs/libXt
-		>=x11-libs/libdmx-1.0.99.1
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXaw-1.0.4
-		>=x11-libs/libXext-1.0.99.4
-		>=x11-libs/libXfixes-5.0
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXmu-1.0.3
-		x11-libs/libXrender
-		>=x11-libs/libXres-1.0.3
-		>=x11-libs/libXtst-1.0.99.2
-	)
-	glamor? (
-		media-libs/libepoxy[X]
-		>=media-libs/mesa-10.3.4-r1[egl,gbm]
-		!x11-libs/glamor
-	)
-	kdrive? (
-		>=x11-libs/libXext-1.0.5
-		x11-libs/libXv
-	)
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-10.3.4-r1
-	)
-	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=virtual/udev-150 )
-	unwind? ( sys-libs/libunwind )
-	wayland? (
-		>=dev-libs/wayland-1.3.0
-		media-libs/libepoxy
-		>=dev-libs/wayland-protocols-1.1
-	)
-	>=x11-apps/xinit-1.3.3-r1
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)"
-
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.3
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.5.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri2proto-2.8
-	>=x11-proto/dri3proto-1.0
-	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
-		doc? (
-			|| (
-				www-client/links
-				www-client/lynx
-				www-client/w3m
-			)
-		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-	)"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-xserver )
-	!x11-drivers/xf86-video-modesetting
-"
-
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	xephyr? ( kdrive )"
-
-#UPSTREAMED_PATCHES=(
-#	"${WORKDIR}/patches/"
-#)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-	"${FILESDIR}"/${PN}-1.19.4-sysmacros.patch #633530
-)
-
-pkg_pretend() {
-	# older gcc is not supported
-	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
-		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
-}
-
-pkg_setup() {
-	if use wayland && ! use glamor; then
-		ewarn "glamor is necessary for acceleration under Xwayland."
-		ewarn "Performance may be unacceptable without it."
-	fi
-}
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-	# NOTE: fop is used for doc generating; and I have no idea if Gentoo
-	#	package it somewhere
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable debug)
-		$(use_enable dmx)
-		$(use_enable glamor)
-		$(use_enable kdrive)
-		$(use_enable kdrive kdrive-kbd)
-		$(use_enable kdrive kdrive-mouse)
-		$(use_enable kdrive kdrive-evdev)
-		$(use_enable suid install-setuid)
-		$(use_enable tslib)
-		$(use_enable unwind libunwind)
-		$(use_enable wayland xwayland)
-		$(use_enable !minimal record)
-		$(use_enable !minimal xfree86-utils)
-		$(use_enable !minimal dri)
-		$(use_enable !minimal dri2)
-		$(use_enable !minimal glx)
-		$(use_enable xcsecurity)
-		$(use_enable xephyr)
-		$(use_enable xnest)
-		$(use_enable xorg)
-		$(use_enable xvfb)
-		$(use_enable udev config-udev)
-		$(use_with doc doxygen)
-		$(use_with doc xmlto)
-		$(use_with systemd systemd-daemon)
-		$(use_enable systemd systemd-logind)
-		--enable-libdrm
-		--sysconfdir="${EPREFIX}"/etc/X11
-		--localstatedir="${EPREFIX}"/var
-		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
-		--with-xkb-output="${EPREFIX}"/var/lib/xkb
-		--disable-config-hal
-		--disable-linux-acpi
-		--without-dtrace
-		--without-fop
-		--with-os-vendor=Gentoo
-		--with-sha1=libcrypto
-	)
-
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	server_based_install
-
-	if ! use minimal && use xorg; then
-		# Install xorg.conf.example into docs
-		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
-	fi
-
-	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
-	newinitd "${FILESDIR}"/xdm.initd-11 xdm
-	newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
-
-server_based_install() {
-	if ! use xorg; then
-		rm "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
index 9dd4de37f2cf..a1744645895f 100644
--- a/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.19.5-r2.ebuild
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind xcsecurity"
@@ -83,32 +83,8 @@ CDEPEND=">=app-eselect/eselect-opengl-1.3.0
 
 DEPEND="${CDEPEND}
 	sys-devel/flex
-	>=x11-proto/bigreqsproto-1.1.0
-	>=x11-proto/compositeproto-0.4
-	>=x11-proto/damageproto-1.1
-	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.1.3
-	>=x11-proto/glproto-1.4.17-r1
-	>=x11-proto/inputproto-2.3
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.5.0
-	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
-	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
-	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xf86dgaproto-2.0.99.1
-	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.31
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri2proto-2.8
-	>=x11-proto/dri3proto-1.0
+	x11-base/xorg-proto
 	dmx? (
-		>=x11-proto/dmxproto-2.2.99.1
 		doc? (
 			|| (
 				www-client/links
@@ -116,9 +92,6 @@ DEPEND="${CDEPEND}
 				www-client/w3m
 			)
 		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
 	)"
 
 RDEPEND="${CDEPEND}