gentoo resync : 24.02.2018

60 files changed, 147 insertions, 91 deletions

diff --git a/x11-proto/Manifest.gz b/x11-proto/Manifest.gz
index c8a9b0d4d11c..d6e6e886eee2 100644
--- a/x11-proto/Manifest.gz
+++ b/x11-proto/Manifest.gz
diff --git a/x11-proto/bigreqsproto/Manifest b/x11-proto/bigreqsproto/Manifest
index c51457de5db5..5a20160466b6 100644
--- a/x11-proto/bigreqsproto/Manifest
+++ b/x11-proto/bigreqsproto/Manifest
@@ -1,4 +1,4 @@
 DIST bigreqsproto-1.1.2.tar.bz2 113218 BLAKE2B de595169050716e6474366221760845d61110cc4d71bb6b2b0ec7d28a211b4c6ed38e202e84802982f23a85fa140e36d78dda45fa499f5cba9418a39047e2c61 SHA512 9c2f98191169f7bca69601fcea5ddcb45d50b3a6bae087a2d6ee2d83f9729155b23268ad4c46a3cc99162cdacf4c8e3d7f061e58d73237da96f23123444f67d8
-EBUILD bigreqsproto-1.1.2-r1.ebuild 504 BLAKE2B 381ff42be566b6497d9c8e34b48b46a58f7c034a894b8cc1c6bd61cea4c986f3d247542ba12d930dd084364eff13050fd274ffabd5c92972565da6cf82119a02 SHA512 be6de98e3c97c3e687c61d84ae96dfb4878f2d07d770a9776a8c1a23795150ad5decd1518077bda9b31ef79380c5f955be411346204ac912805fef33ce900103
+EBUILD bigreqsproto-1.1.2-r1.ebuild 528 BLAKE2B a0ec749582da3678761fad10b5fdea0918604b7a4523d59b35ecaf06931e6d05eb6652a67a2485c1cbb3de476e053530aaf0baf876e7f6a08afdfd6880776f70 SHA512 e8187cf72f0564fa66dab9b579056e1bf72bc32fe637feacdb92616f84e3e1c3c2da87c55cf72e45a1c1caf19cc5f9f6236ec2285be5216ac328732a9729b311
 EBUILD bigreqsproto-1.1.2.ebuild 586 BLAKE2B 60ed4d8410bab64580a2b7756012925d4e8b12b0bad38ec483dcd7e2f8fe80fca0bcabdaf090e32be8f3223a09430cc5dadb25d0511d0ce1a7070ec97762a906 SHA512 b39d9bcbe95cf5f4608ad0641e31bee7deda4e74ad46e700d32177d127c19c69c822b1c75001948a507f8093ed1e8c6f21f2bf03be6f8968b08f1a18eb90da1d
 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 c6a57f0e64e1..bd8af00504ce 100644
--- a/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
+++ b/x11-proto/bigreqsproto/bigreqsproto-1.1.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org BigReqs protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/compositeproto/Manifest b/x11-proto/compositeproto/Manifest
index ddd8677f9a77..34055da5fc5c 100644
--- a/x11-proto/compositeproto/Manifest
+++ b/x11-proto/compositeproto/Manifest
@@ -1,4 +1,4 @@
 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 506 BLAKE2B dcd99aa4adc3c79725fa3decfae03f34a6bc9e48994edccb35addf172a493cc024d94cf3eb076416405f56a974afd7fab97778b798126e1e6c822f8e79d57ece SHA512 767f0059dd8c5cce2768ed48108cf488a39515ca24afb7119d16e2a38738131f1c5493a434a27dff858afcbe3720c701e0bf892ee591b7775759f290da91eb48
+EBUILD compositeproto-0.4.2-r2.ebuild 530 BLAKE2B 61cf57c733942241f0f14a2d77cc2dc837750741d62d4c1a4c8548bf6c90c33a974fcf4aa988a6516a7c94a32398f622950df8dc31c7d74c619c6a3d3e75ce46 SHA512 d8c316aec248258d28e44449138d311c92bbb7963bf3806bb1257a7edd9b852ebdab03d0153f8f77a1c3223c7e0d7b51a2912615dc81773e0eb64107fa1b622a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
index e76051a039c2..e086aacf8640 100644
--- a/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
+++ b/x11-proto/compositeproto/compositeproto-0.4.2-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Composite protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/damageproto/Manifest b/x11-proto/damageproto/Manifest
index 629fab7d3bff..2929d941728b 100644
--- a/x11-proto/damageproto/Manifest
+++ b/x11-proto/damageproto/Manifest
@@ -1,4 +1,4 @@
 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 503 BLAKE2B bfe841495e6e8911aced4e4a7d6923fda5898487a6e6afdad70bf8c353588293704dfc92c60f2e8ee0c7609b758db199988d870dd6ec491eb84f97e45def829c SHA512 c4519c87df47261642491c44935c0a2909ace27a0b85fbf91a637b4fa8ef58c9ba4fc2e7116ad614873d8bc8dd9f60cf9c5cd59f6bb91057ddc9966b84300a39
+EBUILD damageproto-1.2.1-r2.ebuild 527 BLAKE2B 34d61bc291825f95e92738bb9c6884b5cd4e753937757d5dda24bf22da0c8076ded88d1b9552d5d62ee7ca65d7d9a5681c527ad33e2d6c9a1da9e31cb202afe0 SHA512 ffacaf06762d7c1686e0a95a3afb8ef964c34eaac083b32da82a7f0a4506f88460c1fcd0f1335922255b50fba5e96f9f718771c14f3eb13f5540edff059b2090
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
index 8d089e5904eb..db2e631815de 100644
--- a/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
+++ b/x11-proto/damageproto/damageproto-1.2.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Damage protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/dmxproto/Manifest b/x11-proto/dmxproto/Manifest
index 9c17ec052eec..f693aafb1330 100644
--- a/x11-proto/dmxproto/Manifest
+++ b/x11-proto/dmxproto/Manifest
@@ -1,4 +1,4 @@
 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 500 BLAKE2B 3021316c0eeda66babdd7a9f275f22cfb6b820f3ac9a024d269cf817ad4f77483e1bf90e5550a899ebe05e8c54e511e4198a71fc9c78793f7fcc4948622fb546 SHA512 b2a42bda556278dc8a0e84bca877e0fb5ee8e85e56da0458855495dd7f5143bbdf01d111189caf03eb76a02931940202c9044d669167089584a57050b7b5e2d4
+EBUILD dmxproto-2.3.1-r2.ebuild 524 BLAKE2B e9b239fc06261980add8be40046c2de632f159c823912b9368a027b65d830bf5c3ee46fd617184d91a0de4b773c58e6c544f70f90d80798e6e08a25680c7d8d2 SHA512 af1aa64f384d4bd708df8674e4d355fdd580b62b152bfe89a9cb3fac6733ea21b44dc6dfb2eb0f09bcd2af833c19cb864801b0c7b2546a3ddc2a1943762a63eb
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
index a0f83f37cf55..98f26f92c221 100644
--- a/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
+++ b/x11-proto/dmxproto/dmxproto-2.3.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org DMX protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/dri2proto/Manifest b/x11-proto/dri2proto/Manifest
index 5d0c78050b07..ecf87ba54eaa 100644
--- a/x11-proto/dri2proto/Manifest
+++ b/x11-proto/dri2proto/Manifest
@@ -1,4 +1,4 @@
 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 501 BLAKE2B 8610e3274dbf6dbb34345db26d4068c6da3bc3cf731ae46b7a32b2d919be106e7c1372b2d187b3a09ef8a7b17fc8cd27628c843409e2b248c11a86027b19208a SHA512 0db72c97a221b858df7bcf172575bab4be06a521c6b61573686140e85236225ae106e07c1e620bdbe11d46c8ae754adf5ed73b58a1e65280c39a80e1b556a6fe
+EBUILD dri2proto-2.8-r2.ebuild 525 BLAKE2B f15e8214cb35c45b48b07fa893c2e48ae99dd4109c863765d3cff2b720396106a9de4b2d7f7ade28ee118399289f53d9cb6b09c4e522e3f1f9bd16f73474a3b4 SHA512 3d0f6beb5fd231e0bdeabaacecbf0c2a0b12984f10f2e046d8bb4f979b80574abb7ddcce28f915c5b9e99051be0e83a1e79cbb3531354a65fd23ec8292548642
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
index 1e5dc1daf5cf..205caa075a84 100644
--- a/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
+++ b/x11-proto/dri2proto/dri2proto-2.8-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org DRI2 protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/dri3proto/Manifest b/x11-proto/dri3proto/Manifest
index 99016578beb7..c783f36d6c76 100644
--- a/x11-proto/dri3proto/Manifest
+++ b/x11-proto/dri3proto/Manifest
@@ -1,4 +1,4 @@
 DIST dri3proto-1.0.tar.bz2 105366 BLAKE2B f26758ce6859b4d93414436b5fb142326f3dc71b710eecc96cca7185abd3829eaa817b34321b964628b07b94f974ae743a0d4513919bad6e342b2587b94cc137 SHA512 d2925bc2e2bfb3f30c4dc3082d84dc6a2e7d8ea02021ea02d681cbf92e6b256e9e4e0f5abfc394aa0c7762d841b1c8f82d2098c616ca1d7f4a3b5fd8a54f01f8
-EBUILD dri3proto-1.0-r1.ebuild 532 BLAKE2B d69aeedc1f73ca134de2f3d1df3020a0770165f7745c7702acb9ddf931ae9af93c4f7c6a7ac3c02867d69537aa4a2fd3738a28d895acdcd888a960f291225d02 SHA512 3da2cdb21ce697943e9d88f88f20cd984780f3e0085b3279071aa8e81c0e2b4b5df925ddc6f1cab19edbe9766afd584625300bbcfa7250c24639ff8a77988145
+EBUILD dri3proto-1.0-r1.ebuild 556 BLAKE2B a132919aac911a52db6f9cc7bd484c461425436a719e4f7eac871c67b8682f75d5b4067d46df165d334b6edf60d989c984617d2184a0124e6436e72992e230e7 SHA512 cfe509bc47a5ce8c002d99160f82a355aa91e084b71835533aeb2b8a9def3ccb477e51ce5219df6b8846d51cc7618b2a2ff2c1c48fc437e2f1add89d26f16417
 EBUILD dri3proto-1.0.ebuild 441 BLAKE2B 69d8e5af102fd961f8709df5e87b1a0ee9738a52450321b71e128acd2c6ef1f7fa09d5bf603219214c24e219e6bfa0862de74e5814ce0703ab82d7b9968ebf96 SHA512 303adce752e8439ce3f2d24319801a24f84ba9097a381c857cb53751bcaa47af5fb374e8926b678b8f84f97fa12efc62d04067ec78b4de67fa27354a91d606cf
 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 743ba46a5c65..2db3bb148c14 100644
--- a/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
+++ b/x11-proto/dri3proto/dri3proto-1.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org DRI3 protocol specification and Xlib/Xserver headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/fixesproto/Manifest b/x11-proto/fixesproto/Manifest
index d706c2207d69..183e3068c13a 100644
--- a/x11-proto/fixesproto/Manifest
+++ b/x11-proto/fixesproto/Manifest
@@ -1,5 +1,5 @@
 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 524 BLAKE2B 04093677a1dc09b06d1ede6502f7bbe26c877689785638dfd8ddf92649af1f9d4d108312f32acbfe8708bdda458f87ff95a4aff175de4ae402e54e10ba8d9c79 SHA512 507bb7e48fb52864ce4fa3e79e64855c339d39c7dfc4a5ae713dee65628d61aba2b713ccd6b05bfe4de7efe9b2f0475dc5a0fed98b5610b2b148e053e7820d08
+EBUILD fixesproto-5.0-r2.ebuild 548 BLAKE2B d86f230defda1d88bb818c7c6288d7cc2ac39f6f30cf2f71bf14461e932376ef7893e6da2f4d8a8d4f3baef10978517bef1dfe37eae09c37002f81f76448bb41 SHA512 775efef3a9620d9be7397ad45956ef2d5ea4090d1dc778a5c4a8bdf835edfee114bb877198b57b2dbcaaac64e3e35449cdabc60fea1cf96e28f0b691de88dab2
 EBUILD fixesproto-5.0.ebuild 475 BLAKE2B cc5b3341354b805b01ffc166606b7566ed5cf52824992069e1d1879ea13f53fd980986ef40c4607366690e4ee0b66ace348c373f5682b79478b2f737902469a2 SHA512 dffd10be942c1643f76c2fc7d8dcd8ee630a579414e2151186af0bf7fa5f479763e0420c724ace636023d371caee7176416b6b70d9e2b20390659fc06d8400d9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
index 30f5ae6daa59..f3e7178a7015 100644
--- a/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
+++ b/x11-proto/fixesproto/fixesproto-5.0-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Fixes protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/fontsproto/Manifest b/x11-proto/fontsproto/Manifest
index ffe3c150fb5d..ca3cd3f25525 100644
--- a/x11-proto/fontsproto/Manifest
+++ b/x11-proto/fontsproto/Manifest
@@ -1,6 +1,6 @@
 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 524 BLAKE2B 4dc8c051893121e5eab84975b05af6d1db7fbaca6e6d9ee69d5cca20c5ef6088cadb657cfbd9d48a26e541b7fc402b46c370d9a331d20a8c89aea3bf621317d4 SHA512 5468bd127441c26c0118c58e9898d549b9d166887c6c65217728a5da65fe6de7249f9242a73cb959f8a91c45d9627118a4c7bcbd06f594fd0da5c44ddd018a42
+EBUILD fontsproto-2.1.3-r1.ebuild 548 BLAKE2B f63d7ec7aedecb769b67a59b28d63a0838a5e00c825b795bce24642ea939f3fe8458d1385b05f6ed754bc52be7c21538e866af79426dabc52d5b4b043b20de9e SHA512 cf1bdfb95e68e604d4ce797dfe181f4d1885d476c9adfb3ff5f75f81bcd2f08a3a74cd31a27f3b2aa0ffcf9c1e19297f7090a4dee6f7964775f10a26f9cb431d
 EBUILD fontsproto-2.1.3.ebuild 589 BLAKE2B 759c58d1a32ef08dc8cfd2e45cc907fe294b7d379f4aec0df8a7aa0305643d7bd82e1cf60b2051810a8d279189a9155cfa2802471ac0ac3be4b7219db2a16dd4 SHA512 624d6a596e3e7913505409cd36ed06e78a502f34d39c2bf8d7449fc39f5815223028f5caad7d05e78df2c7515e08ed48eb086c8cf4356b1b09a563a9829e7e2d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
index 4ec212c4fd1c..ed40f9e1bd4b 100644
--- a/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
+++ b/x11-proto/fontsproto/fontsproto-2.1.3-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Fonts protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index aeb61a70fcf2..19011682bc34 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,4 +1,4 @@
 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 516 BLAKE2B 9fe1a5196f9635153d7d87ad6cda31719e57c2098f1c71609697fb65964c8aecac6ca6aff2b8fe651f5cea2f9abca6efc95010ecbccda400f68364e2f632d897 SHA512 710671555bf12092bb7ad753c0c382e9e4a7f5d79698c2697655a64a189cc1e714f0e9fb6a9d4a7213953d8a80db366322086616e608053db7ad307ebfaceccc
+EBUILD glproto-1.4.17-r2.ebuild 540 BLAKE2B b463a23ddc1f9a28b9eaa63a5a3e91e6ba2d36e0a1df5bcef8b2026d93bb93e9719dc1695a510dabab391d8e1ac6b51bc8f359145c1d1464e5befa3f62ad021a SHA512 d1f7ec03e4e498b17a35b0a2292fcd4b446111267569981cba7b9bcb89e5df3d5126138ab497353f53b1362a987b3fd0ec6e06cb31ec3cb10a26ee3740382588
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/glproto/glproto-1.4.17-r2.ebuild b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
index c13fea06f9a9..02011f2e903d 100644
--- a/x11-proto/glproto/glproto-1.4.17-r2.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org GL protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/inputproto/Manifest b/x11-proto/inputproto/Manifest
index 582cc398751a..119876d89866 100644
--- a/x11-proto/inputproto/Manifest
+++ b/x11-proto/inputproto/Manifest
@@ -2,7 +2,7 @@ DIST inputproto-2.3.1.tar.bz2 196435 BLAKE2B fbaf5f96c93cea586f7c5346fe16f5cbc61
 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 530 BLAKE2B cc14d05bdbc75b65b289e92a058a59563dc292a425a04da8c258c518602a8fafb1701a3db35fcd8d83380a4c57199fc5356ad2213b35b91e3f49802ee56a848c SHA512 ac250a1aa5584c90e8bccba26c93f045724fcc4476ee1cd999c824cb6e45e5d7b41100e0332f9a0d91e75e6bbe88823b63918c9c859c517576e7ea5df3d2edda
+EBUILD inputproto-2.3.2-r1.ebuild 554 BLAKE2B 2eee2464e2289fe8179f3075d92fa5a12dc637816bf719d4c633bef4aaba736baa0bf6123f0be9d37d682e0cf923bbad4dc38d7a9cabcf9ac5cd8a9264c42031 SHA512 e17edd7ec462d75543cc8547c9ffb838b61f2639dabd12e6da162c8f6c5267a9b96f966efab829f2724f121108089450cc52e04e3e33016580fc67c0a136de51
 EBUILD inputproto-2.3.2.ebuild 506 BLAKE2B 70c084cd67ff17d665c69c078980e2b8c4d09e4baaca6ab68548bac9476ce1b49bc4392c1530bb1fbb38fe5590c1b250a6ca7376eccb21ce2b667f531627b357 SHA512 ff276ee1bebfdfe9623fe3bc23e5496f779fdb0012dcf33b9ddc044965112d5abceb4444f7d7629bed6386fde7da5a2ce0d1e2f79d97e08c1765ce850458c1cc
 EBUILD inputproto-2.3.ebuild 508 BLAKE2B a88c73378ab4e2fca560fc0974e0a878dce790f9e28dd720628310970bf5f5d848fa58d53523bbe51b645902eae237337d6560c30fd626cda474de7c5397642c SHA512 3afe0ddc14feb31fe69f15bb349aa02cfa1e262b344a5257a69142b87125814d5b8d58fcf7e80fcc284ea8b50d789b03371d1b25c9b674a9505f8a1147a50d9a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
index d892fd5d2916..4f0e727bdb5b 100644
--- a/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
+++ b/x11-proto/inputproto/inputproto-2.3.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Input protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index ed8269583e16..91d9b5d3b8c9 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,6 +1,6 @@
 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 521 BLAKE2B 0593f657e39272fe6537e9077fa6cbca99e58f3ace80866f38a519e42f97fad3e94671cf8ebbe9828406ec85e11fa8b93876026545b72392af7bb0d90dd6cb0f SHA512 0d88aa31624f2cb794ac20dc9498ba4e57c0aeb4e8599e7a5020a61676640c936f8d213eafd4b936e69859f5815a27b69e5a41e532233992474e820476eeb590
+EBUILD kbproto-1.0.7-r1.ebuild 545 BLAKE2B f6b8029e137eec1f1346e877b820473bc074dbdf249d8ed243f821c1da28e8675ba321e756d90e0af44a17f17e832d62403e1959efece55ebe76ec647fa51a44 SHA512 c5007743cbfb7dda6a965d18330f0d07f317af88c3761ede982da24e508c1e2128a90e8e6277a11b6040adbe241c7e70ffedcc07db8b6554cc0681a47467bc6a
 EBUILD kbproto-1.0.7.ebuild 479 BLAKE2B be8b2505b60e80f56b8d08f2bb7f0310c8ff0b465fd5e72d5a422bfba6e67031b84c7f8fbdc140e9aaab50270bfe11b360f6c5b314d854a099344b8a1034231f SHA512 80e09ee83cf72d40c21957b2ec62d4df1aaec1cd9c3ff6e96090a2f43ef828f447eb9dc95b3358279c5e7152e9deff3f7480655c81cac474dcd01f99f41d80d6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
index 0bcd9a7ecb60..6d6a4b8a4c44 100644
--- a/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
+++ b/x11-proto/kbproto/kbproto-1.0.7-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org KB protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/presentproto/Manifest b/x11-proto/presentproto/Manifest
index 859501595110..c90981135033 100644
--- a/x11-proto/presentproto/Manifest
+++ b/x11-proto/presentproto/Manifest
@@ -1,4 +1,4 @@
 DIST presentproto-1.1.tar.bz2 116156 BLAKE2B df0e3b2f0ad33f8da05fb8fa33638478a4da965b6b81c1ec880c5cc2d3dbfa2f4e6980daf9dd58447f57deb2fa5510bd588d43488217946d67b6ac605351ac40 SHA512 2c712136c8b4e99190932928d98e1a628197d0bf25180cac196ab8768720d61f7907006315bc3610e23666a8fbe39cfa9115c5fd72914aee2498776c8b46f7b2
-EBUILD presentproto-1.1-r1.ebuild 535 BLAKE2B 47d75ed98f44daf7d6fba5c60b7d0dc00b2c88f0d587187675cf56b641b5bad92e3e06e49760aa252f4e2abea41a2846e51163353e4a52bc9ff90eca83034c48 SHA512 d9fc7d5b2220d6b220c15db98c56dc6a1cb533ec814bb2044c057be06a39de286eb5280c0f8e7dc4efce7486da5e276e961f0a40fd4a791e12f142b344c0273e
+EBUILD presentproto-1.1-r1.ebuild 559 BLAKE2B c33b87d58c0cbebf9710abe8c55591bacdf1f1aff1552b4fba5e93fd4ae400d5066f9fc3b85c2a9d14d6297c91eaf65f5473639124c684b3d9293169141893ad SHA512 c4c73023f907e8a13a6d1a968c6e5919a892534f22c133958a6d3a7ab8287bd460254833adc2221d6472897e03e826fb7811cfd16690a79bd2ac69766147b993
 EBUILD presentproto-1.1.ebuild 444 BLAKE2B e9a986d9b2ebf1bc4e753e5f2506ff55c13d5dd4b76f57f0045b89da8bc5f7d86171969446eeb1bd9f444892ef16915fa7dbee5e68f87f616bbb730f2827df94 SHA512 c45e1983ca98158ce9fd8fe8ad1a1583ebe948285b6bb689f093ed03c9813b26681c9de54bea5f8d040a00836dfe5b72830eab575d84c924e2b5b4d3ce0ad23a
 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 b83d9bd0aa73..43c75d92086e 100644
--- a/x11-proto/presentproto/presentproto-1.1-r1.ebuild
+++ b/x11-proto/presentproto/presentproto-1.1-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Present protocol specification and Xlib/Xserver headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/randrproto/Manifest b/x11-proto/randrproto/Manifest
index 73b95dd50671..03c3222ca648 100644
--- a/x11-proto/randrproto/Manifest
+++ b/x11-proto/randrproto/Manifest
@@ -3,6 +3,6 @@ DIST randrproto-1.4.1.tar.bz2 143474 BLAKE2B 84edd8193031d34534b428ebd02bd5c9b5f
 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 524 BLAKE2B f1595ac4ebf3897c0f20d2b1fb4c30794136c4615a08daa2c414420eb7646962f0afab52111195fc46101b84b042c49904007a2fe84b5f6739560080e0e33b5b SHA512 b92dc0fd5868ff4d71b0be6294a85e8d6eeeb90ed1449357843f4d5da505f065fc5872e4bad1b0a46f9b25c686726db7963a8a4a5ff11786738a9fc788f12ce2
+EBUILD randrproto-1.5.0-r1.ebuild 548 BLAKE2B 4b5ce7821fe396806b5c0b64e3588e5fc040cc9e018df8b018ca6ffe8e8c3c735b93102aa67e952ec9ec50c9df046ceef58e57f2212811e0399caabb7a4e8872 SHA512 f9116a9693e581ee802e73a1a9002adf054e94f2439c223c79cf3556f9616f729e358fa05a7b59986c863c8055ed7ae4b37e351a51850e64cad48534d3858a4e
 EBUILD randrproto-1.5.0.ebuild 472 BLAKE2B 64a0ffc21ecd781471237eb038c48a01fd7456a84cbc3d7a19be76ff9bae989d63393baf5bcdd76f6a9a59f94d9115a78cf1d0ef762b080f03e1836b3fdc7ede SHA512 c2e8064d2b3da5670e95510da49f3b9ea31c66817ce0d3d08c06fae0b646c3dc7e0702721b215fe865d7b1d079fd70163c73588c90510dfef59737bd21688f9d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
index b643563d1437..5daf023f65b0 100644
--- a/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
+++ b/x11-proto/randrproto/randrproto-1.5.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Randr protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/recordproto/Manifest b/x11-proto/recordproto/Manifest
index 9c7e8b120909..d88c4a68d689 100644
--- a/x11-proto/recordproto/Manifest
+++ b/x11-proto/recordproto/Manifest
@@ -1,4 +1,4 @@
 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 514 BLAKE2B 724e794332998ff714e47bec971ea25d9197e666b614eba3b2c8ee2e0e48b50162bafd36180b0d1f0f2852533db33d4a9520fa0caecfed4a05bf552c8465e817 SHA512 c28fb75fbe40bb6286b5990701d8e9827f46bd7bd070db72f049ad4e84042d7144cedee013a3196b04637d9f07691339ce08eafb32ee43c273bc8cfab3ea3fdd
+EBUILD recordproto-1.14.2-r2.ebuild 538 BLAKE2B 4b69548b8cc9db50872df51c3effd08b853586c40092f9feed08a1e203f60c7d972e5c6dbba007e025ed275f6ae4b33e44383ff19f237220a73f6e12fd17fb15 SHA512 8314cf6aa4b7a8a8d4b79d2ee0aa9cb9978029cafcc6c93a016488be1e033bc8c0555ea2263122b10e7bde7ef4a27a7b88b8443f8fb0e29684d8ab5db2bcdb95
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
index 9f18c8e96b51..e8528d21584c 100644
--- a/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
+++ b/x11-proto/recordproto/recordproto-1.14.2-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Record protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/renderproto/Manifest b/x11-proto/renderproto/Manifest
index 6c9b90cdda06..339762ab1530 100644
--- a/x11-proto/renderproto/Manifest
+++ b/x11-proto/renderproto/Manifest
@@ -1,4 +1,4 @@
 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 525 BLAKE2B cf23e585ae44930dc282d9072a082ff63cc72356ab7e872cfa3646eec4edea33e4949071e83111cd22a089414ff5fdb553d683e2a97ecb647263dc6cb7f5de59 SHA512 65a1445998fbf6b3e5278aec2ba24eac37b7ff94911cae093465565a4ad5a17bd6995c1def2b61d52d469b9503e8b1c40c03fb88f028200a8ea07661a73d6569
+EBUILD renderproto-0.11.1-r2.ebuild 549 BLAKE2B fdde258193d4abb97b6c9249f621ac26b8da4481b0bfa1985a12a5771806c5435e4abee221913feb485b5e967517d3e2da6e1540f7b0c1fcb5c5b3a65446ba9d SHA512 bfb410459bc29b421e276565ff8b2d5da51e227468a601e5a61bf56727dc3b893033a4c1591f4486aa3733500b87853c069108b20b1bd5ac05ca5486db0c626e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
index c945cae6f185..948a815baea5 100644
--- a/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
+++ b/x11-proto/renderproto/renderproto-0.11.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Render protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/resourceproto/Manifest b/x11-proto/resourceproto/Manifest
index 16d01702ad81..e3f2f63bc773 100644
--- a/x11-proto/resourceproto/Manifest
+++ b/x11-proto/resourceproto/Manifest
@@ -1,4 +1,4 @@
 DIST resourceproto-1.2.0.tar.bz2 102992 BLAKE2B 7e45e4a067394da92cfe57d59d68e32b379534419b5b76c7363dbdc795bed359c84772ceebb630c8fa8f31c06d384df020bd43ff2b48c3752f430d9e6a277931 SHA512 ce8c8fda178ac7fb22b192d4a0f707a96f42ecd550ae8e6ddd7e1ed0067951ef955f7bee60f63a2b2422176e5f093c38e3903f7c4e5e3bea230b934b7abcc4ca
-EBUILD resourceproto-1.2.0-r1.ebuild 505 BLAKE2B 1439289db916351f885a59a22e58a485758634e90afdb223fe0a0144266a1a4e78cdb9bd34e7ad1f207118583e094b6ca13765ad1898e05f0f88bc128b529e3a SHA512 97db76f7ea5e6ccc20e0fcc99484de47e9d2e03d05697153a0096e8a4e3e4c2e694d02a22fec04b8aa555547469bf23b5a28fe46daf4169e0403cc57dcb50aa6
+EBUILD resourceproto-1.2.0-r1.ebuild 529 BLAKE2B b92598f77cd9529d28340e4facce62ef360236cfd591d987ea0d4f0143143dfba7ff26f3d098a916517864a30a36f9c7451679a381ab6d0bcbf5de2407603ae0 SHA512 72e10e69dd788c44b03d34357300020536af131a5515c47ed0cd2bcbc3447e0f06e4edb860effcdb3e73bf56ad514590a70342cac2613914eba1010f86f993c8
 EBUILD resourceproto-1.2.0.ebuild 416 BLAKE2B 364587114469333241564cd06b1397cda5069cee71ce3f285f32029de65fd374ee6ba13e7d80c59cb95cdad65517b09461e9cb84baac0786ad41d6f02187cc79 SHA512 7c6f18e57af3d82bb3f694c1b357d89814c5fcf781bb70a74ac889da0cbcf8b8fce82c747a28893e64f508184da2b118d3159063962b896c3760a2269f6d59d6
 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 a75abbcac58f..a0a993bcfd12 100644
--- a/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
+++ b/x11-proto/resourceproto/resourceproto-1.2.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Resource protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/scrnsaverproto/Manifest b/x11-proto/scrnsaverproto/Manifest
index 95139b1e67df..886204fa8757 100644
--- a/x11-proto/scrnsaverproto/Manifest
+++ b/x11-proto/scrnsaverproto/Manifest
@@ -1,4 +1,4 @@
 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 506 BLAKE2B 14771fbb2a885d01e1748455602719e058e213d199bd0ab886ef2677164edf45a78a25b576d74690ea95c09b9610e2f12b1b7c6692ca401da014c55ceccb16e2 SHA512 c68906b4fbfacf417d52261e029f9feee9283307370cd4eb292e0888714f0de9f0f1adcbfb990c81af57f4d6b3da697184915e04bc6e94bc78468b03462b50fe
+EBUILD scrnsaverproto-1.2.2-r2.ebuild 530 BLAKE2B 5afee27720b2fffc44a9a4179d79a32fd95782dd9f7b4921c7bcca710135ed45fe2fe42524e2c9dd57691aa8bbd3881dedb5c02e9fcf758d6d099b4d8dce7f96 SHA512 2fe2b8537e1261d3b705922033bf8e761fd19a1678e526304f70661b868e851519903ac729fca8188e74ff5debbfc6187197acd126eadf8a995ebffb56e14d63
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
index c8288b0d38d9..8f76ad120ae4 100644
--- a/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
+++ b/x11-proto/scrnsaverproto/scrnsaverproto-1.2.2-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org ScrnSaver protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/trapproto/Manifest b/x11-proto/trapproto/Manifest
index 27912c91025e..d7962b66d906 100644
--- a/x11-proto/trapproto/Manifest
+++ b/x11-proto/trapproto/Manifest
@@ -1,4 +1,4 @@
 DIST trapproto-3.4.3.tar.bz2 48785 BLAKE2B 7efde2955e1e295e3b2269917933afb5ca7ede1f84e1ee70bbd62c68835a9faeaa061858b9d4c03f51bdfd9ced7828eca2527b6ece55942f6df8abfdc9d1cfb8 SHA512 a5bf93bfa2f675e874ece8510a693d3a1ca4ba0b3981740249d4c78273a74724209f5f6d83c6207038bce1c3edca0bdd98ca3e1dd7aba04dcea146c9a1a2e8ef
-EBUILD trapproto-3.4.3-r1.ebuild 512 BLAKE2B 3b72d6e8d41cbade7b740f9ca3bccb82764107290cdd6f6fb0f94ccabd12b6b6140492ae1506d85f7c1aedacab61ac84f31399e59cf5b17bb1d480943cf9722a SHA512 5fc63b9bf4a467c1acffffa65bfc2eea328a00344a09a5d22d8b0d06295f6e3f3ebd48741e9248720857dbca182361820dd576db0f08b35192a89461b95f1d15
+EBUILD trapproto-3.4.3-r1.ebuild 536 BLAKE2B b94c3cd8ace270cb0ec86a5d122985364048ad92eb4690ffc15a70b6956c10af554bf2ddbaab889dfeca9ccc11ba9969258501e35435e5737fa826dae37b5aa3 SHA512 5e5b4bbcfaccd629b683efd417a4bbb2f7d01985d1322994ff54c46dc24af2ed2003b9ca269248e168959b2e5de1b233e4d4bf1b845d70d18626a91db39a2ce2
 EBUILD trapproto-3.4.3.ebuild 423 BLAKE2B ab923ef1c6ccc55cfbe0dd818f8a79ace78fa7e779437723149a8751e76cede17c6e1060364113a5b1aefaac15041c600bb2c10eb4eddb21e05452bfec7e371f SHA512 a1b6cf95ae668ae185bdfa71b8c45fb4df1576eca14a7fef9f2e91c05e76770e81f45f11dec6b6bdee8b22badc4988f89585a8e17e014373014231dc2755a79b
 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 19b18972c2d7..b10e96d4d021 100644
--- a/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
+++ b/x11-proto/trapproto/trapproto-3.4.3-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Trap protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/videoproto/Manifest b/x11-proto/videoproto/Manifest
index f6b21dcef926..27cc27c41934 100644
--- a/x11-proto/videoproto/Manifest
+++ b/x11-proto/videoproto/Manifest
@@ -1,6 +1,6 @@
 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 513 BLAKE2B de7b05c293e0164d517e06675bcba5a3293240d4b53e56c9d76d64d7ba7cc1091501274f8bf688b7f0e29a3d8f5aeb03388897d71fcda4afe49fb54e50ca590e SHA512 1d32a403922a8fd17fd96a684ff4120a5e6a3829935aae712ccf23cefed77a8ae19f79e60a263396b2a695a3c3777f41eac8d603ba70387bce163b40747813d1
+EBUILD videoproto-2.3.3-r1.ebuild 537 BLAKE2B 97d448241e554689a0181abb559bc941433ef3abd2f4c2ffbbd9234abf2ca87907299c20b5a64f2a217f89e30f43c2cc2c916e4321ebe142c044c5960f61cd1f SHA512 ff143637896a3321c240dec51c49558bca63e61ca19af46c116e70e1dd63f41357a38a1a92226d5faf2d12ae53044119d6373b4edb54a97c53965cf6da6d39c8
 EBUILD videoproto-2.3.3.ebuild 453 BLAKE2B 4f28d5b2350c0c5bff9e236352d5e27ec058ef03c8a32052742cb98028e5bdcfe00013bb107ce3ff1909df9960ac64e1a2a9c28eeba8b77eac7978dee2df95c1 SHA512 e79ddddc465b1bf2383cf5e8459805adcca6b30c263e9a7892a561c88105782f77784a715194530449adf0529a9aac965ea30c61249a033241d91f4af2f0bb89
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
index 9009493c930a..983e4b68b6c3 100644
--- a/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
+++ b/x11-proto/videoproto/videoproto-2.3.3-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Video protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xcmiscproto/Manifest b/x11-proto/xcmiscproto/Manifest
index e348abeb5aca..61147beece24 100644
--- a/x11-proto/xcmiscproto/Manifest
+++ b/x11-proto/xcmiscproto/Manifest
@@ -1,4 +1,4 @@
 DIST xcmiscproto-1.2.2.tar.bz2 112486 BLAKE2B aede4c96afe54829d1c751a436d3ad7be8858dc1455546e1188cc02e1d7180b0a3de97ce08abdf45e0320e25fa846ab4d5740e5e771987402ad8dbc8ed49b984 SHA512 33060d0f9bba92670fce6e42f5d9094e84b803fd07e61b159aafdbee40a9876b49cf844bc7bae4c628fbb11a6a0883a9ee07041b59290488f1e9dbfe6e5128a8
-EBUILD xcmiscproto-1.2.2-r1.ebuild 503 BLAKE2B ea485e7e748a2bed35d808c2f748e38caf002d071263bc44a81af1209b821528cf29be3b9f79494097fb184907136f0a77b8c16d782368920daa5f869af32ac9 SHA512 bd20eef899531cbf24558fa20523177dadae1f46eaa592a009a9f32964ffac0e7db6d29b8f960a74fdcd6af8fdba4bdd9e04e488d1e9d1e324addce488159636
+EBUILD xcmiscproto-1.2.2-r1.ebuild 527 BLAKE2B b4b826b42dcd82c38bcef0756f877269f6eaf0b9e2ba561833b344aa78da7aacaf770d6eeb2fdd8fb171c6721ecd2e87648ffe8d711cb1d0efaf41f94071d523 SHA512 b5ec9cf40bafcb05afa073dbd105372546e1be762ed738c738691b4533093c77534ec4bdeba910fca6c30b012c4ac066f6e2a46f88bb3d6bafe2dc4f12ae2121
 EBUILD xcmiscproto-1.2.2.ebuild 585 BLAKE2B 4e0961cf9cf9d82050f7eb562c3fdb38bc67c9a925d55f012c0a576cb9b7daa74834e8f8f0871c287a995d26d54ff306bacae5f1421e2fbde8a5682ab172d567 SHA512 3c81da3dc9e87ebbba10f5a25666d57b19a2f5cff84b5730c12e1971abb1bcf3c9df12602521f0cfdf0a4039c1843b0a7eaac1c900041e27de3c780c3cd9cf9b
 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 919e7983d0da..e144c941a792 100644
--- a/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
+++ b/x11-proto/xcmiscproto/xcmiscproto-1.2.2-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XCMisc protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xextproto/Manifest b/x11-proto/xextproto/Manifest
index 9c2ce0dd9f7a..507d8fe66dca 100644
--- a/x11-proto/xextproto/Manifest
+++ b/x11-proto/xextproto/Manifest
@@ -1,4 +1,4 @@
 DIST xextproto-7.3.0.tar.bz2 229310 BLAKE2B 21a5474ab0aaf835abf6eec860a9f0838114c616bd90d79005a7b2cd700872375fe8a40657fbd3b76768e1cdff27baeb2b8ba8c2e6c52410b03e8f9f9592762e SHA512 238beed85fcf6fe5b0809e52814dd44fa45fe6868239990086cb8dd2c446292dd4794698abd07ed10bd146a7096c1679f7160da226f9e861dfaf6c8e22315d61
-EBUILD xextproto-7.3.0-r1.ebuild 529 BLAKE2B f04be83c08c5848783a5446e988f90041018de8714018549a5a71e7aab4891494d3e8e72d3c4f98450d620ed8be1653116484f2684803b8845f4c66fecf516ce SHA512 d4cb2c14a78857c5c30b91be6627cda8f4bac9a36db629c3715ba14024476d9f5bc82a6f76e34a161e86e1b5336a4fd3ffe22deb597a80d8a44a1ebb9712a58e
+EBUILD xextproto-7.3.0-r1.ebuild 553 BLAKE2B ffffb0c770fb0437d54f5a79916d5bdbe60a3163506fbec513b9bf07d9ed116183a8b9af138aad471526ae5bfcac6632c57ac5d4cc89bcdcf9dd9a91dbbff4cc SHA512 cfa40b524c994ecdc9ae96f0584c4af18f78fa646aa0825586b23be206258e6d7757573d2940ac33c9d7eeb2c72c3ef6b69afcb75037a3d9d44a0c4ba0840765
 EBUILD xextproto-7.3.0.ebuild 626 BLAKE2B 1a23a8ea8ccb370d30d2d8e86c3c2ce60f9d35c2833eae02d11559e0d07d87a3c90129fd8209c257721a439dffb909bd68e3ab20172470267d29826f2da0d86e SHA512 b08c1c830d8712c94ba75824b522859f30e99d8441132360963f0dc6c7f9b7c55e38428788320e1868a067e3f20df765d63e3f3a4b60e0828231dfc8c91578d9
 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 bf4aff802ab9..ffae14aec727 100644
--- a/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
+++ b/x11-proto/xextproto/xextproto-7.3.0-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XExt protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xf86bigfontproto/Manifest b/x11-proto/xf86bigfontproto/Manifest
index ac54fd76479c..2ea9f7d26fe5 100644
--- a/x11-proto/xf86bigfontproto/Manifest
+++ b/x11-proto/xf86bigfontproto/Manifest
@@ -1,4 +1,4 @@
 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 519 BLAKE2B 1e3b230fef729977b3a8f824dd9b57ee13e2c4a069d5e52f5f3f9319e5083b68580f25063dad466756271d05bf3ed299d564829e6bb22b79a4d3f839f9031940 SHA512 ad8af7bd20180ad34d6e49ca5e3b023ec6410dae8cd794e2c474c362818b8f0a759586d75c30590563be0e34d7b0273242119a5f33694f7ee8c0dddd1a7d3b4c
+EBUILD xf86bigfontproto-1.2.0-r2.ebuild 543 BLAKE2B 63f13b72c3525d6f02f01bdfc3c632ef341c7388a01b47faa10dda5222407982d42c6585d718173bc9ecab0c763589df27c544745b05797d23b0052cf100fa0e SHA512 f0acbec829fd3241ca8a99df11b8488fa70ce4ce38adde499e86039908b16f45b2630aca916eb297f34d5e822e99f53100fd49d1731a53a8078db1124ef72783
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
index 63a1f886f4f9..23bf43a361d0 100644
--- a/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
+++ b/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XF86BigFont protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xf86dgaproto/Manifest b/x11-proto/xf86dgaproto/Manifest
index a670dab157ca..94c62b6132ba 100644
--- a/x11-proto/xf86dgaproto/Manifest
+++ b/x11-proto/xf86dgaproto/Manifest
@@ -1,4 +1,4 @@
 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 504 BLAKE2B 876c47915737498c4950b601e07438cdc074958acf9c7c68cf4969789d1d137cf83c6709462d886fb13775e9c22162d8a6a4f7a0a7d2d323bf97f75d6059aeed SHA512 53a2ac446e96376ca35e19395f1f4b8ed528e9064d50ec62f656899fc20623ecaeeec7bbb9230cab629afae002698aae17eeec99c63cd27db3490086c2ba564b
+EBUILD xf86dgaproto-2.1-r3.ebuild 528 BLAKE2B 1742d556555b8f2eeeb3644380a57e3317ae7809b4b21fe89af06d7f959164230a07277a7301fffdab3fa347b46a48e0c36ca750ac8523e1ea00e94f57a4762a SHA512 9c26565179c5c184e62698fd0bfff606973f7fe30fe8286122e59c24a293e08170fdcdce1d65e38194c925bbe9b8cc6deb2c67cd76b24185b80c220af4b91767
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
index 4092ff7b6cbc..f4ed6f35f72b 100644
--- a/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
+++ b/x11-proto/xf86dgaproto/xf86dgaproto-2.1-r3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XF86DGA protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xf86driproto/Manifest b/x11-proto/xf86driproto/Manifest
index 2f6ace12ac99..0823b3137bae 100644
--- a/x11-proto/xf86driproto/Manifest
+++ b/x11-proto/xf86driproto/Manifest
@@ -1,4 +1,4 @@
 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 504 BLAKE2B 31b8a02744adeb1219f36765cfcd796ebba5e13f1c9528ae88b73c3d46e6f866abb8c35cc0b3cf3bbae3117ed9433ea3f0addbf823f687feeddffc8bc59fcd1f SHA512 52058d779628bd271911c2ccb4ec2a67e99864f0f2649161bc54d2f1b8285dca735ef866c2682b7c77e153f24f52a8524531fba52e02c2c30e09dd8cf5512601
+EBUILD xf86driproto-2.1.1-r2.ebuild 528 BLAKE2B c5076666fd63f61b6f8f39a6006c0b556a2ff7f88bcbcde9ec5d1ed6079e2efe004d903d62e5e33ff12928d1019dd70b397f01228b13384f63303ea4a1f0d42c SHA512 f818fff5dafc81c60dc8d95be810c643abd11d671a694fbe6505a7ecd5c3a2e6e641533d5c0f8d27647f03ef1651e903a4fed2b91269d0b01da50e48527f17e4
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
index 385b39e2e609..56c563cbeff6 100644
--- a/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
+++ b/x11-proto/xf86driproto/xf86driproto-2.1.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XF86DRI protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xf86miscproto/Manifest b/x11-proto/xf86miscproto/Manifest
index 328aa0827691..b6ad4a2c4615 100644
--- a/x11-proto/xf86miscproto/Manifest
+++ b/x11-proto/xf86miscproto/Manifest
@@ -1,4 +1,4 @@
 DIST xf86miscproto-0.9.3.tar.bz2 84950 BLAKE2B b9e6b3e68a50975408c968555da0b16c585592477109f3e2401cdaf528dbcdeb2d032b80e93dda499f9eae0bef24a65dc47a1b1f9a515b4835690c04b5d67113 SHA512 b82370ee3aff3ee13c15ce645a74e6d927df0a2db01830a21fea4c36445495849d24410639525f02f369aabe8e1b6e6ab9acbfd3a41cb3cd7e6060a9c8ae320d
-EBUILD xf86miscproto-0.9.3-r1.ebuild 516 BLAKE2B b744bd2e2a8203c1452b8c7a3d664a3be4aaa198d0e01209057cd4b9d421a8f73e2e23d7aae4a5441c0b544f2b29d3f73a36fee5d4f66056c759ebeecec428c6 SHA512 ca73ae185c888dfbae2436e22acdee7ced973f31c36273d5552ebeb12d60b2012020333fa8cfb588657a38e3d8f850f25fe9b0219143a911644e10fdec324f5a
+EBUILD xf86miscproto-0.9.3-r1.ebuild 540 BLAKE2B 7eca6f166509711adf5a7552a727ed0670d92c845766a7ce9b370783681663bcb9de9263ab3d88dd8c47695711e83ed82c718cdac2017ef18f0fe4c707f2af04 SHA512 c21e9f24c1565f5385ca97b9d133e196793080631a87f72d2e05e47fc04a45124e23f074cb62698dc5d6e1bd191c1ecf2001f3799d9b4520ad0a305768545199
 EBUILD xf86miscproto-0.9.3.ebuild 416 BLAKE2B 805df8b00431158f59efc4c8ef3e73686d1e0e152e9ea9457ba7c51198ca8ae87071091fa157918ad9e5dc2ea0db5f3e431d1ae38f9846e1fae10398ec3fbe53 SHA512 aa2a7dd6766e7940f31b8eb0b5652756501bb125aedc0de364bc9d3f0d45b9399bfefc570c7ea5d8f8979960e065fc098d9b1ba77400264609e1f0d840fe73e2
 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 b3fab3127204..9bfe52aa37d6 100644
--- a/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
+++ b/x11-proto/xf86miscproto/xf86miscproto-0.9.3-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XF86Misc protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xf86vidmodeproto/Manifest b/x11-proto/xf86vidmodeproto/Manifest
index e3f099ab0715..fa74da30260f 100644
--- a/x11-proto/xf86vidmodeproto/Manifest
+++ b/x11-proto/xf86vidmodeproto/Manifest
@@ -1,4 +1,4 @@
 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 530 BLAKE2B 4daa8b95e9de349e9d85a817e56986580f4a53024a7009327da81a0bd20f4e1c831b17d798b8adce2471e191cb5eb675ffb9ecd38f89db2e4f396f373745c52e SHA512 ecee5505464e00f5934cb410282d5047f4a8eda18d757beb1552e76fa6bb8cdf21274de758c097251696b6d7d5c96525c9862ed67185506cc6e0d0fa00f0efb5
+EBUILD xf86vidmodeproto-2.3.1-r2.ebuild 554 BLAKE2B 2d9ce9a63517e26cbef378279996f070924470da16f979ee8700ac8347c76bad7ec056c13005e9dbd3cb6c347d18b5b38ef7e213a6b221dc1ff7dfa0b6e04b93 SHA512 0ed9c049701de6cc137270a03f29d39b15c8ad6ddd069cd59e644a655e818cb355ef903b4bdd7fb228e73b66902a88f5c2730bff6dce25c8a0ff00a82e290f4b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
index 2271a6d1402c..586b90e7a97d 100644
--- a/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
+++ b/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org XF86VidMode protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xineramaproto/Manifest b/x11-proto/xineramaproto/Manifest
index c95a1b8120e3..8bb25a4a13b8 100644
--- a/x11-proto/xineramaproto/Manifest
+++ b/x11-proto/xineramaproto/Manifest
@@ -1,4 +1,4 @@
 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 505 BLAKE2B 6e183d43c73179c59c0cc6f708832755ef8000560598835c3a8f6de5ca7ed53d3a92ce485f085de9d3e912977e5020a41a2955b6bd6ea6a4790592f8566c9cab SHA512 d560073f598ae0d5546ff0c0f09971f879909dc629735d7670205d51a88316218decd6342a46b34ec53e9ed01489bd657f3cf1d3785fe3eacc4e6d1ca6947467
+EBUILD xineramaproto-1.2.1-r2.ebuild 529 BLAKE2B 75931d18e0a93e4c7aabdd1c68f7033707fd6f426775d81e817a04bc7b7ca3fdde818a5fb2eecbf5fcf95dce7472c44354b29832da13075768c7d61daa8aff07 SHA512 88dc9c6833f11ed36ec4701d24da2893c27da8f651d9bbdc6d7c8c63ad5b253d3786f67739c685fa361a5d5b5c825b2c9eadcb00f326eb3d1174e69d3bbf2558
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
index 25de9b2eecc9..3f4845e01848 100644
--- a/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
+++ b/x11-proto/xineramaproto/xineramaproto-1.2.1-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org Xinerama protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"
diff --git a/x11-proto/xorgproto/Manifest b/x11-proto/xorgproto/Manifest
index 6923ec2edbb5..5adedf0fe83a 100644
--- a/x11-proto/xorgproto/Manifest
+++ b/x11-proto/xorgproto/Manifest
@@ -1,4 +1,4 @@
-DIST xorgproto-2018.2.tar.gz 461877 BLAKE2B f7a802b9dec3c51981a3244cf62ffe0abd89f88cb28d3a3799e8a174ea11e48a0faf85febfcb5e96e12c3a843cdb09077a6aa4101852c748a15bc847ba29c883 SHA512 31bff77c54e4832dbd55534b90606e49b2face0356245edd7d6028f26b06fa9e95dab63aed23d55f8552291fa384f65dde2f223b96cc705e98c425a1d0dd3d4b
-EBUILD xorgproto-2018.2.ebuild 1724 BLAKE2B 60e245f5b8a02cf15cb8d0d2f1bd6274e1bc84a11c66c37b797f466511bfcbb946bc7fe13de6a714b91fcf6129ed5a185813ce9237f8ce5c0bc4acaac1e14741 SHA512 538e7f2c4a8f7623ac4c1635d91de6eef2c695b2669206f4dd75a0fd7aa701e68cac66496d42eee6364ad5309bc7e5e1e3b61e127d83a103f52253b643a0ed5a
-EBUILD xorgproto-9999.ebuild 1724 BLAKE2B 60e245f5b8a02cf15cb8d0d2f1bd6274e1bc84a11c66c37b797f466511bfcbb946bc7fe13de6a714b91fcf6129ed5a185813ce9237f8ce5c0bc4acaac1e14741 SHA512 538e7f2c4a8f7623ac4c1635d91de6eef2c695b2669206f4dd75a0fd7aa701e68cac66496d42eee6364ad5309bc7e5e1e3b61e127d83a103f52253b643a0ed5a
+DIST xorgproto-2018.3.tar.gz 486632 BLAKE2B 9343f3d6be7c579a1dcff387d8668ae56e95e144657a619439dad57788c657a9dbfa40821dc7a551229d5921e247421cf26bccf60d8a41bc99bf05ac1b8845b2 SHA512 94f9c2573fe816ed6f359c1e1a7db92b9e0d8c7ef2ea6fcd6839e34b27b9803ab966d9f0ee29923e40361d189cb51279a18c09bcfba130a7dec8b3cbae01245c
+EBUILD xorgproto-2018.3.ebuild 1724 BLAKE2B 98794164bb49895d1ab7fb0fcb0ff70fc27802db5a09825e36dd8d81c4194b59c6eae8bc3fff91d7e3f4d0ef6671ecaa26360314090ebcde7aaee66fc9dfa5d4 SHA512 7c58b30543c93804650e251e1ef4e93a7c00057bf1e29588874ca46c086ae1b711ddc54dca88e239dd02e324d1532ebd0a5f7d9d4c7a1fb6ed3db32b6f5f5abd
+EBUILD xorgproto-9999.ebuild 1724 BLAKE2B 98794164bb49895d1ab7fb0fcb0ff70fc27802db5a09825e36dd8d81c4194b59c6eae8bc3fff91d7e3f4d0ef6671ecaa26360314090ebcde7aaee66fc9dfa5d4 SHA512 7c58b30543c93804650e251e1ef4e93a7c00057bf1e29588874ca46c086ae1b711ddc54dca88e239dd02e324d1532ebd0a5f7d9d4c7a1fb6ed3db32b6f5f5abd
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-proto/xorgproto/xorgproto-2018.2.ebuild b/x11-proto/xorgproto/xorgproto-2018.3.ebuild
index 9b4dce089d5a..a72ac3844f5c 100644
--- a/x11-proto/xorgproto/xorgproto-2018.2.ebuild
+++ b/x11-proto/xorgproto/xorgproto-2018.3.ebuild
@@ -24,7 +24,8 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND="
+DEPEND=""
+RDEPEND="
 	!<x11-proto/bigreqsproto-1.1.2-r1
 	!<x11-proto/compositeproto-0.4.2-r2
 	!<x11-proto/damageproto-1.2.1-r2
@@ -57,7 +58,6 @@ DEPEND="
 	!x11-proto/fontcacheproto
 	!x11-proto/printproto
 	!x11-proto/xf86rushproto"
-RDEPEND=""
 
 src_unpack() {
 	default
diff --git a/x11-proto/xorgproto/xorgproto-9999.ebuild b/x11-proto/xorgproto/xorgproto-9999.ebuild
index 9b4dce089d5a..a72ac3844f5c 100644
--- a/x11-proto/xorgproto/xorgproto-9999.ebuild
+++ b/x11-proto/xorgproto/xorgproto-9999.ebuild
@@ -24,7 +24,8 @@ LICENSE="MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND="
+DEPEND=""
+RDEPEND="
 	!<x11-proto/bigreqsproto-1.1.2-r1
 	!<x11-proto/compositeproto-0.4.2-r2
 	!<x11-proto/damageproto-1.2.1-r2
@@ -57,7 +58,6 @@ DEPEND="
 	!x11-proto/fontcacheproto
 	!x11-proto/printproto
 	!x11-proto/xf86rushproto"
-RDEPEND=""
 
 src_unpack() {
 	default
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 13b0f9a7dae6..36c6faeb7451 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1,4 +1,4 @@
 DIST xproto-7.0.31.tar.bz2 300356 BLAKE2B 08b394c46ca559109771ac134d4408d58085b1f5e90c0862cfdcab4ff0b701058b652326b5a490718a1a9f4e4215f6e4645d92f6c74c922fd968ebef7c45f1f4 SHA512 bba6141525c21fd9a3cf210853658cc7af69f82e1ac15bacfffb9280efc3fe3c6fa708095b541b6f33f114c11e808bde8c8839ae63ff88e30963abdfac12702b
-EBUILD xproto-7.0.31-r1.ebuild 520 BLAKE2B 6c78cfb241f7677a2b6e9380081649bb1171762d13d9b4d8e3753856be729482b9637c2293338c38c043c5ab2483c78f2fab089a654fe76b1ffe3af19840aa68 SHA512 7a37e0590fe0d40422e80e42f9a4bdcde302738909dd98f6bc312d63c85c3dbcf81590abaabd6ff21ad2de0583d53fc1a72dbe8580d60a0f875864a3775d8900
+EBUILD xproto-7.0.31-r1.ebuild 544 BLAKE2B 22846561cd9d478eb477eeaad52116ae0bc0d7970119b91974047de3b30250867732dce6a634a43312ec746debd37eaec7c8a9c8242ce5a9c3ef7d1916db31ea SHA512 21b74adcc3e7c251934d4f4079d108db64f54ff0e3d53c84c055e3daabe2471448caf6039cd423be6952aec5b206c4027914f47c01175199aca0ccfc5356adc7
 EBUILD xproto-7.0.31.ebuild 627 BLAKE2B 994a0fd07164262a7c6c2d411a02cff12d2752acadbfc1cd3c2427b7513dd00a9250315b1271cda65baad231e34a673bdb46c95044bf1b9dd9a9ab3734115eea SHA512 aa96b4df3fb96af36e29813f90ea5cf8a80d23bdaf897bcd37c35e1cbc226875008ed91822d4e9cd0b9b71a6e5a2a264b8e1879628ca9c2b48432d3972e0921d
 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 c64f8fb63f84..2a8172c25c81 100644
--- a/x11-proto/xproto/xproto-7.0.31-r1.ebuild
+++ b/x11-proto/xproto/xproto-7.0.31-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit multilib-build
+
 DESCRIPTION="X.Org xproto protocol headers"
 HOMEPAGE="https://www.x.org/wiki/"
 
@@ -11,5 +13,5 @@ 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"
 IUSE=""
 
-RDEPEND=""
-DEPEND="x11-proto/xorgproto"
+DEPEND=""
+RDEPEND="x11-proto/xorgproto"