gentoo resync : 23.03.2018

20 files changed, 20 insertions, 125 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 07608e1d9957..0827597cfe8b 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 6431e821c3c6..787cde06743b 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -4,7 +4,7 @@ DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B 2015594f2a263250b7fd924840155aa3f813e
 DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B 3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e SHA512 ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
 DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252 SHA512 dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
 EBUILD cairo-1.14.10.ebuild 3948 BLAKE2B 1d0341e593ec6a05f3d085e794e78e80d8e77c97d48ed18a48531a40afa1976c24128942ed44059616597816f9eeb812d091740279eb3ecb7e5246ed48de85a9 SHA512 c7a336a2ac1479f437b8004c5ad4b38756b1056f1cb9d0ab4dcca97e1eb61c240114f867ee66e9cff1273156f5c6a472cca1c7ccbfac7a7b283c98c03c1d4a62
-EBUILD cairo-1.14.12.ebuild 3940 BLAKE2B ba36e1c47c5e3142eddfe943153371578a0e0132eb48bcd113601df4ce16b65e13f638f603c6e09101d337012e0dd79d9e0d0145c5ceac4c5722a22b3e6041e1 SHA512 4ced2654ba2e8e96e9e785047f075fe8679a224df0310fa79bf02b9d1484736983a4220b1838b4af3781250a6a7a285ace9498afa79237127d85594d15b42dc1
+EBUILD cairo-1.14.12.ebuild 3938 BLAKE2B 0c8f0e5cedd006f2fc75fb97fab1fa0e81125844223218ef30108089aa344a72a61138d136b4957e2ee0e108ec6529bd46571cf6bd4f90cac543c913bbaa6c56 SHA512 52c28b5ff5004cf791084195165e889fabf6b0469a76efaca5a0a52df1325e2fac29a281260f8d0e3cbbb79a8ae598ecdb3c7dceb531b91b38a87f3500fd4e65
 EBUILD cairo-1.14.8.ebuild 3969 BLAKE2B 446cac4d88e0805ded1a3ca9702eb58ff0b78c5c7038dc4a4671f8677b1ef8d0e88c75d94e16a0366652835f83c542e5841c645160203ce3f3fa4006b16c5f4c SHA512 32250d74eb8508f601bb35096c2446bcf67494bad7d7e4402173044e46d9842c5c8c00361b8884a05fb7f2f5b58f90283e0a0a11036ec71814c4853676d66f97
 EBUILD cairo-9999.ebuild 3997 BLAKE2B ab2fb119f30ab78b474e42a342893dbf0157c89b37cef389d17abe614fc349de707e29b71f27c3aa46c1e84ab4f9c308636a444296cfea459ceeedd0f2e4345a SHA512 5ba225067a8b9def6881f0eb57f57dc2916d0f695bd74d48f2d2def24f413a18dcb37b81879193adf63e949e719c997cc11f6fd4ff5b746cf944f9757e03ee7a
 MISC metadata.xml 821 BLAKE2B 849b86bb474319b9787ec50aa29354fa84a2decdf36074e6618a2a5f1c120c48470c4a54ac7ad8e1c34e9d79b190e1b265f8eaa4f8179c15fb1679d4e35b9ffe SHA512 f15c40e43476dbf8ea426092f80110f10fc3acf3035b57b1d25a94cb4437252cdbee59fca5f054248c62eecf75afe49ab4ba8b12818e8f571217899c2b536ec5
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild b/x11-libs/cairo/cairo-1.14.12.ebuild
index e3cfd44ca758..37c94b9168c5 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~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"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
 fi
 
 DESCRIPTION="A vector graphics library with cross-device output support"
diff --git a/x11-libs/libXext/Manifest b/x11-libs/libXext/Manifest
index 6208beee70e0..dac98a4ff822 100644
--- a/x11-libs/libXext/Manifest
+++ b/x11-libs/libXext/Manifest
@@ -1,5 +1,5 @@
 DIST libXext-1.3.2.tar.bz2 378901 BLAKE2B f2b1b12b0437f560153e41962b12282a56c9bd3f1b4db2c6eb72eed3c0a0268c63023fc797c5938bd1cb5af518e9a2a1c30e6904c664bb051fb66b1c3dc296f3 SHA512 5ed612f2c5e902648eb0438bfb8d9d6440a5baa19d95eb1253b51fe9ad8dcf903a7ee68a9455044d17ce0d486e421df0f98a069ab5ad1a49364f157bdf64efe7
 DIST libXext-1.3.3.tar.bz2 389523 BLAKE2B 5f187b85bcc4736c57011964821ca7fafc4ef44caefcafe60fd4c14fd8f60df8e9bd67136d067b62aa1b16e43ee1ab158f0931f9c1120fb4e391dc40ad9a0468 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a
 EBUILD libXext-1.3.2.ebuild 717 BLAKE2B 47a74c0149a98a141d480a324447a7aab2545781e5c5b45eed7bf37459e858e40115b708ec5af36519505e323a971ba4d166ce660b8e77940f4049b0a897408e SHA512 20277830306c87a0f0b11b515be9ed78ab8c71bb7dc49433b6e192fcbe07e4e84bc2cef7b436ac9af8b9bfd5992756032c7dfab5a83d612ccfbc9be1a4356b1f
-EBUILD libXext-1.3.3.ebuild 722 BLAKE2B 3ff6ab75d7de350b2c2c1e65157bd851e16b6840832ae02514287f8977e8437881b28320cf94f035edc72d0f4fdd26f5d513ee00f50de766297b482bbb97959e SHA512 1f3d8ef18d242707429cdd0c356f0d31f1d619af6228492b07c9d26f760dc62c936a0db1f2110c473dd74a4e791db68c1ce1d6a826dd88a37e810b6358716235
+EBUILD libXext-1.3.3.ebuild 721 BLAKE2B ed4b34b12f1693e13e22176c00c9d4f1e40bbf143516c0fa9b9f05554feb290a00f693d278618342fe7e477db723f9665e20d0d60e7f9e4904feec9baab17509 SHA512 feca85f2ceae5794ca5a22d322f8c0c59a2eeefd6a0f7c8bcc9dbc488d52e5514ec7d864d17145a9525d5413bd349d4b8d15457b8e6d9b7067c30774796088e6
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXext/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3.ebuild
index 0f7f775f9662..442f8c0f7b56 100644
--- a/x11-libs/libXext/libXext-1.3.3.ebuild
+++ b/x11-libs/libXext/libXext-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xext library"
 
-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=""
 
 RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest
index 0d8219d436c1..08c4847ef4c9 100644
--- a/x11-libs/libXpresent/Manifest
+++ b/x11-libs/libXpresent/Manifest
@@ -1,4 +1,4 @@
 AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4
 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b
-EBUILD libXpresent-1.0.0.ebuild 708 BLAKE2B d0170a4dec1e3f5a5cd6558d572b4113241ce20341cdd388c6568700dd1fe0b67277aa7558aa8e234642bd67201155b632485c5eab50fee1cc5f088afc9211f4 SHA512 fd57f308c7c1c25ef94ddbe8c78063ea862c07bfd28cd18c788b0b67fe524cf7244248f27311a32748f7dd877264b906d13db97003ff70f2ea0c1efbd5b90d37
+EBUILD libXpresent-1.0.0.ebuild 707 BLAKE2B 9980225f3fcc1824a4e2c35380e5b42440adfc549532f2e0f82db716888f439dc8a0c8e6c786a18ebae63c73ee1580cf921ce7ac81c4eed7d2f4f994caade810 SHA512 15536aaaef33c07d3cdfbeee7ba306eedcd067bdf44f2b24ac202a64c1ce20ad057526b9569e14c9bc6c428cfab22d56c4c7703db6ba20ed79bfe0499a938db7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
index 85701d296673..c0299a35a90d 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X Present Extension C Library"
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index e1e2f78bbc62..d1ff8d32faf3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -4,7 +4,7 @@ DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38
 DIST libdrm-2.4.90.tar.bz2 822164 BLAKE2B 043428cea0f74b69577f79b3b9422546821945bb1120390d22b01a9e2a6460014eeb3902ee84241da8ba2c7683e76eb81d117a4f312ef3b8eb69647773d09710 SHA512 3d32d60c44ffdcb58667d0926e6af8d375332add1f243d8b2d37567aeef4e4b26d786294aeecf46c3dea94fc002fb73756567c457300703acfc21e32ffbd458c
 DIST libdrm-2.4.91.tar.bz2 815419 BLAKE2B 7df2a4bdb4b2708cc00b71173e7e261ab7f8645a473984a7cbda2c7073f14b7f87d53eb39cc075b743e72e4cda03b2c4fca6b9df6c7d5db2c739398a13f13f35 SHA512 07578c00c121ba37033db7172590e26d1545f81c242bbce2cfb7fb904bde504822c275d6468e5c5d20360d0046ae73d9b058aa0459ba35eb11927141cc998772
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
-EBUILD libdrm-2.4.88.ebuild 2040 BLAKE2B c2ad4b1562f73e6c2d8ef2f92a56ed3fd6e641987f7cd141b8bcbc7135569dad2e7deedd53b28706318f6d27e2f2daeaec78b8f66717e1bf03b4c5ccc8dc65d8 SHA512 6549f96311d070c6b7cb1284b203c540a285f6167eb3f5587bb85ea37d31a44314e6bc57a78df96047b40e0117ad0e0e5ebc93dc5484018d5678fb82b5b5a4f1
+EBUILD libdrm-2.4.88.ebuild 2039 BLAKE2B a7484a4d636199aab21579b20951cd01be4bd9fe16d3299cb6304b3dadff5225e180e167b606c29acc67c8788e556bb47173cd7a5c599d68e0b74ab34c911444 SHA512 0627dc93340ae2f50cb1c89d345364a947203c8d4d200a9bc507ed95829959fe9aa54b2a946f47028b4c8fd1b81aa6ede031ed79afbffaa4baf48432f3e49cc8
 EBUILD libdrm-2.4.89.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.90.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
 EBUILD libdrm-2.4.91.ebuild 2133 BLAKE2B 0bf395bc04e02b7768c51004d2f54f0020dfb30640438ff288988243b990b4e9886a227a083a28427b662a98bee8968e34f771aeb1651de7dee67f592fb55161 SHA512 f864cbbe4e81f23c7baf508c48fe6fd06b0ae8eb068e51b54985d341025dbb19842451bf4b8be5679f23085aa4a6ecbc5551700a5f807c6234a533766f575777
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
index 67ce15275409..7a5da3105ebd 100644
--- a/x11-libs/libdrm/libdrm-2.4.88.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index e256ed756908..2108e81f1156 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,5 +1,5 @@
 DIST libfontenc-1.1.2.tar.bz2 294884 BLAKE2B dee29ab3c7f6ce4369d511cf9716f137a036932b4743842dcc4ea36ac093af43a6f274cded2ff9970626cf328e45cbddb8fdc996e706fd154f5bf83647cfcb20 SHA512 e0905592b7ef65acb8298b9807f90e68d18eddf3112c6232c1c774603c95ca7ec7f6db161e133dadc00d8791c5f76d4c3d65aa95544a1500c0767b88fdb52f45
 DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
 EBUILD libfontenc-1.1.2.ebuild 546 BLAKE2B 8830f909d9005263b6410dd6412839cf2ae3c6e2780b28cb01de3724a04417ed16a11474e75dbba67c4a5b9cec7921b77b9e16c46f06c08b91a9999379400ce5 SHA512 cfc31442eb9d8f0579ec3757f9adc5bf128724ef6108c7b7e3c70312d25fab4b5daad5aa29b506e35078e38d7d887ca136620afc4c71c3b19d1835b922f7407c
-EBUILD libfontenc-1.1.3.ebuild 549 BLAKE2B 24eb006d24fe8fa8e37305d91414636ec205b573f32f92a370b0287099a3061b042111cd40667e9e661844249f2f1dd99aba18836ec3cc78592aba4541b0d3f3 SHA512 f9d14311904f9d1f5965c27c7f5b2e0c9e20fcee4994884e5f98b3ce50e7cc3daeb8131ebbae8fd677cdcf8dabbbdb5522c9db768a78f8ecc5e63e4309b997bd
+EBUILD libfontenc-1.1.3.ebuild 548 BLAKE2B 2511ed11bb919e55ed0fbfdbb6a0f18703758091cc4b79739b86aaf550f44e2e81a12430b3b8d33d47fcb00c6b26fc4defed8a88d8b0218f839cd1ad65b9f56c SHA512 6e2060dfd8de400fff99f3149c5a236548e6dc07b12991253a59757766fd29c5ed67bf61fd4fe93ae116413a16ad3dbdb8416f8829eab0bdafc42dd379897aa2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
index 02a8aed24ea9..818d54079017 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org fontenc library"
 
-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"
+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="sys-libs/zlib
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index d6d03afebc7d..5e142544bb93 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -3,7 +3,7 @@ DIST libxkbcommon-0.7.1.tar.xz 622384 BLAKE2B f45c0a8f882504210e1fd7d4535643cb42
 DIST libxkbcommon-0.7.2.tar.xz 630276 BLAKE2B df4f29be0583f40008b48077dc5d4c0de7bdf66fc5df6e6df723f59623cbc681578f40fa5240fbef62ea785aed049805b65bfce82eb6497a4eaa27660103a10e SHA512 4a06f9d719393a34689fdd74b0cce80af20e26cc5bd6e1b34fff4093a4f8f103704bdc54f0245b62903cdd7529cd8d59864924b9f4ddab314d152804da4da649
 DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5a1f05ca0656b03716cdcdbf3172344d600b3b2b646da309ea3e4f04bde1b1279c96b07c493266ec6489935177efbbc SHA512 ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163
 EBUILD libxkbcommon-0.6.0.ebuild 951 BLAKE2B 37edc93a4af4e6f76d0e94e478cee9633ff0c945f7ad8dd5d15ff8d41231f9d6b820e4e001cdd9fd2f2cc0da444281b9637fd0778e6971b5907351f63ffeadcc SHA512 de65aee937a33286f600d70aa94d75b312c3ef54f1234054b26414db5699927108d20ed1b43fd1f4a4e6bb1fa165ca0d568da18b1aee840c40d1a19b25f548ca
-EBUILD libxkbcommon-0.7.1.ebuild 987 BLAKE2B da1a1464e08aef8d81f26101d13afd1bb483358e7991f8ec655f5f9377949fda0539b31bd81f60e65a30ff458fc07850d5a7ad287c75be81f3ceec1b8d7531b7 SHA512 806cd4dbbf80cebbbc214aabf53f0de9b2100825c50e68686c0139fad75a1d33ce333f5ee5cd993a65517e857b80365f2212e643af348db4f67787c727865f61
+EBUILD libxkbcommon-0.7.1.ebuild 986 BLAKE2B b5fbcb23d89770c2c138623d3e8b57bdc57bfad1de2b63c547fea5b8bf1e43f2759d5d8fcec336873321d87321eb1f5e30bd2ac525ea74b8b04db8c80609f9b5 SHA512 cd5d6383fd37932afc59a79c8018da07e81e706906f384f79bf5bf0603a1c921073add913433fd216c046bacbb7cf4be90991f322d5408aa2513aa59f5564506
 EBUILD libxkbcommon-0.7.2.ebuild 995 BLAKE2B 277162985edb0258a290a6cdc0f3efb7a70f3ab7933cf414ccac08eed25c7b1863502405a5ddf1f55b1a0c37caffbb75d86d5b3cb5e984ae240a5c324c819b89 SHA512 b6fcbfe5723191ebf1390b63b21c49142f952b138e703c5715f693670a8eb8039f5808135ef7ee57d7b84f038d6d12be4c47d758f4aa91e079b37abd56c6f543
 EBUILD libxkbcommon-0.8.0.ebuild 1007 BLAKE2B df46882717d82e9501df355d46ec5845fa85e3f02e6d6e8a8d8a5ec0bef7f4ffb645ca8af91bf30d015cd16a34a4495b06df4fd52d843837d277a8bfef1f0c31 SHA512 fea78ee9cf16f3c5f922113d60d18b234ab86fe09e6f8ad968c44b0cd06664d606e11ffcb15b82ba87fe99a6441e5603b94f611005f6acf9823be29f1d4fbfb1
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
index dfd5bab5d30b..ab4a07d9ac54 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 5fdf54d5ecba..072120e0fb3d 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,6 +1,3 @@
-DIST libxklavier-5.3.tar.xz 315684 BLAKE2B f0aade6788a834eff74b33ed0df6af3651142fb4e0f706169045c51ae3a632ce891a15db643337010674e237da8b088d59af6552504b67ff3bf9f5e9b87aa0e7 SHA512 7bec94aeedbe80aec2c44c9e2a3b7ea170618970fff3c1b5e677f1b292241e208b74eabd825d477eeab25bb0ee1d27f9b55f986a19ea8aacb078651a0c83b289
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
-EBUILD libxklavier-5.3-r1.ebuild 1178 BLAKE2B 40d13db2e20be4466e822b7358c92a6bd18df3768bc737da8c50e771d6286a637987a77d581384e090f58044abb4137e8a676ed61815bfdaad8a64a0b1c20009 SHA512 74dd647b2e1ce0c2788de30da4b82aaecb3fc63bcdc2074efcd09640b10ec11528d81144fb45e95de06246750163a8d4a288089bc3fe87bbe58b2c1262c6ab26
-EBUILD libxklavier-5.3.ebuild 1279 BLAKE2B 95e9d6d74a8aac0cf7e4ec3bf38807aec35c41f3a75c24edd424967e87b441cddeb513fc9182d0b18c4c2176101cdf788324fc26cb359179fa67699af3415064 SHA512 5b2e76069674dfde5fd44201a3af4dfc3202ace10393fc95cdb4dc1fb74cab834521bcf4813d3f4248452348c3c3d3d849082fd811412a1a21915ccd1f3030f4
 EBUILD libxklavier-5.4.ebuild 1346 BLAKE2B 71ef2427c8fe252fb71acda1cdaa58a7da4e41fac6ff5cb7e8bc092f91ef3a74b2e86be37126237db0545b2b37196a3328a42c4569c3b585d761da0439071dd9 SHA512 41abdfbe34824733a3c3dafdc44de6340c9d05fc3b96cae2b39724e7f79bc4701131d437a4effe2f65f196a4e2cd141b264a1d46f2c837c6dec34125c8e1bc9a
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild b/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild
deleted file mode 100644
index 5ba9ae0f55af..000000000000
--- a/x11-libs/libxklavier/libxklavier-5.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome.org libtool xdg-utils
-
-DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier"
-
-LICENSE="LGPL-2"
-SLOT="0/16"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	x11-apps/xkbcomp
-	x11-libs/libX11
-	>=x11-libs/libXi-1.1.3
-	x11-libs/libxkbfile
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_environment_reset
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-gtk-doc \
-		$(use_enable introspection) \
-		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-		--with-xkb-bin-base="${EPREFIX}"/usr/bin
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog CREDITS NEWS README
-	prune_libtool_files
-}
diff --git a/x11-libs/libxklavier/libxklavier-5.3.ebuild b/x11-libs/libxklavier/libxklavier-5.3.ebuild
deleted file mode 100644
index 710f7361483c..000000000000
--- a/x11-libs/libxklavier/libxklavier-5.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnome.org libtool
-
-DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/LibXklavier"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection"
-
-RDEPEND="app-text/iso-codes
-	>=dev-libs/glib-2.16
-	dev-libs/libxml2
-	x11-apps/xkbcomp
-	x11-libs/libX11
-	>=x11-libs/libXi-1.1.3
-	x11-libs/libxkbfile
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-		--with-xkb-bin-base="${EPREFIX}"/usr/bin
-}
-
-src_install() {
-	default
-
-	nonfatal dosym /usr/share/doc/${PF}/html/${PN} /usr/share/gtk-doc/html/${PN}
-
-	prune_libtool_files
-}
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index e9513046cbc3..b6a76c33a143 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -6,6 +6,6 @@ DIST openMotif-2.2.3.tar.gz 5149785 BLAKE2B 60d1f4775f7a2a3477f005d713c75fbe093c
 DIST openmotif-2.2.3-patches-5.tar.xz 19972 BLAKE2B b237ff27f0bf363f2f46a5b81c50a3662ca39e4729e190fc989d9521b5770de8afe860f3a04efa1901b4f381d2bed1117d6b13c65a42fea77e6ac96145ac0d00 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9
 EBUILD motif-2.2.3-r12.ebuild 1833 BLAKE2B d6e581822fa7ecb133b2aa74d71c2737b78a4c273436ab23267a125137e70e64aeb40c40a7e22b37c4434bee8cc80d8a9dc3c3b5d276efcfb855b89a7270ab66 SHA512 50013e267d02ddf5b1dae145715661633eb93367334e32c47bab77c4d826e1155d6720e447f175277abae8df7dc299c9dc5507cc8a7bfb019551a9fc8e5e88bb
 EBUILD motif-2.3.7.ebuild 3475 BLAKE2B e263486fea11744e213542d5b5ba2b38dc892dfc3464236a6c7f5f63e195beb5511e61ce79c825a173e691da0d000069b1833dde8e42a70cc90fd16f4f6fc4b8 SHA512 3df30f2bc144cce54876ad0e3dc4599a52faeefa095b3394332672c4b1d00cd3bcb46d1836f9cc71060a676214d2fdfb18afa5989e1897adadc931b61957e3d9
-EBUILD motif-2.3.8-r1.ebuild 3374 BLAKE2B c86d20489014162183130036e03bd35ea3d0d70aff121b709bcf9a8445ba6e222616cc9b4b31f2cf538ce59adb9ac4694ff681f7af299b4d63e8c5fe0a19d043 SHA512 d8bf73d24d2affd1c3c65d807921aed6f778091ab6659c5a8b46bf0858d97579940a580a2e0a573b4ddeb0b52a55b3f7019662aedb712166030695adeeef99ab
+EBUILD motif-2.3.8-r1.ebuild 3371 BLAKE2B be69ac1bae60289e40d70e078d8507c71d57bcb9f41a6f23318c74eeeb5c36c8972bb11a634ca78580dd830802c6f7e113bccf4d409086395a2c9f9d7a656c43 SHA512 d2e941ed173cf26bc2578715de84ce701102325dd9d465a9222b56c5326e65e518fd1aed419ee18fe9ee37960c45445cc6d0e2d85e7b7ab9683ef95f98062474
 EBUILD motif-2.3.8.ebuild 3396 BLAKE2B b973221fbec5b9a59354d1da06891d75f610fee811081eef08a57866676d89603bc87de3ead2f12515dac5ce75fb6d8488b458d4f54db39056fede1703e15acb SHA512 94df476727be54e35defe9bf0a6d47ad017649d86d75a43645ce6abdb1b2a42047d503844dd1f8d79e55e289a0b1b66351c723a585fc1027738088673915b268
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 4e4aa0dc7e05..46b84041dc34 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/xcb-util-xrm/Manifest b/x11-libs/xcb-util-xrm/Manifest
index 3ac46ccf95a8..528b05fbfea2 100644
--- a/x11-libs/xcb-util-xrm/Manifest
+++ b/x11-libs/xcb-util-xrm/Manifest
@@ -1,5 +1,5 @@
 DIST xcb-util-xrm-1.0.tar.bz2 327196 BLAKE2B 6bba57de372371ca7829a477ddc57f86e1faa86829c7f32e46eb5667505c6b3fd0b5acd2dd74f4f1223bbbba678234948bf5d499019b089e3abe23ffb5631843 SHA512 b49d97b018a231b5642bb05a287eb7720d9e1ffe15024d46a4c7ebf2f9cc37a0a4a3262d9aa963fe9554ca801ba013ad6cb5d3f87b67daf4d69efd180d7ba8fd
 DIST xcb-util-xrm-1.2.tar.bz2 324708 BLAKE2B ca5176fb848735b856541930f37e46ec093df6d86a981c87c910bfd64e1a8d5a7e2e20405994dd2a8b9c1200dae48bec0df3a6546be984e3ff316a271b0d84eb SHA512 c6031844d3a197b234cb1b22166c02fe8d03f8a8def836b8c974324a0b6b453889680011406c7940bd04fde1389c5a2ff508f84b080f811ca69cbdb0334994e8
 EBUILD xcb-util-xrm-1.0.ebuild 616 BLAKE2B 2d4b35ef4ddd4a6b7133a5fc69758b9053d5399868d2ae3cc20cee62204d924487d63ab108c93635126ed03dc9d976ea301f70731443a2489c4bc9c5379d271a SHA512 e9f2431c09ffc6eaf1c581730be68497503e192240714c2ea7b21aa38a34ba26f27a8eadc441a6fcd5954684f01d5f641076297c5225080d1e317dab6408642c
-EBUILD xcb-util-xrm-1.2.ebuild 623 BLAKE2B 3b7f9af5f456aecd312dead0157535f3365618bc903ef7d10d84ed197025dec53bad15d68a5e2274947f2535ee3f97f7a1b28b058aba28257595cf95288df050 SHA512 3952f45fd80a92196b91972f40d0a01b4ed3e6527733e9b2b27bed7b3d174e627a663c7ebc192c53616af5593e962bdb641cfb80f16fb45d648ea753ea7e7730
+EBUILD xcb-util-xrm-1.2.ebuild 635 BLAKE2B bd63f4b129d9ce086512ca654ad90e59891398436027f6ff0dbd4776c037363c1ecda07ccdb4f2b4753ba914e57524c24e787e58dcde62512bf739d027faadd4 SHA512 07f558e9d8f186da44e75d434e4cd803ae5322a1312df263b6be14db3b3f17a765b07ead11913fa7528a90e1aa1309284242ae550bd89b427d9f410ea3e0a487
 MISC metadata.xml 784 BLAKE2B 802cbe25eb9804eb0fcf6332867c9028695327fc96577ecd6bb608a125fa2f47d90a0afe9f634878e7deae7362e83fb95c753138c28ab733e1b8b743ccd77bc3 SHA512 c9c5f617e17bd3d25005a5ebf3c394939055f0376ef0e4e68be19fdffa9716fe2bd57a4d5b912cbc4d908b0498e189d484266872dd7afa41e5dfa54570b75509
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
index 0a3f339d10e4..7094258a3ec7 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]