gentoo resync : 28.04.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-04-28 20:02:04 +0100
commit: a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree: 852c90a4bf354c30ea66504f70bfab5401fba18d /x11-proto
parent: 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)
100 files changed, 56 insertions, 1292 deletions
diff --git a/x11-proto/Manifest.gz b/x11-proto/Manifest.gz
index 1116a05f12ad..91b5240f4043 100644
--- a/x11-proto/Manifest.gz
+++ b/x11-proto/Manifest.gz
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index 07bf097d7c1b..2f39df6d752e 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1,4 +1,2 @@
-DIST bigreqsproto-1.1.2.tar.bz2 113218 BLAKE2B de595169050716e6474366221760845d61110cc4d71bb6b2b0ec7d28a211b4c6ed38e202e84802982f23a85fa140e36d78dda45fa499f5cba9418a39047e2c61 SHA512 9c2f98191169f7bca69601fcea5ddcb45d50b3a6bae087a2d6ee2d83f9729155b23268ad4c46a3cc99162cdacf4c8e3d7f061e58d73237da96f23123444f67d8
-EBUILD bigreqsproto-1.1.2-r1.ebuild 520 BLAKE2B e41b67e9af44ca3cfdea20ca5eca45efa0dcd935e263bf34188bcc3179785ad97851d2cc282da6625163ecae20e817d2f59c603716abe2357121e0ee36309711 SHA512 c1c95b1ed9686133dd1cf50703890693216d3c67577020e8eefee189ca72fe13c01881ba08a8274b992bdce2f5a3a8eeb0d7f514e2f2d5971d39a111968bb42a
-EBUILD bigreqsproto-1.1.2.ebuild 586 BLAKE2B 60ed4d8410bab64580a2b7756012925d4e8b12b0bad38ec483dcd7e2f8fe80fca0bcabdaf090e32be8f3223a09430cc5dadb25d0511d0ce1a7070ec97762a906 SHA512 b39d9bcbe95cf5f4608ad0641e31bee7deda4e74ad46e700d32177d127c19c69c822b1c75001948a507f8093ed1e8c6f21f2bf03be6f8968b08f1a18eb90da1d
+EBUILD bigreqsproto-1.1.2-r1.ebuild 519 BLAKE2B dfe63e881419fed23ccb07dc0849e8361b737b2df4c09feb80ae9fac0d7373315a63b5aeaf770c1468cedd55495b67ce7399934c06f167fc1be61108cd427c27 SHA512 d19ca949781a3777ee941c8cfb067ebe0052b401db1c08c91cb2765450c67461164da9ff6ab9b52f56f9feb91326a04f722a0873703c3f515e0a76b4c657150e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
index a28117af6e05..2becd5508ff3 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild b/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
deleted file mode 100644
index 59da33e587a8..000000000000
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org BigReqs protocol headers"
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
index f35be21a3a55..7ea3a73cb2d6 100644
--- a/x11-proto/compositeproto/Manifest
+++ b/x11-proto/compositeproto/Manifest
@@ -1,4 +1,2 @@
-DIST compositeproto-0.4.2.tar.bz2 101208 BLAKE2B 139731f135a4f557fbb807b010fe6384ab0febe60c73193ea3820f8809f7b05d64ea14df4b89e7e2986e5b4aadd803bf966a9632686141c26f96e0f02b1453eb SHA512 ad5e4d87b77a8447c228ca85ac8d010d93b5c64929dc866e99a25700b9905f7c3f22e48f8c7fdc54e87879ddcc90e5d4adc338aeea393d7057b19b5ccae31f11
-EBUILD compositeproto-0.4.2-r1.ebuild 455 BLAKE2B c85a00f8b7003f00087dc6174f000e84a5257786b16fab44b2e906b43da299459197b77a72912ab1fa26f61ec392bb35856fd1a5ad6273e5d758b4cf0c7d2036 SHA512 53c8ca5ea6a33023f35ad3c49e111b2157f3fe1dd77844a5ad2fb164e49a6911b5ca972354bf25a248531c49a6cf8876a91c53bf2166526a91b813222e249428
-EBUILD compositeproto-0.4.2-r2.ebuild 522 BLAKE2B b79572f2f8c9757066794a0a75b879e7c40eed92c3926c4d9101bfdcc28b47588302bd9865e71249d8a1ea1f0d6c33ebe47db9151039bbc258f588f3e88ca56b SHA512 c69c354f478a834b6ccdb9dca850fc3bd91412d141a274dc16725bef8509a311933c0cfd4a96fffa7ed9941934620aef9c8c7d494b6a305622cd3bfd2c4367c3
+EBUILD compositeproto-0.4.2-r2.ebuild 521 BLAKE2B 902f2c194bca452f9448c09fd31658b5a264d3029bdad8b287027691afbf837e3553d2503fa659d44e3fdb44eaca2df49d742ec463fc41eb96678b1fd0cdbf6d SHA512 a5ed5c4ae3d72889f72f8c5589404ea5a20151880202a1677b67eb593e29d7b2bc44032aa231a6a86afe471d78f87cbcfbcebbe6a53af579eb36efc31e303075
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild
deleted file mode 100644
index fe1fce35df9e..000000000000
--- a/x11-proto/compositeproto/compositeproto-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Composite protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
index fea022447f05..555c12fa4820 100644
--- a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
+++ b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
index 31ac0e74f649..2af073824282 100644
--- a/x11-proto/damageproto/Manifest
+++ b/x11-proto/damageproto/Manifest
@@ -1,4 +1,2 @@
-DIST damageproto-1.2.1.tar.bz2 98392 BLAKE2B 7b077681ef3cc95f1036ac6365d495ce6e62a445c1597bc77ef80f42f83755d50c2f4abbeda3f153d18717ae596b8976a2645f0a0351b735cf8b3123ee583b39 SHA512 f124e85fb3cc70ed3536cb9db57ac93461bbb5df1a713bc6b67a5ea49122556c321781ca150df681502f6ccfb7305f290e131ad25ce9ccbff5af268df11c86fc
-EBUILD damageproto-1.2.1-r1.ebuild 435 BLAKE2B 5db138024496c665e031d87c7c3bf57a8e503c2fa737e8e083b4dd69da5f72dd637611d4ab2965361da4604489589ea7ae81e99ba4eb3fca27f4175eae5d355f SHA512 3e34ccfcabe2a06d76e23f29639b405edf5568cef3c14a91b63192f812558cf39c8b7649409974c0f9007aa5b9e1caea46d08406b45559245528a1c1d29abe74
-EBUILD damageproto-1.2.1-r2.ebuild 519 BLAKE2B e34f440f3fd17e32f9b87a9075061affe631bbeafcbfd680a6f7d98d1224055e00cecaca8330c255f0052139174f58354a6983db8ea739b6112e0c1faff38a35 SHA512 2b736d1e94b12e340d5ff1926e09ff97549d3f29bab078a44757f4343df451ad9588f1cef2f27e2d925c14c00ecb381ae8133230f822fafee4bdae4575940aaa
+EBUILD damageproto-1.2.1-r2.ebuild 518 BLAKE2B 88be3700a078a98fb867f750c076d846929fbc3a20b37e28bd75eb764cf02706056365c4b61139240fd7c3adc671ab376d8e60d15dc421c1e097e7a81a8b1251 SHA512 e107730dff48f2b21e3e84e5bbbcb940612fcf8d7dd02309f1151e0fb275a9e78c58881e46b687cb44bfb9b1a13912181413cba474d74b42431eebae2e95c60a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild
deleted file mode 100644
index 926b2af6e006..000000000000
--- a/x11-proto/damageproto/damageproto-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Damage protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
index bc52289129e5..1ad95ac00cb1 100644
--- a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
+++ b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index 9ef073abc9d5..7f2188bad2dd 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1,4 +1,2 @@
-DIST dmxproto-2.3.1.tar.bz2 96467 BLAKE2B 6bf24ab884886b2035ef5685fe1a888ba9fc7166c8463a48b24a2705e3567372a437ce1a8dc99beba4777970d98baf2ebd855a5819287602988c2f02ac47f9b3 SHA512 bbce91c35413a39ff8b70e5fddccea0e47af3e8f1cfc562b8acc2785ea350a04166799b29a31fd38f4a2c8d82c8d370d7a40fc24ec2c686f2244b59dce0ba4b5
-EBUILD dmxproto-2.3.1-r1.ebuild 343 BLAKE2B 63691a4110d43dbdca11f5a2a1405428789fe03b9ff534d711702a45286fe4c6948af334202f7bf96ddc05a272e72e3c4d3e9bd13c5f9e69ef364e3a24c88d3d SHA512 401f877c44ba4d5a1d0368b0524e211a55e4583e805499e961e4163359967de4e429410c8bca3fd4356591260f76d46ccef476d6e88520612f42f5b6f49bb316
-EBUILD dmxproto-2.3.1-r2.ebuild 516 BLAKE2B e59b3b29019f6056f2867b72c50cc14f59ec15f6b06d6a663b5d805d93615a85dd5a03e4f7641974430f6bc912a47ac37b9c248183fc1de4aa8c687760d6aad2 SHA512 81279dbf8b5163ceef8ec17e3270caee3ce698a7cdd294760c97db1d2dea99d703dd094204e667b1341cf75e59784414ff2c27e09c11c6d5a0815f05ab6ec9ae
+EBUILD dmxproto-2.3.1-r2.ebuild 515 BLAKE2B c24430607bb57827a6a62668d7f780c4feeb09e09ffba8792ffcd3dcd1c5189907cd0140f5ae024152ba66350d933c048e3becabb8c87cc1ffadde5d80dde386 SHA512 1a221b862426ddefe4604f0f4649be952e82a26c5201e5364566ec35d509c6a48d39a8fda53339365a1b01933c1901fceac9f2067622ee889b4288239de14fb5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dmxproto/dmxproto-2.3.1-r1.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1-r1.ebuild
deleted file mode 100644
index d7df8cf5f61c..000000000000
--- a/x11-proto/dmxproto/dmxproto-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org DMX protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="!<x11-libs/libdmx-1.0.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
index 9799555afe0d..b1e66a037245 100644
--- a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
+++ b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index 5146f7be012d..42d7c2e7a91c 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1,4 +1,2 @@
-DIST dri2proto-2.8.tar.bz2 108746 BLAKE2B 5716b010326c1bde1dfcbfa8c294a9f4b7bace8a5e9acd0e83869461535dccd61be6eee828d8c182bcca525cc8134c133bd9785ef174d746e5a9e5f50ebb538c SHA512 1602f58cd8a3371dacf894cde4889b9147fc08e83f98d8e0d1c748abe43ecb74cf4e0e3d5eb2f33568ba5e6d9f310303b98ba43ae3bc956ae693824b1ae0745a
-EBUILD dri2proto-2.8-r1.ebuild 411 BLAKE2B 7c34881706b0879c0c47eddd1c5efbda9c8dc25651065008403a90f3c80b82ca367524d8e5bf499db797f2f686d138d6b07b8a3ea04b652bef5c2f6889e24092 SHA512 7d82c41bb7b9332a8fe35be5054316eac9885346c095fd64f3242684ddbc54be7a87056e5548875fc400a812bb830649c95a48b003a7e4b7e67df0ca5fa83702
-EBUILD dri2proto-2.8-r2.ebuild 517 BLAKE2B 26216111c6dae56590c4877eb5f148c9c4b0b17e8dd84c1e95abf69522eca12a5700c05a9c44c5084580fa40b8b60fabb04c7c6d70f1210fea4ba8832c689d6e SHA512 33a51152fcadb15d2e4ae1e28eaf787cfd1e8f30275c59844f21cd86c139e9eca673aff22fc7d818f947a6ceb5c2e387dc1b31158dec4c82f4cb0359869e3b6a
+EBUILD dri2proto-2.8-r2.ebuild 516 BLAKE2B 3731a0ae8fb89ab3c5cd5cb56b46ead7c7ef767ea9e94bf83a82a47e38f6cabf6505f2e11a31441b927145101e371a4228ef203c2829d9f81bdf0c149c89530e SHA512 822018963f263eaf41a008380122459a5795c338d46c8767c5f1c5e6e587e31fd8456c4c9350c0ba0a86dd5e3e4fa96c2578f76a53e0816fb8cbed357c4fb1b4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild
deleted file mode 100644
index bf92498e07b5..000000000000
--- a/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org DRI2 protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
index afab638e8c34..cc5ea28ca8ce 100644
--- a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dri3proto/Manifest b/x11-proto/dri3proto/Manifest
index cc3f817e0e18..fd5d8c23ab3e 100644
--- a/x11-proto/dri3proto/Manifest
+++ b/x11-proto/dri3proto/Manifest
@@ -1,4 +1,2 @@
-DIST dri3proto-1.0.tar.bz2 105366 BLAKE2B f26758ce6859b4d93414436b5fb142326f3dc71b710eecc96cca7185abd3829eaa817b34321b964628b07b94f974ae743a0d4513919bad6e342b2587b94cc137 SHA512 d2925bc2e2bfb3f30c4dc3082d84dc6a2e7d8ea02021ea02d681cbf92e6b256e9e4e0f5abfc394aa0c7762d841b1c8f82d2098c616ca1d7f4a3b5fd8a54f01f8
-EBUILD dri3proto-1.0-r1.ebuild 548 BLAKE2B 4ace409ac92c4e965412cd0af026fea47b52a9b8455f3a78e24bacce129ddb47d299da97a97e9c48508678d5a8ec95df5411e0e872f5cab8f95a40f077a4bff7 SHA512 f749f80162ce229e8887eb440ed3fd9cb49499c5ab46219ccd9d7d5de7426baea8ff8654e1132927cc4e059f5eb29cc42cd0fc4674cd51d4cea77a7a3a0ef39f
-EBUILD dri3proto-1.0.ebuild 441 BLAKE2B 69d8e5af102fd961f8709df5e87b1a0ee9738a52450321b71e128acd2c6ef1f7fa09d5bf603219214c24e219e6bfa0862de74e5814ce0703ab82d7b9968ebf96 SHA512 303adce752e8439ce3f2d24319801a24f84ba9097a381c857cb53751bcaa47af5fb374e8926b678b8f84f97fa12efc62d04067ec78b4de67fa27354a91d606cf
+EBUILD dri3proto-1.0-r1.ebuild 547 BLAKE2B 2a7c62362106c4d39320ed809e7d39b1d55d3f5c8095b48b7201ec0baa9bb54c8d010af2d55b3da8521d17610b43c6b5f6fd0a848f55f24dbf39968f3b9d8251 SHA512 290b27fc10b212f4a3c9d5dc110fba1360053330499ed227506ddf2bd9c17955e8b87fd9d693c8bbecc42bb9ac3e645059ed5b86289d1ae159807af824d8527e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
index b9cc5265d924..e1fe0fa84459 100644
--- a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
+++ b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/dri3proto/dri3proto-1.0.ebuild b/x11-proto/dri3proto/dri3proto-1.0.ebuild
deleted file mode 100644
index a5d33952c640..000000000000
--- a/x11-proto/dri3proto/dri3proto-1.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org DRI3 protocol specification and Xlib/Xserver headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
index 341e4b7d6612..50071801b38e 100644
--- a/x11-proto/fixesproto/Manifest
+++ b/x11-proto/fixesproto/Manifest
@@ -1,5 +1,2 @@
-DIST fixesproto-5.0.tar.bz2 100886 BLAKE2B 9d1a7027c7f05ed6513b64e99cf82c5571d170cd738d663a10ded4607c9264bc526b471bd571a2c70cf4d66431f73d2b1f5fbdf143385ad3fa942b9e18c2aee2 SHA512 93c6a8b6e4345c3049c08f2f3960f5eb5f92c487f26d227430964361bf82041b49e61f873fbbb8ee0e111556f90532b852c20e6082ee8008be641373251fa78c
-EBUILD fixesproto-5.0-r1.ebuild 522 BLAKE2B 7bb17bc113aa81062e76bd12cf62d46fad4d943f95bbe77c3f7d87c8d3a5fae7992afde95010c0fea7d626bd7a33775a52ee711c7e9c95f5fb08d8f169c70325 SHA512 9338d841bb80949b2fc2e712512fd9a52728ddcb7357990d6b4733531b2b91f81cdff4f229453fd531ef5e8a610e8b9d7f961d2e88825991c031657b497fd7ba
-EBUILD fixesproto-5.0-r2.ebuild 539 BLAKE2B 43e330c5e63d1b8318d095a215c0c764fca5e6fff20e49b4832fc2c7ea3d9ea698c970fffe00244931203d3dd35d8110c5df2ad8814deb095f8dc90b0bbeae3e SHA512 ce237e541557ee486c4eb11c17ac2acb24a64950fd092af44dde068d0797cb2cd9be838fcbe033cbe06be1e9996f98348000bcba0c341d5d50475cc28058031f
-EBUILD fixesproto-5.0.ebuild 475 BLAKE2B cc5b3341354b805b01ffc166606b7566ed5cf52824992069e1d1879ea13f53fd980986ef40c4607366690e4ee0b66ace348c373f5682b79478b2f737902469a2 SHA512 dffd10be942c1643f76c2fc7d8dcd8ee630a579414e2151186af0bf7fa5f479763e0420c724ace636023d371caee7176416b6b70d9e2b20390659fc06d8400d9
+EBUILD fixesproto-5.0-r2.ebuild 538 BLAKE2B 03ea92cdcf927ca914f132de90aeb06bd41bd0224c0115e7ac985633d3fca9198ead4b69e2bc039015874d97756d32ad80ceb8177beb3a195364abfa8558f59b SHA512 bc4f3ac6aeacc10067c4302a6b52b1450bd9a0ee10456573fc928554545a9afe737ad25a802c6dbab001eef66d011d41f7862570a163651936f7fb86f28c73e2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild
deleted file mode 100644
index 5d3e3ba6f3c4..000000000000
--- a/x11-proto/fixesproto/fixesproto-5.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Fixes protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
index ff8dcdf56507..9148a6e1b35d 100644
--- a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
+++ b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/fixesproto/fixesproto-5.0.ebuild b/x11-proto/fixesproto/fixesproto-5.0.ebuild
deleted file mode 100644
index ee8a390ea62a..000000000000
--- a/x11-proto/fixesproto/fixesproto-5.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Fixes protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-proto/xextproto-7.0.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index 4c2f763b0d1c..95e579ec5d8d 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1,6 +1,2 @@
-DIST fontsproto-2.1.2.tar.bz2 141990 BLAKE2B 788d9029784b79baf8f5ac3ed76aecd750e67d008fe22dbf4f01df8a5afb55b4d3f2bcff2d03c92c99f3b8ba736d230bdfd3fbecbf8726d344a168fddedb156d SHA512 728d4df6d65b811cc2516cddcd1ba53aadf75521450baaad27ae10448e8eda66c4898369b4cff13874c26b5541cbac231190f7f32f873939aa6d4a72ee720050
-DIST fontsproto-2.1.3.tar.bz2 154087 BLAKE2B 44c64781e856a5c074faa38e9b68870d57162a57b73d681e9ce388b140700d14c57fd62a77cca095f59c9230ec6bc9aecec852d2590333e748ce62194b29420d SHA512 f46d5b733aa48644aa3aa75d4ed47231ef78cb60f747f7200d82331a1ba566190bf37b5b9926c690dec6356043ce7c85a5b59fc1b4b11667ef432518b5d4cc87
-EBUILD fontsproto-2.1.2.ebuild 573 BLAKE2B 3961edb359ae88ba048e0799f8fa0544a10cc4ae9d7511f9a72bd35b004c99f43c859caedd37ce5d383365e420af8b1e672b79b0fcb3bf79605b0590cc570088 SHA512 274d635551c32926928c706b0c16d4339506c5f0569e454e7cd93e1abec9d0b2ddfaec3cdd9ce429e31fc031c280e2f24fa3a0d101f03f3183d2a8a7325499cb
-EBUILD fontsproto-2.1.3-r1.ebuild 540 BLAKE2B 4bf4983e801a6110c1e345eb996eb136dd3859f9b80b8f1723ae1009bce346d053dbc2ec84af85644b0504a0c53b2637c049323e9ed72e0349d15e3a00ae0f07 SHA512 5e2565d994efe69ae97bfa9c025166c394bbb01373eef05f662cbc581604088055d764a33769f3d749952eec268ce6d249ac90e55a3aeeb18c49a9fad5e52e68
-EBUILD fontsproto-2.1.3.ebuild 589 BLAKE2B 759c58d1a32ef08dc8cfd2e45cc907fe294b7d379f4aec0df8a7aa0305643d7bd82e1cf60b2051810a8d279189a9155cfa2802471ac0ac3be4b7219db2a16dd4 SHA512 624d6a596e3e7913505409cd36ed06e78a502f34d39c2bf8d7449fc39f5815223028f5caad7d05e78df2c7515e08ed48eb086c8cf4356b1b09a563a9829e7e2d
+EBUILD fontsproto-2.1.3-r1.ebuild 539 BLAKE2B b6743869746e6a8a82a61551289c71b74080ef1a477ce5308a52dfbac841fa5d9a1715a320da4511f1116cfcdf859adfb9d9c937a582feb3da999d6b30ab66b4 SHA512 6d82a0fe3f9bd88bcd27fd7aa6b6308efa4a8063d8af92bae331e9ca1339a9d2ba5325fb5f33bb216e5af63a3ee2e5e53db2ca22512a4e6f47597bde1dd4c1b8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild b/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
deleted file mode 100644
index 3bf074a35744..000000000000
--- a/x11-proto/fontsproto/fontsproto-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Fonts protocol headers"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
index 3bca86cca5b6..39a241368fc4 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
deleted file mode 100644
index 9e03d6f36b2d..000000000000
--- a/x11-proto/fontsproto/fontsproto-2.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org Fonts protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index bd2eeba7659a..4dd30177d7af 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,4 +1,2 @@
-DIST glproto-1.4.17.tar.bz2 126969 BLAKE2B 09643a5e9de4aa0f7f9486998d41ff8b3e8cf84c55f785293d3fe224b5aee26e816b83983c380a0208db1269e6643986e04f8899c56f96917c640a6c074ceba5 SHA512 3e5bb1949ab9993e07d2ed7e829b9e0a8803eab476e9f4082fc01087c3dce01f3bcb9d55261eaf60e55977a689b326ed1dcf40f74d5e1fc660c83bea094b6754
-EBUILD glproto-1.4.17-r1.ebuild 621 BLAKE2B be5c3fa1fe4bf4fbb81673d6fb7c60f47e891e31f6419c4c0e678c95b5466239896428b359261759fcb66a59b1a4cb72743c3680bfc8acbfb7560ac205a5ca42 SHA512 f821f6ce120aab20e6bd456de8671e14e5bacdfd500a7abba78bda58ac17ab006ade5a20e7847034c4297383d1d17eeffcb30c80b0bd5525cd49060327e3693a
-EBUILD glproto-1.4.17-r2.ebuild 532 BLAKE2B 7403ce1b50aa634a137a47bb246d2e078e9902b84eeafa64bcf52b8746f59ff92c219f50bc392bd4715d7b0eb8300961d33eae25cdc18719f567a17883d10388 SHA512 3c9c643b1964f2c33f65041f7937114c5a434a701087a7bcef0015d06f74b639094c1d92b52404ab356646575fdc1e73ee7e360e90080045c260882c304f4437
+EBUILD glproto-1.4.17-r2.ebuild 531 BLAKE2B 4cfc5d3e62298c3cfe8d95fdd7efb11ce504c1c262d405ea08abb83cbc115153718a0316668a53218f56c565d5796087e257c783e1fac13401751723fc4a6919 SHA512 a58264b339fe7cc5f9569bb0a1837957a33b233bc029583d9d7c4d3e168c9d2eb7ee64e56ca260d734053241b5f24afc44bf9ff76323f665bcddf68eb3120256
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/glproto/glproto-1.4.17-r1.ebuild b/x11-proto/glproto/glproto-1.4.17-r1.ebuild
deleted file mode 100644
index 124343f3b2f5..000000000000
--- a/x11-proto/glproto/glproto-1.4.17-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-LICENSE="SGI-B-2.0"
-IUSE=""
-
-RDEPEND=">=app-eselect/eselect-opengl-1.3.0"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
diff --git a/x11-proto/glproto/glproto-1.4.17-r2.ebuild b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
index 2f03402f45fe..2e4e7191c0f4 100644
--- a/x11-proto/glproto/glproto-1.4.17-r2.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="SGI-B-2.0"
 SLOT="0"
-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=""
 
 DEPEND=""
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 5912933e78ab..944c9d99888d 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -1,8 +1,2 @@
-DIST inputproto-2.3.1.tar.bz2 196435 BLAKE2B fbaf5f96c93cea586f7c5346fe16f5cbc61e2e28ae2f0a1ed1918fdef36ce3f5eca0e11cfa5d7086e98705dd570857128dd33fb1bcafbad43cd3a73ad25fb6b5 SHA512 84f8acff3d54e929af6da088624adcd8dffe2eba0d9ef672e136f76d12f3814fbf6a7962de27becfaa0aa5e70d874eb5297d9eed8809576d7b0d96f8c29d9d72
-DIST inputproto-2.3.2.tar.bz2 200857 BLAKE2B 92b0656d906476d293860d5264c708dd225475a8c0fce52cbaeee6ddd1d04c63bb45ef7b96e61d22e82a1ec4f7fda3b861bf38c4623f679b23c9286d0af2daf6 SHA512 23d41e9ff4f49d80cd00a436e6dbae09adb7b72d3a3d7909c340b4b132b5908b32a497d5e2ec2c994cf0598a788c0481270bf36ce95171c0be4f74b52715fedd
-DIST inputproto-2.3.tar.bz2 195642 BLAKE2B c19cbe854c8af0a49171d360dead9e6dbb81264e105b8d31540c0eed5de6085f03febf6df957326e8b7abbf49d3675226d05129ff4e58a2aa52b631cc7c400d8 SHA512 4bc3986a49273777850342cfa086641eeba0fd95ad428a2f025bd44e9ea04516cb6e190b3fd2a99fe21c63d9fe4010bebe57aefe3807050d00f8b301289ec43a
-EBUILD inputproto-2.3.1.ebuild 499 BLAKE2B 80c68f7773e42e09f9d6918ca1c9e51b731c22f926ed8a1ae3798f103e5dfc11bde31a462c4ae2f6a18cd34b60cb13db0cf4eb6360e5f2577793ab208acfb486 SHA512 991c2f552801155a72ab0c252391ec70dde547c21c06b49f856016f60792160fa651aa18bda3eb6c39f6089d06507147f53a5143686a069310424e17f9d529e2
-EBUILD inputproto-2.3.2-r1.ebuild 545 BLAKE2B b1b8d003c5563215ecbe7d75e6041f110e3dd125ad5b01277325088a44fd265fd7a06f3167a0d5ece8b6832b34e6adb10279c096a0ae7c1dbddfd0ca62887547 SHA512 a4304f48996ad039ff9d375fa68b097c901cf84545fd7645d2e3f061063feae889cbcc0d651476a63760937e0060a06e812fc35dd511c31c85c4e572a4657e77
-EBUILD inputproto-2.3.2.ebuild 505 BLAKE2B f2ac82b71235233c864d5cd7ab7a44e16c109827d2db33387cbd6b013f4861533b00138abb6ca05feb268a6c4086bb1f13807694a000b7920c20646e69c17e30 SHA512 5b1dd8c9cf2abd479f1911f6beeddabe80b488fa3211941978313dfd168b8beb7cdfac909bb627d845d168ac53e9ff14863795cf789cd5640a8fe738370235fe
-EBUILD inputproto-2.3.ebuild 508 BLAKE2B a88c73378ab4e2fca560fc0974e0a878dce790f9e28dd720628310970bf5f5d848fa58d53523bbe51b645902eae237337d6560c30fd626cda474de7c5397642c SHA512 3afe0ddc14feb31fe69f15bb349aa02cfa1e262b344a5257a69142b87125814d5b8d58fcf7e80fcc284ea8b50d789b03371d1b25c9b674a9505f8a1147a50d9a
+EBUILD inputproto-2.3.2-r1.ebuild 544 BLAKE2B 7585d15e0e673f1fb4a6d644dbc3e2e4c9e88706f1571531858d8277bd5badce7cf7cff02515059bb0ba839995f9ea95556be68ca176e18152f56fd58b1c78a5 SHA512 8fd6c15833e8a74c43a7d201cbdd2ba34463445135e58499d8caf7f40bb72929f80fdf229c5facf254d5ce420001892f91bb5a55b4b94ae0e1845698106f9ef6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/inputproto/inputproto-2.3.1.ebuild b/x11-proto/inputproto/inputproto-2.3.1.ebuild
deleted file mode 100644
index 803687c7c8b9..000000000000
--- a/x11-proto/inputproto/inputproto-2.3.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Input protocol headers"
-
-KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
index 17085a9b322c..4c3c700773f8 100644
--- a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/inputproto/inputproto-2.3.2.ebuild b/x11-proto/inputproto/inputproto-2.3.2.ebuild
deleted file mode 100644
index 2a17f818fe92..000000000000
--- a/x11-proto/inputproto/inputproto-2.3.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Input protocol headers"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/inputproto/inputproto-2.3.ebuild b/x11-proto/inputproto/inputproto-2.3.ebuild
deleted file mode 100644
index bb1fb55788b9..000000000000
--- a/x11-proto/inputproto/inputproto-2.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Input protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-!<x11-libs/libXi-1.2.99"
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index 1676653a634e..622883275757 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,6 +1,2 @@
-DIST kbproto-1.0.6.tar.bz2 256988 BLAKE2B 819b03332f8c7d776ae696c57b4e6745e31643bbff5f30a534aaf3e2b3fe63bacbf52f7a64aaa7c0e3a9c8055fa1a61ac91eed7780b38b43a3483a84ad37cdc0 SHA512 3cef1df57138264dac9802cc4074bc58f82609c6ef859e238108d9ad1ac3a720b991d91f61ca47ea48c56019b465e7e6b37bcbe0b519d1999126255a7d879d54
-DIST kbproto-1.0.7.tar.bz2 250178 BLAKE2B 9f6032d95c25be5d09d5f45ac135a1d91482b34ac155667a0f7888864f16a8221669271c8239a988c3233a13741e408e98987f90a02d12dbe79fc3fae6f5ab12 SHA512 49f24bfd11ee4ef0de658a1f55bcfb4b3a1f7057d90137b899ea3d4ecc40cebde97926a3f4315ddca4ae28d32b2d15f16fda993296acffdb4c007d2f84a39a22
-EBUILD kbproto-1.0.6-r1.ebuild 478 BLAKE2B 42b53296fa0ade76715f462fbbb30d0f7b1fcd4289022f0be38df9108114eef72342d3b923de27c20a758dfd717965b6622bb581546dd5b1c19125d32e132c68 SHA512 b8ebd3f5159f789bc182380512ca6ca386eb01f97110a9b56054afd59ab17839fb49ebe094907c3a7dbaa95128cd923007f70379181ca76ffa8bbf64e3604f52
-EBUILD kbproto-1.0.7-r1.ebuild 536 BLAKE2B ad3ca108ec311e54526c454711655cb52ba91503995e02ed76f31718da9393673c369a1de62d9909d72d87d8e1256d9cace8753db899caab587928c292218740 SHA512 8c857fe2fe563f31dd6872d01ffdc01552d7d9ef38dea6dbb5e022a6f5a975b875c4169dda929fb79d0ebc3b39f1cc2b4958c683c367f949247de2d4486dd92f
-EBUILD kbproto-1.0.7.ebuild 478 BLAKE2B 9c046f4fe7eec97e4fdd3a378835358083df12df23e3dacc7a6c9c15afc7e7415edaff4f0ba4cc6f52ea23f926fb839a2d5b5991c1c531e2645adb81f4ff22e1 SHA512 5668225406f108e69f96c7c32625db4e729ebe60ec454f58baeb69bfcdc3dc0249b114d7982f71b9163f8c6ef7364bc9cd8fc0fefa1dd7a85f0a24cbff71ebec
+EBUILD kbproto-1.0.7-r1.ebuild 535 BLAKE2B 5de6185476dff4a8535a9dd34599f24526018e5ab05353aaae6364940f083b5d5f4d05bdcf1a81561bdc6cdeeb3de31fa8ab83841edd4b36117e1bd4fcc2dd2a SHA512 8637df43d17784415407ab5973ea4b94bdf76846b8160cb26f334ede88d498866a656cd4a8fdb35dca2dbd48d14fb8c46f7574665a34a30e89b0503614f37949
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild
deleted file mode 100644
index 26e74e49bd01..000000000000
--- a/x11-proto/kbproto/kbproto-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org KB protocol headers"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
index 82709d8921de..7c20355691c5 100644
--- a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/kbproto/kbproto-1.0.7.ebuild b/x11-proto/kbproto/kbproto-1.0.7.ebuild
deleted file mode 100644
index f792ea964dff..000000000000
--- a/x11-proto/kbproto/kbproto-1.0.7.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org KB protocol headers"
-
-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 ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/presentproto/Manifest b/x11-proto/presentproto/Manifest
index a3870af36a1f..50dc013784b1 100644
--- a/x11-proto/presentproto/Manifest
+++ b/x11-proto/presentproto/Manifest
@@ -1,4 +1,2 @@
-DIST presentproto-1.1.tar.bz2 116156 BLAKE2B df0e3b2f0ad33f8da05fb8fa33638478a4da965b6b81c1ec880c5cc2d3dbfa2f4e6980daf9dd58447f57deb2fa5510bd588d43488217946d67b6ac605351ac40 SHA512 2c712136c8b4e99190932928d98e1a628197d0bf25180cac196ab8768720d61f7907006315bc3610e23666a8fbe39cfa9115c5fd72914aee2498776c8b46f7b2
-EBUILD presentproto-1.1-r1.ebuild 551 BLAKE2B b41af98f196e837f9f600e02dd285b740032f3219f00f3eaf42a2177d434f7666baa226bf553b1de9613db48890a7906ca78ba4c32209ef02a0c18e7d6a6f41e SHA512 0f8ff3452b3e7fde7b0e6fbdac8bbab5f16d26f8a120f781fd08c508cc8c5ada4abc41363362c9da3ef1696eb8d4a97309b98f033ce85cbd391304121d9dffd4
-EBUILD presentproto-1.1.ebuild 444 BLAKE2B e9a986d9b2ebf1bc4e753e5f2506ff55c13d5dd4b76f57f0045b89da8bc5f7d86171969446eeb1bd9f444892ef16915fa7dbee5e68f87f616bbb730f2827df94 SHA512 c45e1983ca98158ce9fd8fe8ad1a1583ebe948285b6bb689f093ed03c9813b26681c9de54bea5f8d040a00836dfe5b72830eab575d84c924e2b5b4d3ce0ad23a
+EBUILD presentproto-1.1-r1.ebuild 550 BLAKE2B dd50090cb1bad07d01b0cf6919fd858c02d35399cfdf060162ac1e2c98754ba93e076543235c3c93d8bbd801cf71a40ddfd86045010c91dccdf94cf1cd4f99f7 SHA512 f2d37567bd0a14402cfaaa385f8842fb1d95f8e28abf7bc70c72f3c46d7ca7853d04b80d68d4450190f6e57786344fc49af8ce1a3139ef4e5a8cfd9959eb2fcd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/presentproto/presentproto-1.1-r1.ebuild b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
index 36d8544832b4..934e88742af5 100644
--- a/x11-proto/presentproto/presentproto-1.1-r1.ebuild
+++ b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/presentproto/presentproto-1.1.ebuild b/x11-proto/presentproto/presentproto-1.1.ebuild
deleted file mode 100644
index c3fe94fb7b3e..000000000000
--- a/x11-proto/presentproto/presentproto-1.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Present protocol specification and Xlib/Xserver headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 78ed6e086065..6a4a2130c699 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -1,8 +1,2 @@
-DIST randrproto-1.4.0.tar.bz2 133300 BLAKE2B d643b8228c97e82bea4c68c55aa7d946af399774325ea06e87a0b7f2677dc78d6773dfce4986a00cd31df0c47223aec9f64b9adb03688f086d7a54b41adb3709 SHA512 7880360e0f63a9bf88bc4ea76160311ba1d64af30414068df90d6b613b5cc24c2cc7986f2e68ee9a2fcde1359108da25017dd32885b09e878406e66aefe06f0d
-DIST randrproto-1.4.1.tar.bz2 143474 BLAKE2B 84edd8193031d34534b428ebd02bd5c9b5fa94657d7cc147d4e4b814e835d58aca5b416900104d0adcb15204fc6c2d7de0d56e1e0c28dcc30a18e0cf7edb8552 SHA512 0d8151b400c6af697b267219b9dfe6f1e64635134268a43a4412ab571e7a755fe5a1c099a41b678729cbdeeb6c69dee3fa08dba0a9dff1c6afcb8b10985e79f8
-DIST randrproto-1.5.0.tar.bz2 142168 BLAKE2B d3929c4dca17411bfc4a4025d64bf031c64292f8778b83f651ac1bdf516d3f1cb3186aebf805b03b56f2cc72a1a19e15304c07aa65756a0bca8df547f9491345 SHA512 5c56f6acfe3a9da5ffda45e4af2da5081a5116d53f4d2dafe399eae168656727927ca0fb4c29fc6583e87709ac83b025ae206fba9356ebf9e26d3ff545da57f4
-EBUILD randrproto-1.4.0-r1.ebuild 473 BLAKE2B 71c022b6e1d619539aaecd08207f897ecdd544b8d064505e67a6cc592f214e81bb8d2e145c6d5339f9b5610d3d48b6208299baa1da76cc0135c6aef34b4c69d7 SHA512 66a1196384eb0523107ecad27becaa2314f29cab2a571138687030d972d51b3eb14f14f6d5b396b71eebf169f40fef5b243463702f53dae9de98bbe5a22f9789
-EBUILD randrproto-1.4.1.ebuild 482 BLAKE2B 390f01e02f81f34d5260582273c786acb4fbc556a987d79facbc8cb58741d1d2e431530ee566903f556a4d848f907f974e1ce40e5be4a7968d3fb9c6e65b8c78 SHA512 bc034b496f4405c874be2e389ff99f0069ca9f5fe83c18ba7277116d7b605cec79330956f3403a6af8a1cac82d47521692c921b4d36b4d4c4003bc3253f14cf6
-EBUILD randrproto-1.5.0-r1.ebuild 539 BLAKE2B 3600397792865f96ff38b4bdf78e4ee9f8fc41674b6aeac8140b194b2df98cfaf3f7903d3290b4c448b965d96195033ac6a8bc4ef8ff4f3bcdf03630c086bbfb SHA512 bec4c275be04505f73211068177566bda80834ebcc1c4948efd268f13e01b871556cf6465c088f9f17867f0024cdcd6322d8ed84861ccb77a9397c96b56d7de0
-EBUILD randrproto-1.5.0.ebuild 472 BLAKE2B 64a0ffc21ecd781471237eb038c48a01fd7456a84cbc3d7a19be76ff9bae989d63393baf5bcdd76f6a9a59f94d9115a78cf1d0ef762b080f03e1836b3fdc7ede SHA512 c2e8064d2b3da5670e95510da49f3b9ea31c66817ce0d3d08c06fae0b646c3dc7e0702721b215fe865d7b1d079fd70163c73588c90510dfef59737bd21688f9d
+EBUILD randrproto-1.5.0-r1.ebuild 538 BLAKE2B 25c15e2c88d130ef05d61726e392af9b840dbe98c67723ccb295a40c7d98a7f69dec6e6d59e8c731fd21ab9e2d664eaf032e2a3907c48f19547b3442b1128b61 SHA512 d700049b77535f649c84360f8faef877d9b65414f18de9744360b69705480d8394259102e943d206058b889ea9826573008d15949fc687815a4bc13982a9c048
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
deleted file mode 100644
index 1ff98525a5a0..000000000000
--- a/x11-proto/randrproto/randrproto-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Randr protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/randrproto-1.4.1.ebuild b/x11-proto/randrproto/randrproto-1.4.1.ebuild
deleted file mode 100644
index 2ffa582d840a..000000000000
--- a/x11-proto/randrproto/randrproto-1.4.1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Randr protocol headers"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
index 0c0d589dc932..c44b6bdc8266 100644
--- a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
+++ b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/randrproto/randrproto-1.5.0.ebuild b/x11-proto/randrproto/randrproto-1.5.0.ebuild
deleted file mode 100644
index 36da5fe1b0f7..000000000000
--- a/x11-proto/randrproto/randrproto-1.5.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Randr protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index b91157251680..8ce2282abe8d 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1,4 +1,2 @@
-DIST recordproto-1.14.2.tar.bz2 123033 BLAKE2B 5f48f4b05ef698edb51252de9e1f305adfed394fc947c34bd329402ab180c88632b52abc95b1be941228a36fea2fd9352fe94ea453a770938d84595ba986c39a SHA512 ab82d966ffacb46c001df15b272ca58f996826dc6f6835d3dc4d385b31c682acacb073a380d61938e2f242bffdabdd9b8f7107cd5ac67cb7aa3a28cc14a8ea02
-EBUILD recordproto-1.14.2-r1.ebuild 633 BLAKE2B a7ae789529405d0e491d8141e24619524b806efb23f7c7b61afdd142232fbb2831915ea31218ef12767dd9f0b313fcd5b97b79b4b0c9191da7f01f5c324c6710 SHA512 1115fcb4df22a7683eb6c7748ba537cd6f2356bb9287deae99d7388b41419729888453778d3b5f772086960fcc68bd820597370886210e986997f475a80b211d
-EBUILD recordproto-1.14.2-r2.ebuild 529 BLAKE2B 5cbb9a8bdac49dd30a96fc9a32daa153448747aabd8e34aea4d9bf9ab1bb154dcf3c447f13538c651fa218aa47e8c76ebef5c7caf2013e1a65d299913c9882e3 SHA512 39b318ca5eb4a7aa55923f77c4b2ed73ef8820ef63029150cf3bcdefd57f2cff226920237f3ad20d5a4453f3747e8e86e56543d37ed5e58180bedaae8ffd225c
+EBUILD recordproto-1.14.2-r2.ebuild 528 BLAKE2B 5de974e65a1a0b182ec6313d4a8a483c0bb468cfb19402b39beab442d52d73a9c19b28a12ea661cf91dd91a41d43ab4ec3c2075e9a9de36b1cb15980701ae48b SHA512 2fe8e5fbfcd26563bf448b4a61f923210548c7a2260569e97df8b5cbd337a6fb964d1a791cd773698f6a517c998669ad7725ece0a6227aca76ce0a9e8cc585a1
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild
deleted file mode 100644
index 127d1acfa2c0..000000000000
--- a/x11-proto/recordproto/recordproto-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Record protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXtst-1.0.99.2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
index 752d3dead3b4..d3b16d834a69 100644
--- a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
index 6d5501baa2a0..e372fe823b2e 100644
--- a/x11-proto/renderproto/Manifest
+++ b/x11-proto/renderproto/Manifest
@@ -1,4 +1,2 @@
-DIST renderproto-0.11.1.tar.bz2 105741 BLAKE2B e87cca44ca48528f4fcf25f4c143b6c011b56f05170e4847d9739b67edada7786ad6f2cc6f71c16cad3e28edc4caac9fc513eb762395f5802d1f33138c8ab240 SHA512 c38bc7247fd7b89732c892ee41c061b20397f4e79195601b7015dd55054b966f0797ac3990b147f80234596ba2c201ce90e292ecefed2e133167955bca70acc5
-EBUILD renderproto-0.11.1-r1.ebuild 473 BLAKE2B 4f5ab602e1040f3ddec6b881e629e5a687c6c5937c7c3a85251c92d2592f79514c325c6ad070d8f95bb3ff134c5834ecf9ce858d1f3efd2f89fb4974bd2e721d SHA512 f717a25779db0b440ef035bba4a0b23904ec124b5f2e84e1e2cf7c7c93d3d5d26c4f9d2b15baca0f676011866ec95e8ee7f0876cb42f675f2ce911a98715f0a2
-EBUILD renderproto-0.11.1-r2.ebuild 540 BLAKE2B def4ca69983cf84461a7fb5f035ea82df77e11c4045e3ac140e692d5665639dd86bd1c361b34c3b27d49fe73fed838e3f51302eac1888633e996151421b935fb SHA512 a4a04e8f446b13b8d45463eec770c3c73a3b99f2d175fa09a4bf29411131399ecbc99b9b320092e85f43c79918172d3c0ebf4b718e0e5229b40ac7f8da2dcc1a
+EBUILD renderproto-0.11.1-r2.ebuild 539 BLAKE2B 1155e2fea1d246a25f1a4b1ebdc0100cc147923187f392eb2dcc7e35efb5ba344d5877c804adfa3bf1feeecfde3c3ee5c5e315f9ed041901681990f16d180686 SHA512 e5276d4599347de6a39c32e3979a47f5e282099a06c7007380cbb7f3e7ace60e8646685142e358cf2ef7da1f1cf537e6a52378b6809fe9ae67ff246f317aa053
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild
deleted file mode 100644
index 676953fe1b11..000000000000
--- a/x11-proto/renderproto/renderproto-0.11.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Render protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
index 86069d745961..22512bb9ea35 100644
--- a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
index 3a082a2587d7..6e5deee8cddb 100644
--- a/x11-proto/resourceproto/Manifest
+++ b/x11-proto/resourceproto/Manifest
@@ -1,4 +1,2 @@
-DIST resourceproto-1.2.0.tar.bz2 102992 BLAKE2B 7e45e4a067394da92cfe57d59d68e32b379534419b5b76c7363dbdc795bed359c84772ceebb630c8fa8f31c06d384df020bd43ff2b48c3752f430d9e6a277931 SHA512 ce8c8fda178ac7fb22b192d4a0f707a96f42ecd550ae8e6ddd7e1ed0067951ef955f7bee60f63a2b2422176e5f093c38e3903f7c4e5e3bea230b934b7abcc4ca
-EBUILD resourceproto-1.2.0-r1.ebuild 521 BLAKE2B d8c888ce56fab128ae89f7d9dd9790476528f86f458db634d6a9576a9c88c58b4ccf7ae8bb5bb91fbdf7b28b1d559cf6f05928da9800d72db31fcad33225208d SHA512 130823d472c023b5ad6ab6adc568474eb4829a551ac0abfd669686bd94dc9c94ae8ffc8e33d1e9d67509044782fdc4b440aad22b0c7a990e8765ca2a5da8490e
-EBUILD resourceproto-1.2.0.ebuild 416 BLAKE2B 364587114469333241564cd06b1397cda5069cee71ce3f285f32029de65fd374ee6ba13e7d80c59cb95cdad65517b09461e9cb84baac0786ad41d6f02187cc79 SHA512 7c6f18e57af3d82bb3f694c1b357d89814c5fcf781bb70a74ac889da0cbcf8b8fce82c747a28893e64f508184da2b118d3159063962b896c3760a2269f6d59d6
+EBUILD resourceproto-1.2.0-r1.ebuild 520 BLAKE2B 597f60899f2a4b6106321d6314d608a81c577c92f302d0ee6a8fc5cdb74b711ce63439217971b00de2d13ed7f89a874ae8dd7172d84d0efce8315aef93c61e7c SHA512 9867dd4a672962f934922ae28ea8ffe212a07d56e089c2a298d9c6998e1f8c71620ee162ae81183dd9fcdcf3f3839bf92399ccf16582f775504c3d704dbfcca8
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
index c9eb7fb7e8f2..d0b083e24257 100644
--- a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
+++ b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/resourceproto/resourceproto-1.2.0.ebuild b/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
deleted file mode 100644
index 97abcfc6393c..000000000000
--- a/x11-proto/resourceproto/resourceproto-1.2.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Resource protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index 832855b47e87..cbb585a234a0 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1,4 +1,2 @@
-DIST scrnsaverproto-1.2.2.tar.bz2 118820 BLAKE2B 96bcf9e37b2d2a7f646691f08d376e8307954a0e95ae557a4688e94406ef4c1ea841d5ac3373a00a6e368bf09139aaf1421f6d584961bd8e482c241b252ecc01 SHA512 e74a512a6101967983a1d713d22a1f456f77519998116ef0f0a9e4b44ae4730ecd41eb9c0f7fa53e9f5c94967541daf10693d701af832597f5347461c5990ebc
-EBUILD scrnsaverproto-1.2.2-r1.ebuild 619 BLAKE2B 10acbba094d48f3054254a42272608a055d1d3c46d7e6ec306a7fec051e0d22510f45c0666255570f90debcf7574939cb8997be22ce3d7f3c41dcd3b6cc050ef SHA512 8eb6cbb95abce876a93794f149b658c5ff6b6815eb3c65367bdbac64690713fba4beefec4eaa41d345eac9d1b6058a60c2dde7d9e7338a226541ee5b1694ac3c
-EBUILD scrnsaverproto-1.2.2-r2.ebuild 522 BLAKE2B 894573e455f9cec5a4c7c0196c161db6a61f1539e7a3772bfe16a13f301a5c243012784b8bd7f6131978694af8363e83464775fadb74002891d214e4ab222ce8 SHA512 a474b5adf17f697d22a1f34fffe65c6fc72e9f82610b32c5ec3a9715e52db16045d3f44f3b51b2bfa1ddcb28bd8a88aec4f0d84e0798ff4ab5202a484e965fc7
+EBUILD scrnsaverproto-1.2.2-r2.ebuild 521 BLAKE2B ca5c46871d72838db0aa7ded72d24c326deb274f9b7486cb13c09424d9ba262e9778bcb87e1699fb938fccd331f7abbc98094f09bc6c5494c9b103967c03251d SHA512 6770a2c75caed1bdac6f4817cbfb6df376fd847b141b7c692dd517d1d0c6b0b0d92ba609b4ad637d8f95ebff36a126cbc51ae1d3fa5f8254b46b18abb73f1cdf
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
deleted file mode 100644
index 44e90ea0376e..000000000000
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org ScrnSaver protocol headers"
-
-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXScrnSaver-1.2"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
index 9a10cefdbd84..fb2f4fdfa04d 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
index ba74da423b43..260520d54ecc 100644
--- a/x11-proto/trapproto/Manifest
+++ b/x11-proto/trapproto/Manifest
@@ -1,4 +1,2 @@
-DIST trapproto-3.4.3.tar.bz2 48785 BLAKE2B 7efde2955e1e295e3b2269917933afb5ca7ede1f84e1ee70bbd62c68835a9faeaa061858b9d4c03f51bdfd9ced7828eca2527b6ece55942f6df8abfdc9d1cfb8 SHA512 a5bf93bfa2f675e874ece8510a693d3a1ca4ba0b3981740249d4c78273a74724209f5f6d83c6207038bce1c3edca0bdd98ca3e1dd7aba04dcea146c9a1a2e8ef
-EBUILD trapproto-3.4.3-r1.ebuild 528 BLAKE2B 114e0fd753b178e90035ec412035764e365b52b7ac985a4c7047b12cffd353f54c44e74ca1e2816b24e629a2d63a5a1ef7b95d68a2d557a208c2b727dec4bebe SHA512 7f2b7bd8cf3c6b89cd44a77da8e9d6a5ef0fb2d4117f0f6d8ac300ffccc6c452b0f39a8f95529e0d04bdb84cf991448d3f51c0ab8f8924416cf67c5bca7cd27a
-EBUILD trapproto-3.4.3.ebuild 423 BLAKE2B ab923ef1c6ccc55cfbe0dd818f8a79ace78fa7e779437723149a8751e76cede17c6e1060364113a5b1aefaac15041c600bb2c10eb4eddb21e05452bfec7e371f SHA512 a1b6cf95ae668ae185bdfa71b8c45fb4df1576eca14a7fef9f2e91c05e76770e81f45f11dec6b6bdee8b22badc4988f89585a8e17e014373014231dc2755a79b
+EBUILD trapproto-3.4.3-r1.ebuild 527 BLAKE2B 17f682d1f169274d34d09c617bac6fd7572f52ed875f133581f5b01ea9eb63102591b76ceb03f4c8ca25a54c00393a265eb0072e38c68c9b56c0b9fbaf0d94ac SHA512 334f409d9c4230b4198683274cf316b7c777ce5bfe42f787a0d3ac76f7f8c91429070d4bd0e74771ef9ef476f5c7e6a66e9e637b3e7728812cf4210ce40365ba
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
index 1ccd85d8f046..e4539d63aed3 100644
--- a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
+++ b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/trapproto/trapproto-3.4.3.ebuild b/x11-proto/trapproto/trapproto-3.4.3.ebuild
deleted file mode 100644
index 15c4febb38a8..000000000000
--- a/x11-proto/trapproto/trapproto-3.4.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org Trap protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
index a602347436af..fbc47483bff2 100644
--- a/x11-proto/videoproto/Manifest
+++ b/x11-proto/videoproto/Manifest
@@ -1,6 +1,2 @@
-DIST videoproto-2.3.2.tar.bz2 118862 BLAKE2B 124051d4420f2baa2ad0ee0351cf702f2ba7a3884b7a95be3f2ee349d22cad53d72ea964db67ecaa665237caad49359936aeea27a201b90a92cd1de4b4aac042 SHA512 57ca8981b217724e4e0599624e6d8077aca0f2568855c54b74dbf5e03d25864eb114540b02a49c11487beb03d55d52efc09d8a7fb86a3078a4d52f4a3042ef36
-DIST videoproto-2.3.3.tar.bz2 121016 BLAKE2B 684de2db59576989b3dcf60a59210adc02e8be032c69a8ea8d1d8a6dede3152879b627e760a4b2dcca478b844823e7a65e7ed6c82c91bfaa15bb076abc86fe3d SHA512 84136f7ba15e86ef7e178af4ca70c4c0f0a83fb37e9e39c2564c31762439453c5e7b85934366b711261d454615a57314cf75ac35a17544cb186bad301e920cf5
-EBUILD videoproto-2.3.2.ebuild 454 BLAKE2B 0b2ffb86677d256fd7b208f02389ca2b243a433d6c34d3acbb2b54749d4f2f996a13e910f1696cb888edd49a890a4d98dc2a5504bba33234a1860e92bda3fc14 SHA512 8b05eb153e5e2efbe08a10032ff001ad8fe2ed0d45e285422185227f3399dd62401c47f6a5a2c4cda4b8bf5c66300159375e10399e5c7cec35f0dacc99d0d23f
-EBUILD videoproto-2.3.3-r1.ebuild 528 BLAKE2B 884c2ca65bd9c89cb982734e37271a6e63ea086c2cdb6eab29acbe2a9e6f1baf52e2c26eb3e8b77e49267368d2c2d2e16bce360570d02414520578d252a723d4 SHA512 5078f6a249f41febf407fe819bc8ff4e5531fa5323424e0b4c53f27d25b09e54cde8c896b5f40cc5e5d4bd270b5aeac9a0ee6df11b5880016a5c09a6d19a1525
-EBUILD videoproto-2.3.3.ebuild 453 BLAKE2B 4f28d5b2350c0c5bff9e236352d5e27ec058ef03c8a32052742cb98028e5bdcfe00013bb107ce3ff1909df9960ac64e1a2a9c28eeba8b77eac7978dee2df95c1 SHA512 e79ddddc465b1bf2383cf5e8459805adcca6b30c263e9a7892a561c88105782f77784a715194530449adf0529a9aac965ea30c61249a033241d91f4af2f0bb89
+EBUILD videoproto-2.3.3-r1.ebuild 527 BLAKE2B 1fd8be2eeeabd94b823d2a52851a7c9d026703d5a2119d2bd75ede0e110c5f7ac58f4c9cb55ddbcf808ca30beea9e7e3a1d845a823a92a2ac4513f53a7ab04b3 SHA512 9e7a875db1bbcaa23d76bd7ad909ce5c95304b5432f573077856c1f72271c60c94c849bb24342bbbd70690768ee301afd15dddae5a54633b99b7996c6c748769
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/videoproto/videoproto-2.3.2.ebuild b/x11-proto/videoproto/videoproto-2.3.2.ebuild
deleted file mode 100644
index 4701e0d432ef..000000000000
--- a/x11-proto/videoproto/videoproto-2.3.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Video protocol headers"
-
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
index 2ceb21bc3059..3cd23c735218 100644
--- a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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=""
 
 DEPEND=""
diff --git a/x11-proto/videoproto/videoproto-2.3.3.ebuild b/x11-proto/videoproto/videoproto-2.3.3.ebuild
deleted file mode 100644
index f6138946e0c4..000000000000
--- a/x11-proto/videoproto/videoproto-2.3.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Video protocol headers"
-
-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 ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
deleted file mode 100644
index b0a55edadd18..000000000000
--- a/x11-proto/xcb-proto/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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 1711 BLAKE2B 4116201d5e1d186318a5bb1f8a4866ccd46be9ce1c99c6c4ead5bddc731e1140f9ddf1912f3f8e2d7baf0bb0261cfa8a1b5c6dc673cc2c00a47361288831e70d SHA512 6345ebc3a9c0e1cabacc05050ca5f3888bae6d5c4ee23c58f7efe15655b64e7679efc4653ec9288b48a382a3ab94ff79e3b37d42e2f11cf815a263e92fcf5cb4
-EBUILD xcb-proto-1.13.ebuild 1537 BLAKE2B c72c3fc1355aea6d220ce6d59bf890990ff8334ccac2108f7ece6a138b1529367b6c6a9416b65399cd44a61f0597c6e01572d9498f6f9c9ddaa78381275b3b12 SHA512 d15fa2e4974ab9ba1f36918e8cde97c16974774e2ba6855f530ae1b7eee7c2b31025932d12ee9f5b01ee5d70933641aa90b9fca4d1221667ba7e901878f6bb81
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch b/x11-proto/xcb-proto/files/xcb-proto-1.12-make-whitespace-usage-consistent.patch
deleted file mode 100644
index 695794864da7..000000000000
--- a/x11-proto/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-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch b/x11-proto/xcb-proto/files/xcb-proto-1.12-print-is-a-function-and-needs-parentheses.patch
deleted file mode 100644
index fed0745a5e9c..000000000000
--- a/x11-proto/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-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch b/x11-proto/xcb-proto/files/xcb-proto-1.12-update-xml-schema.patch
deleted file mode 100644
index deb6673fe1eb..000000000000
--- a/x11-proto/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-proto/xcb-proto/metadata.xml b/x11-proto/xcb-proto/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-proto/xcb-proto/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild b/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
deleted file mode 100644
index a49cbb8e2a4a..000000000000
--- a/x11-proto/xcb-proto/xcb-proto-1.12-r2.ebuild
+++ /dev/null
@@ -1,69 +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
-
-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-proto/xcb-proto/xcb-proto-1.13.ebuild b/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
deleted file mode 100644
index 81add3e7b94f..000000000000
--- a/x11-proto/xcb-proto/xcb-proto-1.13.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 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
-
-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}"
-
-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-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index 3831fd22669f..921007faf7e6 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1,4 +1,2 @@
-DIST xcmiscproto-1.2.2.tar.bz2 112486 BLAKE2B aede4c96afe54829d1c751a436d3ad7be8858dc1455546e1188cc02e1d7180b0a3de97ce08abdf45e0320e25fa846ab4d5740e5e771987402ad8dbc8ed49b984 SHA512 33060d0f9bba92670fce6e42f5d9094e84b803fd07e61b159aafdbee40a9876b49cf844bc7bae4c628fbb11a6a0883a9ee07041b59290488f1e9dbfe6e5128a8
-EBUILD xcmiscproto-1.2.2-r1.ebuild 519 BLAKE2B 679362eeb87c7d8e3acb49f8d762992ef57eaf72bc70c4464b31fca923f21b16581ed55075a810a223ec43eebd7020e4d56cae36febced73604cb46ac0dd1636 SHA512 728b2919d6c36d37bacc5232e2b68486e0700cbbad4f9bfb417d093a8d08c3e082454a1a1bd5c1425633b4fb21163bbf6ddff40041843d7a597d565808c9c214
-EBUILD xcmiscproto-1.2.2.ebuild 585 BLAKE2B 4e0961cf9cf9d82050f7eb562c3fdb38bc67c9a925d55f012c0a576cb9b7daa74834e8f8f0871c287a995d26d54ff306bacae5f1421e2fbde8a5682ab172d567 SHA512 3c81da3dc9e87ebbba10f5a25666d57b19a2f5cff84b5730c12e1971abb1bcf3c9df12602521f0cfdf0a4039c1843b0a7eaac1c900041e27de3c780c3cd9cf9b
+EBUILD xcmiscproto-1.2.2-r1.ebuild 518 BLAKE2B c99ed0784aecd6605430e04dc9299d60040f687ca06f6dd105c852af5eb35e74309ad6e5e55f1e4f9c451aa9cd516e6d03475550dbc9eff001d352dd30e81201 SHA512 1db76431bdf235ee3802c5f427cd20715fd6d4e6579685cf68990b467cbce9f34c1bcd7ec577a3ed390b02bc43c634dee26ff0d6eb9b7ff4bb213fc2d648e633
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
index 0131e3a9a4bd..9a71190d1ef9 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild b/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild
deleted file mode 100644
index c76692bc7921..000000000000
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-XORG_DOC=doc
-inherit xorg-2
-
-DESCRIPTION="X.Org XCMisc protocol headers"
-
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 2851569e2f11..91855913da79 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,4 +1,2 @@
-DIST xextproto-7.3.0.tar.bz2 229310 BLAKE2B 21a5474ab0aaf835abf6eec860a9f0838114c616bd90d79005a7b2cd700872375fe8a40657fbd3b76768e1cdff27baeb2b8ba8c2e6c52410b03e8f9f9592762e SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61
-EBUILD xextproto-7.3.0-r1.ebuild 544 BLAKE2B 7dc7aa3ebfbaf2c01f551023fc01ae5e284d384a7b3bd1879a3569daa989fd212d07a4ec4f8915c1f0dc334597c1012e418044c48c004380bc579690f4ec7074 SHA512 eda335a53a56bbb717010b5b22e5bdafaa77648dffcea1b854038ad2db1ec26afc3e0fc0c11c915aa1a17a994f5b1be4e7c6f9a79267ff6dfa4c2a915c08fed7
-EBUILD xextproto-7.3.0.ebuild 626 BLAKE2B 1a23a8ea8ccb370d30d2d8e86c3c2ce60f9d35c2833eae02d11559e0d07d87a3c90129fd8209c257721a439dffb909bd68e3ab20172470267d29826f2da0d86e SHA512 b08c1c830d8712c94ba75824b522859f30e99d8441132360963f0dc6c7f9b7c55e38428788320e1868a067e3f20df765d63e3f3a4b60e0828231dfc8c91578d9
+EBUILD xextproto-7.3.0-r1.ebuild 543 BLAKE2B 34f417dc6a7f0b8ef9cace575d48c4844acd587365c518415e1d8ef6f916f12660074e061f33b4752fcb4c5bc43e90ccacc7511095c8a757b0c58e98d5a4b164 SHA512 56d841560b811c4d616089d489c33cbf5fa359c5550a6204a58375de636ec06f38b1473c2e035bbfc6e57b029eeabf6cd3490d00295a2de8dc3910ca421d6111
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
index 97a7dbaf3f9f..b76b2ac8f128 100644
--- a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xextproto/xextproto-7.3.0.ebuild b/x11-proto/xextproto/xextproto-7.3.0.ebuild
deleted file mode 100644
index d65a312f714c..000000000000
--- a/x11-proto/xextproto/xextproto-7.3.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XExt protocol headers"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXext-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		--without-fop
-	)
-}
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
index f187b5629c27..d6bfae80cab8 100644
--- a/x11-proto/xf86bigfontproto/Manifest
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -1,4 +1,2 @@
-DIST xf86bigfontproto-1.2.0.tar.bz2 49191 BLAKE2B e72d6d3a6ec321dff54f834422fb75e382712daeb89f02f6e6eb20dd4a066a932b874d83f3c6c730a832b6c010172c840cc08aec2ebd7b925ead90bc5bb331a4 SHA512 35b53ee1f428fee6777733264a7534a28ec6ffb29fc0ad9ab02337101d651ec94007bf840d0b591ee36a063280d4a4c71ff08f37100a63bb27581b5a9f69a710
-EBUILD xf86bigfontproto-1.2.0-r1.ebuild 476 BLAKE2B b87a1e43161c6edce5abb833ca5a31ae0867366987a3615347999bba01039966ab96d840cb5a4e208d2cb38645e29a16391dc1b0475908152b13a18521075b52 SHA512 eb6131b3f8e05f341d5a8b1b57af1a997b83f0022132e5d67a9af8be95b732b4d99c30f8319d68a64745870a624a710bb7794590b042f44c6ef17a1bbf499701
-EBUILD xf86bigfontproto-1.2.0-r2.ebuild 534 BLAKE2B 251710a13c1a8f4f04da41754c064d740342b8fdfb49d13684b0ce6d7f2a7d1f36ff0de7b8d3ff1fc774210b8f97a9eeb7930ba5a4c3e482918ffde26df5e242 SHA512 9db06903240fc4e106d4b75caa681c1305350fe1c58f146bbe6d620766b26e2fdd761d94a79f26c10582400e6402c976c062874b2df137398466bf7e10497602
+EBUILD xf86bigfontproto-1.2.0-r2.ebuild 533 BLAKE2B 60f11660ab58e0eeb1a1df006ce634e359d07ba5ebe92af31261adace3c872bd36aae127c65094da171d0c01cd33ae32f80051c5aa1c1ba86b37e17bb7a6d10b SHA512 0c0395a5e3e3a3e2aeb620163bf99a20e37ae782dc3b11b8100ea3f8332bc876ffa2105cdad407238e02b3c270e11e566c274e51baaf52b40f968cde3de25bfb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild
deleted file mode 100644
index 98d9a8db7100..000000000000
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XF86BigFont protocol headers"
-
-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=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
index 8b8e642eeb05..31de2dac7fea 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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=""
 
 DEPEND=""
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
index b8eae9b6207f..b3734456dd11 100644
--- a/x11-proto/xf86dgaproto/Manifest
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -1,4 +1,2 @@
-DIST xf86dgaproto-2.1.tar.bz2 85934 BLAKE2B 399a8291a52bf04ba3a796c407a37703d3da27c27fa69bfdc8a717468488471b6b6312275e072f8a7e878a02db694e588e3675b4a47a309b9974263fc8bb3516 SHA512 dab56f5e59d1099d0d462e2f056e073c0ebde46aae6b9cf1c12b1fda43b5f21fb438dc811305c3114e04eb2fd2b1d13ddbe0a1d9a5c8155525db82db00e1461c
-EBUILD xf86dgaproto-2.1-r2.ebuild 441 BLAKE2B e21009dfb29936a1adc2862cee97f6f7fb35dce38db6ef0c5e2b4a0aeb61905acf31fb7a68949d2940d1d7e59fab1a616cc115f089afd708356008212568687e SHA512 582eabcabddca84cb2c07410eb67e1c84e155a5eb33ac319668e970e03940164e2f443deaec1d86244f61f5c0867a1300014b69b1c0bc0b1aec556e3e953d109
-EBUILD xf86dgaproto-2.1-r3.ebuild 520 BLAKE2B 244ff8ee06c11e656b3789d1e77b788b9f164a299893096de6f77fe26a65848b0e970407c4f83968f14caa3e5b5d65c8f2e3771790cd14a024f1642c59bddc4a SHA512 90b1914e57f1090ab2c66ee342f4921fb95162bc8dd7147df31a7f9b21fe63d2c0cd4552cebb5336d1cb4e019c6198becf474fc0ac7ce39814ee3be17cab9ac3
+EBUILD xf86dgaproto-2.1-r3.ebuild 519 BLAKE2B e3e434592f2f14bcc389a2373d9c9f85e27e565b6bed42ab896a1be091bd9d595574902d786eb15468a6bf0e441aacc5b578cea733c730323fc2c5ee575c22e3 SHA512 19b111af950852753a71482b0646d5c9c8d8b209c89b82215001b160dc4ebf340ae549332c368a4c454c1a046016d590ee3a3bddaeac7aef08d5f81d7b7cc294
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild
deleted file mode 100644
index 45e63e3a88c7..000000000000
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XF86DGA protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXxf86dga-1.0.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
index ccc955388bf5..e683ef229811 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
index cebd8f265789..68fdf2c19217 100644
--- a/x11-proto/xf86driproto/Manifest
+++ b/x11-proto/xf86driproto/Manifest
@@ -1,4 +1,2 @@
-DIST xf86driproto-2.1.1.tar.bz2 96528 BLAKE2B b0cbd81a77e1660223f8c0927b2f5c5b428085a66641bd40a40f93eb55c8f2d87735d52acebe8805dcd43bb189730532c5deeabf996b5d17f10017d2dc128de0 SHA512 dce0d4da1dd703a6cdfe7676537034d43c9e84d70f20afdfe59be7929a97fbd077fa7026e41c0fca8aafd5fe666b2ee99265c8e94e69263bdf46e2be9ff34df2
-EBUILD xf86driproto-2.1.1-r1.ebuild 436 BLAKE2B 4d8e239e9e4804985862098d2bbc373521bdd3b1131885430b242331360baddc037d48d3b9b47efabc3126a277c5dca080ade12ceb8211fd05712c88b4bb9861 SHA512 395cdfc770c47a6752e5f33c533406fcfb0e31063af8c8840bcdf08b8f94fa999ae6902706cb9c0918823a767bd5aa700793f5e8301c095313ac20ca74f88de8
-EBUILD xf86driproto-2.1.1-r2.ebuild 520 BLAKE2B 6a52f5fcf20980d82ca5162a39c27c33727eb94a884dea7f9790381c449e131e3b6f144664a3aea8cbf7d6eae96a585ad84d3ee2afe36601323e8c1603dfe4e0 SHA512 095ae96a8fb4791e6b55be1f69609faaec22f6443206cff087460157867adb61f37d74f21663d4413de5d60865d09d76e4bc8b411f96b98e4ff66d4f2e7ccc7a
+EBUILD xf86driproto-2.1.1-r2.ebuild 519 BLAKE2B 0ae61a06f49916044d474174407d7f545305eaa55e39e4b1c35741eee675b7b63d2e234ed4457df41aa2f9bea6ae45a640535e8c8d04306ee96d122b30680d8a SHA512 c607641b7e210163b1d30a6b8b062fcf036ec25863e3fda1dcc0ac9536331691a695fa83c0bc80eca26b4a2857578de3a37fdd5edf5942a2c1f32f196118a5d5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild
deleted file mode 100644
index 80fc7efc29b6..000000000000
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XF86DRI protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
index 5ba57ffc5fdb..1383f406557f 100644
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
index 29d811596b9e..452cd37d8e91 100644
--- a/x11-proto/xf86miscproto/Manifest
+++ b/x11-proto/xf86miscproto/Manifest
@@ -1,4 +1,2 @@
-DIST xf86miscproto-0.9.3.tar.bz2 84950 BLAKE2B b9e6b3e68a50975408c968555da0b16c585592477109f3e2401cdaf528dbcdeb2d032b80e93dda499f9eae0bef24a65dc47a1b1f9a515b4835690c04b5d67113 SHA512 b82370ee3aff3ee13c15ce645a74e6d927df0a2db01830a21fea4c36445495849d24410639525f02f369aabe8e1b6e6ab9acbfd3a41cb3cd7e6060a9c8ae320d
-EBUILD xf86miscproto-0.9.3-r1.ebuild 532 BLAKE2B 83534d4de0c68f322e561cbd185356dfb6136fda2fb61d0be78b923a95b05a77466866aeee2336e50b25c28a95ae1f7a5a151f4517de011107d04c06d4e70aed SHA512 536101ab5ec50d00ec23e920a3bd9d6bf0b7316a9b8686269e209d8c58fc49e960ea31f6eedca68adb65670447fd600baf1b9d633ea813981a694941e5d70587
-EBUILD xf86miscproto-0.9.3.ebuild 416 BLAKE2B 805df8b00431158f59efc4c8ef3e73686d1e0e152e9ea9457ba7c51198ca8ae87071091fa157918ad9e5dc2ea0db5f3e431d1ae38f9846e1fae10398ec3fbe53 SHA512 aa2a7dd6766e7940f31b8eb0b5652756501bb125aedc0de364bc9d3f0d45b9399bfefc570c7ea5d8f8979960e065fc098d9b1ba77400264609e1f0d840fe73e2
+EBUILD xf86miscproto-0.9.3-r1.ebuild 531 BLAKE2B c651d00acfdfb38e3c298e9449dcbecd8f04fbc8e9e55073ea94f2f18e6980d1ed1fed8a65cbe20c7125627c63e39331f3ddbd6a618461d47e6acfab7ff9bff1 SHA512 338435d5943d9040688a0ae55340abed621cbcb558db0e698789152935f7a62666654df67ca8142ca3ee5803dfa89fbcfb31b3a313424b0d85c7706b9dc53cd3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
index a6fe42d7c8a5..9b6d4c011e61 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild b/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild
deleted file mode 100644
index b06cde3e2b3a..000000000000
--- a/x11-proto/xf86miscproto/xf86miscproto-0.9.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org XF86Misc protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index e0fba2fd28c8..88243a69f8d4 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1,4 +1,2 @@
-DIST xf86vidmodeproto-2.3.1.tar.bz2 96822 BLAKE2B 53d5c1896ca27edbf8df3af1b52af5da1463e19787ef13e54c9a4901b2b4b7a82717d29aba453ff7769c53d90d0e71bd6b5135f41784b32ba643be3c87e272e5 SHA512 d68784339271226a71360253b5f35d9cbec483801b4df3684bd070b1208a478edf9e5f55f1ff8ff186c81c56fb6e105e8cebad43d650cdbe605eed10bb7c7c50
-EBUILD xf86vidmodeproto-2.3.1-r1.ebuild 501 BLAKE2B 75705d28c9eca3dabcf93da4a8edc753fa6c061a6e2e5e7b84ea25a40281e2d44105b92bf3209838b1e9d55fa65d7f6ecabdcc35d58c4f1d17bff7f8dc582393 SHA512 5cd45402312385a93a35efe2824d8eda89e8c6552c90bd03eda9fc17b17fa0577503fc4bac50225536ecb8ae0462ab500e3b01c4c9554494a1fd5b2f0439fa4d
-EBUILD xf86vidmodeproto-2.3.1-r2.ebuild 546 BLAKE2B 9cbf7dc50bfbbf9dc4bb7b7f78f6a3924b7ec08fd3ddc1f6e4df688c5226eb1f5387df4762e54fda261700d6fbdf9eabba81c4ab21d710ba726bcc00fb83d496 SHA512 e5c583ccb4501de2ba67200273cbc476a63ccaf390a7a8b46c22e573279d345979aef71cec058418b69bb919d9cdcf30d206d8141c2f8bfbe9502be14f916356
+EBUILD xf86vidmodeproto-2.3.1-r2.ebuild 545 BLAKE2B bbb81d4088f8996e9df3978bf0ab4e0d4b903b2e4a4a35fc9c47904b83abcfd0950354bf57470db58e14135140a4299993c7f9ebcda4b3844781a47c4ce811d3 SHA512 9e81a53978d4b2806ad560752c8368e1fccb9265588b1ab5dd3c764e9638905133972c699ec4e42d298b018bbbb31a1000ff68e20f99ef4cf8ae18b10215ed4c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild
deleted file mode 100644
index 1cf6f945622e..000000000000
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org XF86VidMode protocol headers"
-
-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 ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXxf86vm-1.0.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
index e2676bbf92f3..20a4e7ded089 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index 20ac2e508b69..43de2f4665ff 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1,4 +1,2 @@
-DIST xineramaproto-1.2.1.tar.bz2 96239 BLAKE2B 496a3384bb1a167065cf9f7c26dbd18414af66759ec1741a09da852e204a6b90fcb0624f0207d9551f396f2b1ef3c5581a699510a75f2bb9327e6382c137d2a1 SHA512 ec2194c9bcad3f0f3eb3e9298792272213aa032ae9d6c00dcad567f31d7278a8c676fc67f47aae1a6deef5bade0b204346ed16da4a4c4d5a507c04d109d3dbb3
-EBUILD xineramaproto-1.2.1-r1.ebuild 468 BLAKE2B 64a583279c0fe7cfe9f7a9c9c5b5a45c26c13246d530c11a9334c232ace7460d827dc6c3376796b407ef78716b712739cd82816e0030673f04e71ab906c60e76 SHA512 d92188ba8d38a8e385f04fbafbf5d60ad27f5716f8ba23c0845c4151c32dff864511d4fe77a2dbd62eff7fa75e89f71ca74da6434d0778ef0d9e8da7fe700cd7
-EBUILD xineramaproto-1.2.1-r2.ebuild 521 BLAKE2B 2f6eb12bc1a2c3d1872dc1831007098ae3b1f0961b050a26c3b7527a8e05b6061c7834bfee45db9b0c9a7fccffb359e85b71b694431ebbc4b976d876995428eb SHA512 f1c1d73d5f641f22476494c9c9a3494d3411aa8170b8c43c265caec501297787a7ef3028b3dec01ee515b0759153db45628dae3871109203798c3df7fe3f09d1
+EBUILD xineramaproto-1.2.1-r2.ebuild 520 BLAKE2B 7632a2e823b0dcaae374cb96e0a17540200951e8332490c169b4baeec80cb5a2110ef0dd1618de63ae9d2af7587aca8eba17bb4bf287e5a5136bce06c4f70724 SHA512 73e27a93b262844fb85ee4e1786a62b6551f5760a146067a93d71976049cb2c3e692050629b7bae03d330415dd19b4d45a5d3b44ce166d2f6c11df3170c00e0b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild
deleted file mode 100644
index 5322c149fb42..000000000000
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xinerama protocol headers"
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<x11-libs/libXinerama-1.0.99.1"
-DEPEND="${RDEPEND}"
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
index f0936a47cbf1..2a4532cf5cbe 100644
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index afac84062e35..9296968c3670 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1,4 +1,2 @@
-DIST xproto-7.0.31.tar.bz2 300356 BLAKE2B 08b394c46ca559109771ac134d4408d58085b1f5e90c0862cfdcab4ff0b701058b652326b5a490718a1a9f4e4215f6e4645d92f6c74c922fd968ebef7c45f1f4 SHA512 bba6141525c21fd9a3cf210853658cc7af69f82e1ac15bacfffb9280efc3fe3c6fa708095b541b6f33f114c11e808bde8c8839ae63ff88e30963abdfac12702b
-EBUILD xproto-7.0.31-r1.ebuild 535 BLAKE2B b3a3856e18a4ceb9dff0944d73120b32d34f365ced8258575ef81b48a3a9adeee41cdd4f66842f29c2413e0598b30e6379139c50856dae8d6cf72f1656571c3f SHA512 00433e0b6f173f0675af6abd692cfa5bda05c3eb3ffb8017de1a0235f5feffccf0ddf15bcfeecc1da4a85ff1aabdf3da872e780a05a941d298c03fd726cbdf95
-EBUILD xproto-7.0.31.ebuild 627 BLAKE2B 994a0fd07164262a7c6c2d411a02cff12d2752acadbfc1cd3c2427b7513dd00a9250315b1271cda65baad231e34a673bdb46c95044bf1b9dd9a9ab3734115eea SHA512 aa96b4df3fb96af36e29813f90ea5cf8a80d23bdaf897bcd37c35e1cbc226875008ed91822d4e9cd0b9b71a6e5a2a264b8e1879628ca9c2b48432d3972e0921d
+EBUILD xproto-7.0.31-r1.ebuild 534 BLAKE2B 2f3c5fc2834cf04f640c48573c1f5fe6f2bdcb467c9ac75193b4449d57b9d216675417db116798af1ed277168d0e9f6072c3fc52945b45b8acbc1f2a7a3ec3bb SHA512 3ad797b331f7944ae1fb8dd112392f56e5eaa45d2fcfeb74cb8165a901912f9ef669d44bfa6c677e11ed4c082a9b550d62dd0c37e261b993e64db0cd8cf83dd3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xproto/xproto-7.0.31-r1.ebuild b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
index 14920ddd3a8b..cb603833fd2a 100644
--- a/x11-proto/xproto/xproto-7.0.31-r1.ebuild
+++ b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.x.org/wiki/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~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 ~m68k ~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=""
 
 DEPEND=""
diff --git a/x11-proto/xproto/xproto-7.0.31.ebuild b/x11-proto/xproto/xproto-7.0.31.ebuild
deleted file mode 100644
index aad6f647d748..000000000000
--- a/x11-proto/xproto/xproto-7.0.31.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org xproto protocol headers"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-04-28 20:02:04 +0100
commit	a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch)
tree	852c90a4bf354c30ea66504f70bfab5401fba18d /x11-proto
parent	5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff)