gentoo resync : 10.11.2017

27 files changed, 88 insertions, 53 deletions

diff --git a/x11-libs/compizconfig-backend-kconfig4/Manifest b/x11-libs/compizconfig-backend-kconfig4/Manifest
deleted file mode 100644
index 8512423d1116..000000000000
--- a/x11-libs/compizconfig-backend-kconfig4/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST compizconfig-backend-kconfig4-0.8.8.tar.bz2 21632 SHA256 90c3a4a0fdcbee21479dd56685bb101f9a5f70a57c953dfb4fa372e99fceb767 SHA512 241612da39f88ff3c129be96f8f81f9dafc82943d5ce303cd7ef8f5e6aa4418a680e6f5f18c6ee2259d501c73791276a7ab1405c800070c60d8b9f71c18ccefd WHIRLPOOL 9687c02a73ae3d9f2d79e5331a68b23673c2804cc1f3038298978ab38cd5ad290d16d77816a0267c6a2778fb5f0656f2d267496c2dc69c1ff707152bc7ef1946
-EBUILD compizconfig-backend-kconfig4-0.8.8.ebuild 422 SHA256 36e80c9f57a7d77e11386fa0bd765e5f7f20b38d6c8cef50de88fd803718a230 SHA512 23d7e8eace796d6fbdb68564d5c84778605c4abef7309bfd8da52a9c3df7dd9597fd28086680293a4f00748dcad90804655f1b7a8bf0233a696d5b2903ff8473 WHIRLPOOL cbdd21817b9010c8aef836d66da3fc24c34535a4827c49284b3ebd9cb74321418c26ae8da6e7b53ea02f5cf587804ff492276dd5e79cd7213807266973d31871
-MISC ChangeLog 2493 SHA256 2bfa9136bd1bd0d71e682ac9ff27fd73cf5a79989712a854ba1dbad185057299 SHA512 61cf1160ce77dfaad5a036bad95e0a073cc0c36ec6852c4ebebb79d9918cec77aab278c2fbc0791eb1ecced0fd0865f41ad4e3cd5d24d360687c8516f41db1cf WHIRLPOOL 0c75680421b7a193bc57708caea3a13522d6f2d2a7d0e220b8778c51235f47de3337a55a84279fc1f686fae2f44f8ebf6b63a76214a25b04d4fa3c136adf5e11
-MISC ChangeLog-2015 4463 SHA256 79a99034f731c21a21b5688de7ddc5a0ae09981f7b8cc7566363830ccc7173ee SHA512 538fffd35f4b5649246cb5c3d90ace55873e9b598f12da5a44924fd9eeddd1305fc54146038a5df611f58ecd983eb5d00f897ba088368aa698c49d973ef64e18 WHIRLPOOL 69edb5da4d4b8fddfca08266d61d3215ada164b9964000669ce096f9bcc82009f642c228d76b1c597b4dedef04d04af59e530ea022fec43c16100e58853b957c
-MISC metadata.xml 251 SHA256 2eb475f8b237935f12ddaa1b781e1ab86c0351c857ed020c11a8c0ae7bfefec1 SHA512 831a8aa6923d6564f2c2bfe49ca4f197f08befa5c8530ef65071507e4e0a9bd1a584583a00f09f9c6131852bd2b3f4a875e7c2f4abf20fe517e25f31c0710104 WHIRLPOOL 5c61d47056dda0e6857ae5041c3048763e7c537d30ebddf93cdf78dadac9cedb96cb55eae6337e1d45226ef3cb65d13221f6e78a00c4d46b2f3199ac49beee42
diff --git a/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild b/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
deleted file mode 100644
index 87358c15f0a3..000000000000
--- a/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="Compizconfig Kconfig Backend"
-HOMEPAGE="http://www.compiz.org/"
-SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtdbus:4
-	>=x11-libs/libcompizconfig-${PV}
-	>=x11-wm/compiz-${PV}"
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
deleted file mode 100644
index d191429cf7b6..000000000000
--- a/x11-libs/compizconfig-backend-kconfig4/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
-</pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 828793f58228..3619600eedc5 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,7 +2,7 @@ AUX 2.36.10-fix-tiff-loader.patch 2300 SHA256 2fc0318b0d4375d09ad1b9cd619ab2a6a0
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 SHA256 3914db89c10f60bda2d5a3f7d94ddc36a29b67d6f34a18a724d4b4164df2affd SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d WHIRLPOOL 52f5e28307571cb846e471997cea491c709adc41607788be2af3826782558659c8431f4c379ba43add271cda25baecb13e33fea99ec8d007b7bc5a44bbd6a0f1
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 SHA256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35 WHIRLPOOL 3b2328f9bf47ce26f810a9d7629044c3e9c4ac0519afb0d3c4986dc6d2820301f60ad9e1218fc23bc2ac32e35eca78ed468e6356a208244cdcff7d95ab83be27
 DIST gdk-pixbuf-2.36.9.tar.xz 5769124 SHA256 8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261 WHIRLPOOL 13422ecffde49445e4c81e4d7e244a2511811fa85d55261420f8ac4e2a373eab08e7adab64c6ea5b2997ed4e6a888630e03a378d04a0c6b2a652fc34d2996a87
-EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3804 SHA256 866fc97ff9b1e0ca0045be3650780733ea2179979a3468d2c5ab200eca6b4556 SHA512 ef4f6ea4c684c09fa4387b40e10f0070227e8ef37b5246fda34cf4a05ec9a6be681daf1d504d514a33f41d52263bd1ae5685c6ca38d9a22611d8dff8df5a3f70 WHIRLPOOL 372c1b14ac96699364fcbabc1b07b00d9196f39cdae1f33c9ea538f8a12761b149a9a4164320c03f1ccc3bd72acadebdfc2aaf0e9ab4193e08a1029359862dc8
+EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3802 SHA256 26c62834850e86f6901e9bc7030dd011333ee0b85619651b592db6fe35d53008 SHA512 e6228f6c23677496d5cf015cb34c161be41d8c2d6273624ccaf946fa533cac1ffefac8afd5488542be1ebcecf08c973dacfbbaa596df5aac66a8e03c285eee72 WHIRLPOOL bd5aed77ca72cb37598a5d6f0273707731c71cbccd2c7b904db18ca1e0e963a43df7519122f5176fde5712ecb4acac693647d97551b01edb9daf2d7b3b6b9caf
 EBUILD gdk-pixbuf-2.36.10.ebuild 3671 SHA256 e013ddb16399d82676232cb5ed3f7e4842189bbec50d5be31b04f23ece801d60 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e WHIRLPOOL f1f852248a2dd2526d02b67f33e6a334bde42fa56c54270d9154295f3ee332cc5d3fc144ddb94dd022fa4349c663277928b719bd5ed3bed332872fa27c40cecb
 EBUILD gdk-pixbuf-2.36.9.ebuild 3662 SHA256 2b05840d0f37b5cd4e71978cac95821e6ea108b52c582d0e4bf4b86d2549bb56 SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694 WHIRLPOOL 017a0b9ba465bbbe6af051b9738df34c7a616114e711f63bdfa7b6abfad8204af694c168ab64c13f016655677003818a420e520ec0ee5e0e25a4d5847e1086fc
 MISC ChangeLog 12972 SHA256 5957820711d0f8756c395ec32bfc37486d2010f6d6549a392bc3306f4c19649e SHA512 2076c689ab9680d0c030772d0a1662fb486cf999e62dea4961b9cc846cafd2f47e0e3b93dfb505b8723584fcf82e1f6c67157018448a08e0faac1e0db4dd4ddf WHIRLPOOL b05bca635bfc0ee26e1d80c97575146e579047109abd21d57f30d6cbcf245e024468a124e787609e0001237d8ea2afaadd9fe80e3bfa928e41320890e02cc9f0
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
index b56eb7ce2666..793ffafd30a3 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
index 789c85736542..7737462f4a1e 100644
--- a/x11-libs/gksu/Manifest
+++ b/x11-libs/gksu/Manifest
@@ -3,7 +3,7 @@ AUX gksu-2.0.2-glib-2.31.patch 870 SHA256 028fc1396265d51e90c209c4b3959e2f645f51
 AUX gksu-2.0.2-nautilus-dir.patch 2640 SHA256 e37d1259a6a0c807369585417ceb661c2b00f4960921e80bf8d43fc5d51a6a11 SHA512 d96e36ea8a9e03808214f5e8cc73eb2aef5f663ff0035c4eab854f8f7d313055d9e2b9058abc7b84adb5657e7a390d8e44b42953c7d8304377400b341a50729b WHIRLPOOL 4a4693e7b3d7d8e32eef7d68dd95db18f867620d93bab4ee225e774cbc8c14ecaed24ceb54e796bdeeda02feb08c61bfbcb5c0769c7d43e2991d7bdb331d735e
 DIST gksu-2.0.2.tar.gz 468121 SHA256 a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75 WHIRLPOOL 46cd5a966669b365c4c586a559dfeecac38536f4bf82964b28a01c65dda2ecb0d32842fd697ce74e80d6cad8fcc2c7ba217303be3cb16186d5e5a7509991e74c
 EBUILD gksu-2.0.2-r1.ebuild 2258 SHA256 72b6b8c1440937b527bc1cdedec7c8217e2f92a1227a47a01f9c40cbbab0f455 SHA512 08064d119d87d09c591e475daed04f7b3eefa36b0e0e69d695545c230aae5da045e13bcf391841d7818b9fbd18ecb3433ce61727c329a0788deff0d621a710e9 WHIRLPOOL f3b32b51fe53a8fd64ee8a66d47482e27d806267dc514fedfea520afbbba2aed451119d4c2ecbefde322c9984b55c285bd13b6c998882e96528f433d576ff5bf
-EBUILD gksu-2.0.2-r2.ebuild 2297 SHA256 f5209ed99095fcb000bccacd925bd6546f91c871aedf828f018cccf0eb6c07b5 SHA512 d01fa6dacd91180b9f549781c349672b88049045cf79e5a8b1ac73dddfb1d60a974c3b8eeae1e16ade34e7c8a9e9fcc8d6feccada09c6cb1d998aecf0fb3c7f9 WHIRLPOOL 26fd4e75e88968761bc3ef14df759011fc9c8090820d1340179e11b3d18256e57cc7ff80eff2e75dcb10ebcf28b3af870fa76d8a93ff121c3df9a236e3260b26
+EBUILD gksu-2.0.2-r2.ebuild 2295 SHA256 8c6638aa70fcdb62b4c5e220a6286c5e37776f468cacfbad0d30f11362e5c2eb SHA512 808c627346cb03fa88a42e7c30fe4b8eda70af95fa22a9eba4f793679e3b84e0e293799b02ca8d57b61bd240492a693c320e6b504b088076098ee8d4811f324c WHIRLPOOL 0083a0916336bfbc107768f8c4812d89ce7e30393ecff630dd39f1d47d1baba885acdc840443dd7e3999e2f543ef31b35f1a85ff61429d80a6c24d2aa0d3760d
 MISC ChangeLog 2499 SHA256 0bc90006c553e064a5a90457eae941684ab84c1dd01ed6c6d7b1c0e10cd463cb SHA512 1030b04729a025886b8d695e8a9dd44dedf5883a9ba75960d95c0c03524614ddcc38a3dd0b26080b80b389e9cc20166b74128a6286d2e023715bb89d9fe40496 WHIRLPOOL 8f120b25250bcffaf1b0497b08e49f7524d4e9c223b1b0fc1e1930ed1e73f8c1525c393dcee46ac598147bf3dfaeb355349e2577863d5eb5dc607727d79022d8
 MISC ChangeLog-2015 9732 SHA256 7e46770008540d0299d69b051bea9bcee2b8814f70fa2b48dc4f76cf4a902204 SHA512 5ff3924c973c4f6f9df91e118640e9484956f50edd77ee490922c49b2a3a788fb0f5b2a3ddb94fab82928a023f0ee2acfc6f74b5f9feaf447adf895b2316b5ec WHIRLPOOL 922304d8ebe543c56c6f3661bb7239a61178b7f5777c305e0b55c80e436ddf0f2715050c3c35e9070ea734c7a5fd5ffd3d90da195cae09147bd1dfdad5ea8396
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/gksu/gksu-2.0.2-r2.ebuild b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
index 13bd353f9724..8a1fca391df4 100644
--- a/x11-libs/gksu/gksu-2.0.2-r2.ebuild
+++ b/x11-libs/gksu/gksu-2.0.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="gnome"
 
 RDEPEND="
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index a93e9b842f8d..0b53ad3768d7 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -6,7 +6,7 @@ DIST goocanvas-2.0.4.tar.xz 584272 SHA256 c728e2b7d4425ae81b54e1e07a3d3c8a4bd637
 EBUILD goocanvas-1.0.0.ebuild 1256 SHA256 16dd68c341f10b953a0fec7acbec199577dc3d65fb847ace340e13b392e2b88e SHA512 83729254a1f425bd1e953b4a69dec8fee7f8f28357c1e71e635c46b7b7615da090883c5ff914bea81825cb923b43dcbedbf793d842dc9fcd0df9ce577b08fea8 WHIRLPOOL 0f5c339ae64de706f1ace29e855073336aca0fdde8a84147a25b9375a60fcd4e85c896100e48849bae6ad0651eab9ddd49bd6749a83c58ed818142221b960158
 EBUILD goocanvas-2.0.2.ebuild 1598 SHA256 d4d539f0b8b6756994676a057ed9901446b64bc804e70cb08cadd8275c25e97a SHA512 3c3bfcba036750a75c294d1ba430a3e966e76874c4e678dfa5a8d2d3446ce66df259f653fb997a69dc7d397ff1d2b2fa0d0356a28ae8b284d50037db88f13e89 WHIRLPOOL c5bcc14d16989ef5c98231923481a64123acefef76f84ce74b215ae3e06356955d78eaeeb4723d3a11514e598b86af73839da5b65ae3655a08e7db58bfddd7b4
 EBUILD goocanvas-2.0.3.ebuild 1617 SHA256 b87f076361db05f6acc967a538eb881106d1e4ad2ab08ad593000789982d4f3b SHA512 d98cbc2076ad9113e93ced77f2288a6ceda157e3e6fa4552e471667a190755ca4947aa7e699605ff09c1c3f49fc55c7049dd5ebb1c9295f3d20ec5ff06659e52 WHIRLPOOL 438eb898adbc3d6cf1601523c6f6b08aaa5c9a5f5b83e3c59ea5c1ede68a8887e34d70f12d273c17933a94b240eadff035d8cbf2beaab389836421ce95be6187
-EBUILD goocanvas-2.0.4.ebuild 1618 SHA256 ceb39e23803f56eb6631990b73e66aedcba859dce37e751ad5e29fce07f23da0 SHA512 25b434c378fa68e4e7e0f3c93cfb0c569c440ae01115a5bda946fa4d253a991bfa9aef7be42517e887f933fcd010295e51bc07b8272f464ebd7ef04fae059f69 WHIRLPOOL f9d29850c8d96d848d2c471961bcb352c5f6a6b93034bfb3b1a1f08ca697c1718624b0f04c2c19776342aaed778d54974441e11a6e6ab4631842f9108cfc1f65
+EBUILD goocanvas-2.0.4.ebuild 1616 SHA256 63e9ba28d0ca5c7ad63565ccf3f3f96901037173f305e658d7e9733b0f0ed935 SHA512 00a995494cf39568276d21d8faa05c540cd566b2a26ef12547f089d050a6231a7c52b7c59cce13ff6c09e5b93c2cab75dd5717f1ecfb3d41e4860961ba0e5362 WHIRLPOOL 1a42e82ac6f74a7f5a160cfc5e2c82b648b0f3fcad707e8f54b583b714a2eaca7be159a85c89ae87682844234c85d90cdac9961644d91c4d842274d0c72e754a
 MISC ChangeLog 2561 SHA256 d5697909195da2188cba57880dd76d71f889e2b3a3a559c97d7ca2a9356e0666 SHA512 df4dd1d72d07ca211160a96c4540645a7c48b9df00852c14a97a23ecb43d87aa1e800dc36c5e431eaf549be1f00123f90681b9fafac3771aa5c1874a0d3e2f06 WHIRLPOOL 00c3618620b1a633bb5ce78b09f18d577010b575f62daf5ff84181a2a030e1daa729231193010285781b397040546700def6115dc858800e386e88523f801747
 MISC ChangeLog-2015 7154 SHA256 73fd77644f9629c2a2034b94c6101be79573b76639c2d7ecd0f87c79901f1aa9 SHA512 d4ef4f158d2fef0984e0744b8dda39b23894a4848ed2e46d8cd7a81046efbab2fa24ba3628c76e5fbaffc3348ddc1095aacc04ffe63689f7a6afbaf6186132e9 WHIRLPOOL ef5bf60a0d33d52dd7971840c13942962b83af498376581b7c49cdbb879e3f227bc32617adf2e416a3f9da6a804b2df16352eb1448a26399660309cfb45ac07b
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
index 868253609b8d..b1b38f9e4a54 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="examples +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d83ae970a9ec..85e275013c95 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,7 +13,7 @@ EBUILD gtk+-2.24.31-r1.ebuild 10104 SHA256 c427479ed10949ebff00287f58bd281976bff
 EBUILD gtk+-3.22.15.ebuild 6930 SHA256 45c4c967067b2f52054f6809ef2589e9079ad3483bbacf64739ea1ffc92dcb2d SHA512 3103bbf23ab5dc56738513599c48f6f090a0aacaa33424f498e7ad5bb0b3841537a4b6a6cadd8a9d86c8fd9a88f99623cc85d8565338229ff6419f267b93b7ac WHIRLPOOL 70703f3cfbe54875a3d1de99dbb68aa0ab978bb8075ab6d7fd10e2c153f54319fa76f6735fb2700753067b29dd4c4f5223bd2b7f95258ff2a106251638773dc9
 EBUILD gtk+-3.22.16.ebuild 6781 SHA256 7c4f7e7d1a05ca563759e3de4e33b1c418d60cfe8536cc22b8bd64ce28e49625 SHA512 a1960b76bb8b195cf927facdaa739fae5bec90e22c554d43d1066fb41c9efe869d9ef6fcdab97d46848869be0d46caaa03426ca7987145c56baeea3a7013f400 WHIRLPOOL 6d47b07f16b45f2b83ddd577882ca856dab88b26f67b1f68e49ef814b95654538dceb688fb16feb326d9e510aea64e575b64982b9cbd150ce63f777d13a23379
 EBUILD gtk+-3.22.17.ebuild 6788 SHA256 d772512b2fe2f78b3409dc3977b32bfa5501389ead22ad306a9e41f6cecca6fe SHA512 237f05cc646d2167ce857a85306468ee3f68c1670e048c91a6b13c5291f0291cd2fb0f00961440e4d69072519027626e3081e4954fe77fe830fadede7d3a185d WHIRLPOOL 7d3061314da8e6cd7bd9fdef03fb4772f33bd7cf61dfb0562ba7d8d1f0adf8e13ae17614e769c107f0907d9e53b3f83c7dc5c803c6776055aa60e647f9d17dbe
-EBUILD gtk+-3.22.19.ebuild 6788 SHA256 d3a6961e786ed41ace568550f0005fcae1f14dd7b6b0bc0a94b2bcbde342063d SHA512 15b42d8c22a16dcf0d3c0c3c9844ba8733330809083e02b892aba17d87f1a775462913fa951365c490d1af9a10180be0f8cf5ded257d29f684bd5569f10f2d65 WHIRLPOOL 82f3a09d4fa0957d54905507194eaebc8b0184d2a3047e60e3ac611db6e430c50553d3bc3ad5a002ad3dab304089b41b56a4cfd9b057eb0302b0722ba1b89d99
+EBUILD gtk+-3.22.19.ebuild 6785 SHA256 8a8dcd7fb89f0e96a3d20707e5b9da6e78238b9f10c7985302cbc45e10bb1154 SHA512 765fadd5709c8375eaa7253345d355704bd068a3389fbc6016d88b55045331dfc4e39ff95d02ca3753eedc16519b54bc74b36de48724e12a6d60484134b3b3df WHIRLPOOL d6d503d194acf9e3f1ad505205a8e79de7406c65d6b05ff5925d4c2f29aba53e1c3f7f6d6a06361f5c7827909e15b0df41d7c2af8051398f4b9c60161ce7e363
 MISC ChangeLog 18888 SHA256 bb9123ceec13c8279e45e94d0dbaea83c8c4c5aa9eb769121f3d5b8c568bc6ed SHA512 45e34684e22f47e5416d5641b935396327c58c7ca68eb01c61f3177b8354f9b38421ec35db410a98a9eb9a621225d87ba9474b8a1de59ecff6486ef037d18e37 WHIRLPOOL c4956dea2b9bdcf261e52255c29060d0801be82089100271b2579b6c1f74569e74b766522141046e2d647bea19a2ed46b7bc2dbd6cd41bbae3679babc6f5ae0d
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC ChangeLog-2015 25781 SHA256 53d3cf5f33e4c1f2e66d60db9a56ac485f3ba8ebd260c9066356d2e1e78d80b0 SHA512 6e5ce53fce815641a694778f5c5b070699ac2f6aeb19c1ed99b782489085b7fa53126a193fc15647f24bde7fd3b8c63b29182da3c768b36edc1e76becc71cec9 WHIRLPOOL ae27948fffac9e09dd80c158be0e14473f8d80ca5776dd6747d29a5288fb5c464d2c9f5f0b4d1a8814b17bd80b5bc74fcd84eef9a8ce2c6c0893ddc6f2bc2c8a
diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
index 8ea8f71c60eb..6ae11e575366 100644
--- a/x11-libs/gtk+/gtk+-3.22.19.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.19.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index 754b94905c62..bacf9d195896 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -8,7 +8,7 @@ AUX gtkmathview-0.8.0-gcc6.patch 2043 SHA256 74d32fe6a816e78c2e53920342ef51379be
 AUX gtkmathview-0.8.0-underlinking.patch 1926 SHA256 d0a466e074f0344529410f988a2097b0103cf86eca760c8f1a6da6a0a2cbd682 SHA512 9f0f4404ad60d8318f6feaae81db5ff4d331509145874926667eb9274a83ae278b08a078830cfd98ae85a602fd1ac7ea13b676f5dcd70a77e8b45e9e5fe5aa0d WHIRLPOOL 10543128125189822f9b066c555d8126071332d464161210c0f94593307913d896a32cf6f75abac510edaf0409a73ff67ee5d843581fdc07dc8a5e40c79fc402
 DIST gtkmathview-0.8.0.tar.gz 987328 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb WHIRLPOOL ade6b30a20e8f0e38b2a9935733425759eb69db3d28ad9ebc28f5441fc82571a52787381d4d3f48852f9bcf1550318048a316bd92c9151fdf3074bf3f4edd591
 EBUILD gtkmathview-0.8.0-r2.ebuild 1986 SHA256 3c2a12775484d4bfe7e1b43cd079528ce9a628a5e3af76571fa5e54fc9ba5501 SHA512 e4115e71579be885119f9e9ce20e5748d5dbdcd105b64c8a8a03d09f964a673b74e220de80f966a7437f79497537789bf9c9147bcd7b16a0b15a7fbf99857293 WHIRLPOOL 3d52aa436938cd030d0cb11244bdfc143cd44ecd1dfe330914dcd1a3924f24cb4bd97579c42024510df16dc45e0c906743ef7c4175a0c378ef2a18c3274a8738
-EBUILD gtkmathview-0.8.0-r3.ebuild 1995 SHA256 4275e9eb7be4132be237ae0b3d72967487667acfb77b7c3cddcfd42c427d066d SHA512 17d8cfac37861a617436e22c250b6a14ea571a12fa05e5ab68c7f055cae36fd3a70941ff39330ff57fedfc5767b30304966fb7a560c6825409c70cc2da98d323 WHIRLPOOL f470c56346cfd8cc7916719a170ac833ffca21b81c25fd37064262dbfb35628efa80d24cff41211f30033d7e72113d964a41b91426cf94d65feb0371fc11c0f4
+EBUILD gtkmathview-0.8.0-r3.ebuild 1994 SHA256 647badb3bde141575f5ac79a2b1deac248ca11799f69cb45c475b9d9c6cf753f SHA512 5faa6d395bd8a39a483c98c43a0fcd258896fc115485f2c51e3f7ed39ba1317c83c92782f473ba2f206c582f33df48e988355de3392983446d526cbb71ce3ab0 WHIRLPOOL 7968325d61a3bfd5b6afb2a65cd7677fe2041f3d0f15074b7c4a55bec8f8d46c2612d9d9dccbe22039b8d3ace1cc6880644510e7554d4a12591f0534a2af8876
 MISC ChangeLog 3112 SHA256 cc24ebf9f7734f7c75a28e112d1ca81bb9de798e1bde2fdcfcf0e363443396f5 SHA512 01f670edf42c940441599280b655db961dfe54d3823bb916bcb48fe91e72c5c9a6dec18e419f8c4f52410cd3f6144abf899cb6dc4eb7f4974c0430f195d7c626 WHIRLPOOL be37c0e7bca0af9d8dab8045d14cbfab6abe21dc3c89347a7d7a3dbd49a11ee5e3232b95d7cb5b6383cfeebe91650d945552c8a5bc8eb61531b7ebbf9b8154da
 MISC ChangeLog-2015 8477 SHA256 af24b199e754b29bdf78cf6cd63dce6436430bc0da059a5332e9b282aa0ab114 SHA512 3afa717f85b6deefe57e129ffc5f422f4c503edbaf70a5b8effedede253952e82660b4cd4de77d347a2103e17100f3a96dc32028f905650373bdc149fc64b14c WHIRLPOOL 07360ec4ab95e9e31682b8b91bb39059e4b3c3a7484addcbd3664f5c703a25afc5d3b63c019d3f694560ae4f99a2fbf4f129611d4114529a50cbf3e3c22af844
 MISC metadata.xml 413 SHA256 cb1148098db7af900af1e2e78bc310f0e444263d9441bd7be4b860a461f41246 SHA512 734ee7fb5aa123fb2794a22b1a374e514a92a640e7bbd35ee53de045126d0b330f177db4018ddf76e9932f984a2f5c1646d3a3f642b29972df0af88f64fb1352 WHIRLPOOL 3e082567600f946e6cd9311fbd618ff8315a02cf25c8dcce4c1458d194f527405e54cc08cf9b57c9a867ffe6d34e68f14211929cad697f9a06211200dd669d57
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
index 13d87d522276..60158b637ba8 100644
--- a/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
 LICENSE="LGPL-3"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gtk mathml svg t1lib"
 
 RDEPEND="
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index a4c7e5b8df88..594019117398 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -3,7 +3,7 @@ DIST libXfont-1.5.2.tar.bz2 530367 SHA256 02945ea68da447102f3e6c2b896c1d2061fd11
 DIST libXfont-1.5.3.tar.bz2 519793 SHA256 ab85c10fd2683481dfef672a77fe60e6a2039558cbc0e9bf56b5e1df471c93d0 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4 WHIRLPOOL 956af4caed82144124499f7d132a7dde21d738c3048e124b3007be65be6e093cb1247a4af24c36a1c6ef1cca52e96756c95d0b3db1940efd147fe8499378311b
 EBUILD libXfont-1.4.9.ebuild 825 SHA256 5b3dc24e49b3449c7619a7863ad375e71e3dd121deeb244a0a3d2435d066c37c SHA512 a55701a7daa83a3c66d0f81101e3ef0e2f90c13d9f21fd280ad8c202326b47e2837cba8eb3bb196b4d7f23d3b8df63be5629b64078cf46a1518a31a962abbff9 WHIRLPOOL ed29dae1a46755f17f1ef7456dbfb130427a608a468b1e29780905ea6151dcc1cc16b5ffaa2e100b647bf8fac5d82fc86380719e8691c01fd52fbeb9fa8ed549
 EBUILD libXfont-1.5.2.ebuild 868 SHA256 f3e12148c4cdcfe8ac3b01be33afe898f5f7bebc870fdf6378f6c92cd43265ad SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f WHIRLPOOL 7c85e7287508e208f32023d4fbf28eefc4751fc12d8af80926c9bcf05a125194c60e1bc5774f137fc6ada619a83e868caf2dd016613591cb50e35395dc2bf594
-EBUILD libXfont-1.5.3.ebuild 870 SHA256 7c031784f66d3585d12d9f3342d67bd7cdca4752753031a644745a755acdc091 SHA512 fcce3e40b1b2c31a98b7f69cdddd33113fa8bc65d5d4597563bd012d2cd18630d05c84c40083fe6f46700d115a20ff2b3f6ebd99c3eaceb38031a9ecb0ae8e5d WHIRLPOOL 37719e35361a0d865677b51e99674c17ea060892e055196bf7ada3ba314ff88fdb7467d4e037c525a1c8deadcb3577855dd5349b08c82eca84748d773d74b0ea
+EBUILD libXfont-1.5.3.ebuild 869 SHA256 40fc70a971892fb313f65877a30a42362ec30e61dc50c80003ad63895e79076a SHA512 2b5190e156c03ef203315b3ca3a393e4056cf2023a0f55eaf04176b31dfa0b70241d8e895656e36fdff505b20bde77a899869ab8e869855873fa8dcdf3a5e4e2 WHIRLPOOL daf03d44c3459a1a13f42abeedd0529d4b3a42fefb787d1e0c668ffd6188a1efc7d5e8df6590ef2dc8b7fec0a0c7f968cfb1f51fa8381551e8649a52e6978524
 MISC ChangeLog 2614 SHA256 e7d8991fdf45b22339592f5121acbf852bf6a2eb31d4e443daaf6530a37921db SHA512 e8c7e7b5a5401692b5d198a6780a0495af69a5bd491137230b22578055e5fcca53f0c92af6e69ced3b47df1278fcce61d45fef083b9baaed81d8cf027acaf3b8 WHIRLPOOL ddb4dcb927c51fbb194e603594f9c0743392a856b5e49f737a14101e2d56759860ce856ae92ce4ae6449994d14f4751e78f231fd13d44b6c6c4964ccee1ee8d5
 MISC ChangeLog-2015 30579 SHA256 79130e72d7d8d9d09b93e0bac7a7c13312b36bdc978ac00020c6c10c181fe223 SHA512 3558560f9a19d1ee228569baa41990709fb5230f9bb60ebf8709a1e344df8263d8274cd516e23ae3e62aa713cb341798bcaa36d33f99de2a6c3e11674248da4c WHIRLPOOL f2669a53caa00ada7cecbb7d64b15e0e5f50952cd812e93d03e24af49786db318935a768112472b6af37eac094899cf44b1d5eeb6e60c7f0c57e7e030391c606
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont/libXfont-1.5.3.ebuild b/x11-libs/libXfont/libXfont-1.5.3.ebuild
index d3922c84f7fc..a3453b6281b7 100644
--- a/x11-libs/libXfont/libXfont-1.5.3.ebuild
+++ b/x11-libs/libXfont/libXfont-1.5.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont 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"
+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"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 91826f2271cf..bf0976bd8d25 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,7 +1,7 @@
 DIST libXfont2-2.0.1.tar.bz2 472822 SHA256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e SHA512 5e4dcb587b4d25dd41124bb50d71c30b5e29663ce675b0830def82fb6e00b64ba34e1b1ed7fad947fd0da95007aa55d14f587383e4cff08c3e0a0241c8879d16 WHIRLPOOL 305b33b83f6bb3c5e73e39f8be597e0d0934d5ed190691b141bf792987cef6b50ee1c31310b955eafea0e16869d52378e453805cddf4e06c8d172385ccc81228
 DIST libXfont2-2.0.2.tar.bz2 476173 SHA256 94088d3b87f7d42c7116d9adaad155859e93330c6e47f5989f2de600b9a6c111 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593 WHIRLPOOL 8e04eebcf81bfcbbd02af60bc047551c30379950b50b3e9d284c918f9241fa18885b5172a416d04cfa6ff44637de1b69ab5cb51e7af37354e0f23e9a052f7600
 EBUILD libXfont2-2.0.1.ebuild 833 SHA256 5cc05dc427e71cf247870d357e79806abaa75b195fd791264dbca830f9bc0f07 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd WHIRLPOOL 9cf4fa661a4567b451f03795e7f9c8b041805a37b98c3444b14ae7dd7a83d6f853fe90dcf0558d377675a5885f3a071ac5a2887a2fedff9463440b82c56877e7
-EBUILD libXfont2-2.0.2.ebuild 835 SHA256 a289b62fa56f9f333f4f7ab8c4e40f831a9ee86f0d9fbf3e12dffd22b10c7ef9 SHA512 bf30f3509e49eb6da60b2f1d63a6f92f4a60310b6c0f346889b0fbea6df1552e0be1617d20af7933b240327a42373ad0e7336733b45cf17fb49ea62fe80a749b WHIRLPOOL ab8130796cd5b17fe2e201bc033d0575c3e72093b32e8c65912d7339893f4a93709c851e540f0bb890107173d6221802d33c394663931774ff30c87b9aa2cf2d
+EBUILD libXfont2-2.0.2.ebuild 834 SHA256 e42226ca431372d6b8b14593018944d07eb17577eb33e93c8f3f190c7fc164b7 SHA512 5f1a8451ef935156553adaeb9b6acb067d6edf4590f48278f0910ec4ef017c0b69eb89fc016237dbd4061cbd977cd094942425f59ade8b462d42a2933dd22705 WHIRLPOOL 41c4c8b083ced3c6676c60b17c472afabaeee0f6403710bc4f0afade706cdb4c6dc7b95dc2cd617d986039a24b924c9638dc8f7e52be04ddb04aaa2a3ec34b53
 EBUILD libXfont2-9999.ebuild 708 SHA256 12d8b9d6f84e979df9fcb44881ae063cafe60db98766f9851e5cb5bc59234e7a SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1 WHIRLPOOL 48dd14d2760caa6ed2acc8996401e87c97ea80941e4089248b82b9c28d4ec5b9f6b50e3c9270b56934005d5f4c5d379194863559238a558c10b901de697cef99
 MISC ChangeLog 821 SHA256 2321434d8c275290513cdec74f8bf70440ec93da094bf4b77759f11ed6d03018 SHA512 1bba91fe37673341c61ab6916530753c69dbcea29ea5e47a35fe0fa51cb7e7b23146928c61a9f78ffe66a9253583c5be720d831d7750b01b91b7e9833c835b3f WHIRLPOOL 42fbefe010b45dd74ff4270f75be044e44f8ccd18af786964f18b84d382411ee4de7398465ed795337489f283878296ca9a0f78629f96cb9ddf70e821abecf48
 MISC metadata.xml 475 SHA256 a50b5ca3973b98cbe9bee0d84bf5dd9d6d582ac3f4db19330e42368809221109 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852 WHIRLPOOL 7bca65639e5c11e4310b9e4e702cb47ddfc5d769d235c586ec97110e2e960f11b4bdea448dd7e525f14ba809278fbad25270fcad15c367a7a7f390643358b124
diff --git a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
index 83636d0082e0..d8da0e878463 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xfont 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"
+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"
 IUSE="bzip2 ipv6 truetype"
 
 RDEPEND="x11-libs/xtrans
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 226555f55753..b39998ff32f8 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -6,6 +6,7 @@ DIST libdrm-2.4.82.tar.bz2 754053 SHA256 43fa2dbd422d6d41ac141272cc9855360ce4d08
 DIST libdrm-2.4.84.tar.bz2 794348 SHA256 7ae9c24d91139ac9a2cdee06fe46dbe1c401a1eda1c0bd2a6d1ecf72f479e0aa SHA512 860ebc5fa934edee97e9e7e13aaa2f2e70a68b946f4f3893cd7f93b8296c10b3cd4ce4c23b1676eefe375286e6e2292b96e917d7976f65c61da3fa661e5e641a WHIRLPOOL 8984374145694034626d6ccd15d72123989f5e8a127922dd0be5ae26866f8ef9179617689bc75d9a9170bbc55419c7cb2762363e700e91291a78dfb7df740dc9
 DIST libdrm-2.4.85.tar.bz2 795471 SHA256 64e4cd87eaee38ae60b2984ef02b66159b9bdd33030040db2a04339cf15f6173 SHA512 c13b266ca2efd28506b9910306db4be378537dc13229b4d4d8f525e224d0f6a2a9ce326b9ae37dae1d716ae81c9c3bcc88d875104d567899e5854da3c63aa147 WHIRLPOOL ed8f0edf717a09d78d2a2c9d33e806d1eea024a0357c68df5aac684de8587f0ddc437bf03be078062600c0d9d7cee1b4bf8af625f1cea5155b2a6d621d803c52
 DIST libdrm-2.4.87.tar.bz2 796368 SHA256 4c1c5293bdbfa248e029d3e6446767e17a3208387a719ec9da2d20c19849ed48 SHA512 9ce259d38eaffbcaf82a6975ffa513307da6750bcc31a53cade5717f854151b0e7b6d4ce25c0b518cab5a542c544d5984329f216dc4cdc9369b4adae19a68e48 WHIRLPOOL 28a188da6652a9e02d0421ee50ba8c4d46b41b4d52563a39d4d1700c25da77635cccc9afbfb5573dbae07a5d53233f977a976be8075c5126344cdbd10dff5251
+DIST libdrm-2.4.88.tar.bz2 796583 SHA256 b5e55dbac2124e742e639f5b8553e8b7395863bf73dab4f77e99fe2fc25572b5 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb WHIRLPOOL 50abb9c520570469451015cf1b56a6ba17c6fb4609c7780a4f9e2209651c5eefcf389006ffec5f24a742c2eef57a32722b4dbe75a51ed56229db1cc10f27a212
 EBUILD libdrm-2.4.75.ebuild 2025 SHA256 2855e3112ce8532496a8289124ccd79b33e829ff460f1b024287149d987feea9 SHA512 8d7a0b34900c817d14da26817ce0df5e3edd961c21b3d8935463bc55110ada6947db1db1205a99d511c3c6abeb3945a38cb40b30e00744aebee342f6b6e85fb8 WHIRLPOOL 20af1655a3d9997d5e82b00451cbdc9d6ef5cd4bd14f94545b9f9b55725f41c34240e593ff5206a3e0f2d53e9e6a685449f799cef2ea100bdf248517658ab35d
 EBUILD libdrm-2.4.79.ebuild 2034 SHA256 a876da26b0bffe7155ac14482a9242be011b1e71d3fea9daa39e2ecba9292a27 SHA512 9d8d83f85a204ed6859affbaa80413f399eeeb5b9981de542cd301e8201136325d1237d0ef74682381f7441e9dace713bef5fc6eb00addf27b37bfbbd3cac70c WHIRLPOOL d3448d0e87f099ec43c28efe56670954827b079c1380dd440cc7d2d0bdeba483d40599a41afe7eafd33cc98cfa63350fead9bb7d4aefdfa18592e898bbb6dec2
 EBUILD libdrm-2.4.80.ebuild 2039 SHA256 70b36a071847c0cb058f1f8e2ab8dfe456b5f0c55e86d7acbbb4c5b7da16ba2f SHA512 2676f7d59c5020432269cfe7450b8b544e73478e9667c0fb7627fc5d09d662675e31218a70d8190a0426381688a7e8d30afe2d3b957a2cd04395540e097913bb WHIRLPOOL 8372438e85786af109efb3a003d74dc9378fab2b560acde1cfa815ac40899e65c98760565d7413b54490edd68408fab61dca472e1d9f282ac68e8fdad07ff7d9
@@ -14,6 +15,7 @@ EBUILD libdrm-2.4.82.ebuild 2043 SHA256 4d71f4a888a8b1f90c663d51c7a734547f6859d0
 EBUILD libdrm-2.4.84.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-2.4.85.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-2.4.87.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
+EBUILD libdrm-2.4.88.ebuild 2047 SHA256 cafc5b73cff388003e48d6b6b0a2d8fd211bdad1813551dcc0a983fcaf155eff SHA512 29413925b0da7b31b3171ebbca51896e77772a0e4fd405c2154aaac5b3efb07d522939708f01818ff9d4305991af257c4757964baed1edf13c9fc1f3f4ea9e4f WHIRLPOOL b0b550d4542ba72fa5dc05e208531479ad543bbbdfb765eed22df40e32388eb34f4b2ddbd9f3a10e63d7aedf0259d47a325c1f8d7f4dc098a53c69d61b1be09d
 EBUILD libdrm-9999.ebuild 1913 SHA256 a1a99fe8335f4dd1da299d84b2b9a536c1696812acfa8c2297b55857fc1c9790 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531 WHIRLPOOL d19ff320a2d73409063add688ae4cd547ca34bf2735123ffb2f9b07b010af751b6d0fe02e23137224ed427c3652430a2d68d25c185f1f806b3e69bbc89b6f06f
 MISC ChangeLog 10565 SHA256 0b5bb6e232fdf4da3f832885a9cf2a5941688a40b79fa11d71304a2d60a428ff SHA512 8072f0c334cd09fcabaf4989fc78c3e1f3455e5dca52ec0d71d20c4e74af2dd0464ec8240a32c9f8ac0b16a302b375bb542decf48b84465c88a7dd5ede2c1f2e WHIRLPOOL 48e58d54d58d7c1eb0ce4037a1dd8f3a64242c29fb4bdf29981ce0de0c38691e1b3bca4ccc3523829cb93ffb996efae76e87b980148605de0a3c780dbbfa7f9b
 MISC ChangeLog-2015 38773 SHA256 cd87b1d64a1a2aada2ed0a242dbf4b62a3af4b0cc1a203b6b078dc118ba8d12b SHA512 63c8986631498686718705509b75f5af6e25604f0336b69688039266e3bd6cce959f7b386081e02004e81cd88f7a41821b277bde235c422b4e60d40ea5d91e6f WHIRLPOOL 23a859dc9ddf9920a90a2e5d700c2d003207e20d6be90cd7f82998f0254370c451827c446564699443e5917228b0d84cd6557e41f8a8613c815fdff331a7252f
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
new file mode 100644
index 000000000000..b8477e723d2a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+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"
+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}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
index 4c3205637e87..3ea8b1c0baf5 100644
--- a/x11-libs/libgksu/Manifest
+++ b/x11-libs/libgksu/Manifest
@@ -13,7 +13,7 @@ AUX libgksu-2.0.7-libs.patch 3129 SHA256 62d1d576bd8e4b07494a788d6760463ee2090e3
 AUX libgksu-2.0.7-polinguas.patch 749 SHA256 40ce03bebca2f06d09bda31418c331ed19c4f438bb30fe8c7afdafbbc6e38243 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103 WHIRLPOOL ae30db223c67d24b71c6e832a9039d9e5af7b67ebbb329d68339fc9525058323706e4a7da690d7ddfa6e60837e1ace262507c2f3b87d861450198b5574876149
 DIST libgksu-2.0.12.tar.gz 477903 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 WHIRLPOOL 429808802e740880c786c00f2abfaab564178c1da06be5023f1ee17aa766e10d61c3d3aad14affee834c928822a2b92cfac7e5fa2b326725497cdaa1334fb55d
 EBUILD libgksu-2.0.12-r2.ebuild 1669 SHA256 a39aded9f3ebe599c05ee9f836e44f2e3c8b40621996b89c957c115809d7785a SHA512 8832abf4ecc74673e01eb080bd5dfe4ba39d091964706a90de2de7a16ff7d979d152bd1839be034162cac7036cd2101c63ec233894ea49d0f43cd97262c80d17 WHIRLPOOL a07f4ec0cf52440c561bf85347fa09c69b66457b16de24b42b51ccae362f70ae2678e40f2a7c6634c9a22e7a1586bfa171caee9b954a3c23b07e7ab381567f78
-EBUILD libgksu-2.0.12-r3.ebuild 2037 SHA256 94d7a4c8fbef9a26ec850975055e1b00de3a4b0fb276bfcf7a1f5ed2b23fc4ac SHA512 099ca10aeea726322646855dc239cec6d4e4d53eae29ee810295aad650acf7120273777f38a1fb070a5bf628c539e3ee116b1e603f1d42b7f4d7c49cbef86b00 WHIRLPOOL 1a45efdb7ad85826788b4538433fc3cbf347576dbf593f45decd74ca643e8c4846438245732d1876d9dd552bdbd2ec6cb7fcc9c42b390580fad83c10441989d1
+EBUILD libgksu-2.0.12-r3.ebuild 2035 SHA256 ac7cbd1b1e66ea3f6af85d449229e1c182ddd2fc6012810a5be34e414268039f SHA512 5f5d8e65c941bdefbb5ab268185f679f60c6aef0bc810afb5d8c680bd2d39b37ccb21afb2e6a478d4d2e959901938ae53318aa5244cb4181fd556c415ac9080c WHIRLPOOL 710c6cfa9a675b9b704377b452c64f0d8e992d1e522641badbc6c863b847be89c61c6934fb9d6ee3c5f30e3857a27f77908071b4fcd9f5fee73c34f1601029c7
 MISC ChangeLog 2720 SHA256 08143a4e10dc026289dbb9855b2a0b812c4994faad896b2bd4f78f2177688629 SHA512 94e45024ff626a09d9331889c0018e0d4947a1c303c1eb3561fcc1869d1330f426d0055c6ddc9d76efc30b2f1196a127ac3f50ed8927155a6de8e53e3d72ed13 WHIRLPOOL 81c43a054698fc449ff65ab3f2c6234e07ec4d22a7ee4cabfb5d78a5d25deaa4fcb64294ebd99c31269db07c4e8dcd6d1261a2b6065efaf94cb6b98c4c3fea6c
 MISC ChangeLog-2015 13147 SHA256 806fe0e7443b32a466471d917c8b17adbd9b060450acde2faa0960b029982592 SHA512 d1959050a7bb41352e0e71efe9c60cc6cadc3dd662a412e5edb3e6667df0b5ca631b868fc960a82ddc40b9e0dcaafe065abd6e50ecded96daeac6b5ef23b6ab4 WHIRLPOOL 6b750cd3c7622ef8c3f30af6d5685f2b4061240e439f0bd4c47a15764e734d28c7a114f8cebd96b3855bb40ce4bc43e728910e60769b7ca5037a3bf6490062f6
 MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
index 0568909e0b6d..82f6308138f0 100644
--- a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
+++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls static-libs"
 
 COMMON_DEPEND="
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 3d76f5d93c5f..63c401157404 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -1,9 +1,9 @@
-DIST libpciaccess-0.13.3.tar.bz2 368755 SHA256 6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3 SHA512 11ad783c6278e340973a621339cece3776c098952d0eaf96bfe745d013347e928c0883ed8444c5ddea870f5e4b3c25da16a44facb9d7fc1c8fea1c7e77bd592b WHIRLPOOL 92ba320540535c2b2811c29272a2d94dd3c1f586a0e3073ed4678c03cb3e30656772ad6b0a3e9612a0972a28cfe0d9c4c93ea955610e609fb103a15bb8051e31
 DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92 WHIRLPOOL d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
 DIST libpciaccess-0.13.5.tar.bz2 381729 SHA256 752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999 SHA512 4b77aa66b3429fd5f9bff0408b0624305e766bf209f3fa2a0a9024df55bf87ca68f9a5aa34f97ffe131997e0669c65cf542210cf308c0de09842424968c5a159 WHIRLPOOL 1cf2b0b78d1c0ce25d0069dda9e9e5f9b3e1cf3423724cfa7a5028ce0cf8cc1c69ec28eb5766075435d6922a049192f76bfc65058709b24a4df6b1c59f8c5df0
-EBUILD libpciaccess-0.13.3.ebuild 861 SHA256 5ec1ba0081c7eb2ceaf95fece80a62d07ab0004a98c2b3f7e3a0aca9060e47b7 SHA512 2d9157939136a12bc9e0c9e307f1ea299d33d11aadfb77db5d070ae25d73742a5d843bc5f2d19610268b859ea8c5b585899b32868a6dc2bc4c1b7f882b4f00ed WHIRLPOOL d46e70bf5d3f24f6696af735b63d72a688a9d34ddfc37b896ed0296cb52a3e20fe037a4a8c3b64b88d1e9eea3e5122fcdb9aee95bf26e94eb3ad5fa89575c2d1
+DIST libpciaccess-0.14.tar.bz2 361375 SHA256 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4 SHA512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b WHIRLPOOL e44367dbb70f67497fa10dd7ecd38a13308971d3475937af67b4eac03552bf4b516fe0b9d5c90dcb9eb77b5ada6fb3b40323a48c1fcb8f1d86d64894053053e0
 EBUILD libpciaccess-0.13.4.ebuild 868 SHA256 41b0d0c093677d555fdc3525b9816b578d5eec297f2bdb8f43abb3687ff3ac98 SHA512 5fe17935dab18929a01fe41991496751f64a0a8ab87bd95b077cf794158b189272c6745c222be9f0c01e5c6dbbe5cc911d9bb7100e84f1608702dcaf27138d22 WHIRLPOOL bd508681325ee1170bc0f8fa2ec646b52033f16328579e9997951d6c58979ffc16a08dca95ccbe33dee9a98da80182e76c54e058dbec5d069bd687c8796b402e
 EBUILD libpciaccess-0.13.5.ebuild 877 SHA256 e5d21e811d9d4f322218201b3e6642a1ff5aa85e37ae4f7f4a88f03db64209bd SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009 WHIRLPOOL a8496ca1a468dbd38010e71b9d1343951be0f2e2804baa758a8d94022a9ccb2f2cbbec2ee6b0b9b4efc1e09f7fd665fa5047cc9d75fa04b7358cb7b8a834199b
+EBUILD libpciaccess-0.14.ebuild 877 SHA256 e5d21e811d9d4f322218201b3e6642a1ff5aa85e37ae4f7f4a88f03db64209bd SHA512 79805b3c23a399936dbf77d49408a2966e27d650168451dc9c5bec940e276f6eafa73617a19406cbc24f1c625eeb72078fea9a95715fb103c58f90634c379009 WHIRLPOOL a8496ca1a468dbd38010e71b9d1343951be0f2e2804baa758a8d94022a9ccb2f2cbbec2ee6b0b9b4efc1e09f7fd665fa5047cc9d75fa04b7358cb7b8a834199b
 MISC ChangeLog 4425 SHA256 a8cf82f61b03f40ce07f87a08a2f7bf2b9b9e9a0e8ed00257fa27562edc2eb8b SHA512 5bdedfab507f2fae595db5fc66b5fdefefd79d7816000ce709f25328485de77ddfb301af45c78779c0b869921db669450a257dd92c35054e89d6410145ab311a WHIRLPOOL 128a6d27175db5e618d1578caf475302852187767368ad09d70d0ebc127fb7322f0bd1e096d8566b3de92f7f55877783d100ad013f3459cb115e4e015a3864a1
 MISC ChangeLog-2015 14232 SHA256 b87224c21643d85516e4f39b429eec0ff0453e61d1556d5b7370dff932ae1c13 SHA512 2fa3f526917a4f9674ad1604ea19505faa18fc67faf5bf2707092fe56a08f4fcfc848c3695162a768b47a9718b91e1c4127dc02423edf1a9d57faa6e73b2c0fc WHIRLPOOL 86d15121a6576ee6d9b1f2d3f2ced853249dbdce63ccbb415d2d0b04f3cf57609f1b5442bb087234cccf9b02c1e413969a685f68f21e6d17fc465320d6aad52e
 MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
index b773942ddb59..40538ee468ce 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.14.ebuild
@@ -7,7 +7,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="zlib"
 
 DEPEND="!<x11-base/xorg-server-1.5
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 632aa3bab95d..e30b868286a2 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,7 +2,7 @@ DIST pango-1.40.12.tar.xz 856228 SHA256 75f1a9a8e4e2b28cbc078b50c1fa927ee4ded994
 DIST pango-1.40.3.tar.xz 1061044 SHA256 abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27 WHIRLPOOL ba160e7a9f5ecfbb4d88f780b4a9a5f555f38407d4f50f6ae0b0d276a3d4100dce4af519ceadce8b95c3432976af4409e119cfd18bd7c636d70e6c33ed7c5b4c
 DIST pango-1.40.5.tar.xz 1065152 SHA256 24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9 SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d WHIRLPOOL 8d8eec25ba18096ce9c5fae2ce9f1d54e908784482669daa8f505863f7b5529c50fd432fb93c3d8d6bb3ef2ac311c59e68667393dc0442335a97171c480d2294
 DIST pango-1.40.6.tar.xz 832040 SHA256 ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7 WHIRLPOOL 45f32e02007c53f079499c5d4b92c67ed528e3c2108f414b3ef18b53c8114a8fe2ae4f71707ecb977e224e86a5b05d8e048f39f8deef41d6342194b19a84d6e3
-EBUILD pango-1.40.12.ebuild 1710 SHA256 a7171813fc652ca6c7c7d948679a48059664e77f89a8fd697222ea18a0128a21 SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515 WHIRLPOOL b6bea6839d2325638952ff7c5073f235aee811ccb083925c8a7a1af70531df68438b67fb74d08a6dd4d4d82e1de68cb446dd6be8ed8c17df40089559e94d47ba
+EBUILD pango-1.40.12.ebuild 1708 SHA256 d65b3488dc55180655af2f4d999e1aecde49bd2d014cf7340773f6e35fc6d850 SHA512 0000801239489faf7d04cb4b85221efac51305d6e70f372bdf7510bb6284e663cf99e28454562a295252eca2c3c351ef9d49778578e9729491dadff5060f6241 WHIRLPOOL ccf68a4b0581a6663e3fe9e60850f2440ba16e66824840949687855be9b77c2ce6cedfad2bef39ea4a9f7c511d317626a252bad1772e572f17a7e307a0d318bd
 EBUILD pango-1.40.3.ebuild 1710 SHA256 c8ef2c66ac9ae7e509a043b189d90d9e553b4feb447c909f4bb7007853835cc5 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139 WHIRLPOOL b5888c87b1ecdc4ed219bb10fbfac97684d0d88d262d42bb2dfd9ebfa50424fb8c5a270716318e57010bc3bf072e3df2d978ea50d9e927be81dc22cbb1bdb981
 EBUILD pango-1.40.5.ebuild 1702 SHA256 ede80a0661b346b4162753e918b15951fca82eed7244c84eb08f9f0fa232e2b4 SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be WHIRLPOOL 510e51d5e24e32be3dcaf8534d14a3d320b5d955fa3135a09b750fb15e811b1cf81ba8e61ff604807744fef0d70dc6e33221c6e27f36baf579eb2a01ad37af4e
 EBUILD pango-1.40.6.ebuild 1702 SHA256 bb0c6e1b23d28060a807fae275e0423bc84a8491094c4344d782a32c839cba59 SHA512 81d280a89db9f79c26c6472247cf373f250eae38861b1105e4ddf7ee979cd0a55bff8aae9ab34cce6a590d72573354d5662bfd16707015dde3d3abeb693f3d5b WHIRLPOOL 3cf805331fd5acfd0e470019094cdd3e23ff3906b36ac6236c364a5113d761434e488565bb6a5613e20c723c2391cecb77d1b3c76988043603f7f96e305a16cd
diff --git a/x11-libs/pango/pango-1.40.12.ebuild b/x11-libs/pango/pango-1.40.12.ebuild
index 0b59c658a54d..3a0863f37cba 100644
--- a/x11-libs/pango/pango-1.40.12.ebuild
+++ b/x11-libs/pango/pango-1.40.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-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"
+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"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index e15c95bc4252..982bf45baf78 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -11,7 +11,7 @@ DIST vte-2.91-command-notify.patch.xz 6012 SHA256 b99ea46c410030f0d0ffe85a9034f2
 EBUILD vte-0.28.2-r208.ebuild 2973 SHA256 d25c229897764598d07711b4644d79f541afda0e7e8057446b759cfa699dfa19 SHA512 c8711b4777911936c2c2154eaa620f4ccbcb5df491a1943d97bb2bc1179ab333ee422fcf26f56a7f76170941b6d6bdb21b881fffb0c7af96a37cbf7eb63ca560 WHIRLPOOL a447845126ec2e6af5ad5636826b455fc930834df01aefeba7a25576e9a2f7a3d2eee7ff6b0d9b265a51d4cd13fd336ae38c0447b7542fd2ea138768224533cb
 EBUILD vte-0.36.5.ebuild 1695 SHA256 c84c27f306a285979178d856f4243a70cc67a58b6a99b6e60e786ff187501a90 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba WHIRLPOOL 8a38294e9468a779df1b74dc797d101c0999844ded28fb632149db7c9f915d44ca47acb13a448b0c2d4f80e09b4a10c0b41ef455addb53417e3e191c56cd3af6
 EBUILD vte-0.46.1.ebuild 1898 SHA256 1da31f1f28461c3bcac037b45cf369742eb542caf3878eed9db36a5feeb88e5b SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d WHIRLPOOL cb0166031ce638d0de0c876abd1f4330552fbf19ed9c1eb28389085132df744506dc29ebdb29161841b13c78c0f612f1df2012f94d456382c3323afc963a8451
-EBUILD vte-0.46.2.ebuild 1900 SHA256 f239eef2f97553e049a1cccc565cedaef429499b129187a27bd45c2dbcbb22c0 SHA512 e2f3ae2bba60f59df884706d60066662c7aeda8e794995a73bf4b1f6a488f3080897b8b31812948c979ce2713a1508324e8cb91bcd441e511e10fb544161d457 WHIRLPOOL f2ffde7ee0fd515b86219766c5cc6d437cad2ff9e3bb378218d9e1242f69c150de66e735e41b573d4ee16176d93877e07638e5b0cdd050f39af616f8ed897ee6
+EBUILD vte-0.46.2.ebuild 1899 SHA256 315ef22f6035a273e8fb0f64ab7013bba11bd8786b5eecee9f2bdd2ea0f776e3 SHA512 166e00bb9e3f2bc37870635379d4176aebeba91c211f5bf736216d3bcfe6d56281ba4851be22095bcef58108066700c7d68d37ebeeca7730daed7e7215364d83 WHIRLPOOL ec1fc790b87d82aeb3c2b15e89f128d87096bdf9a29128c9edcd756b2db3c1b27751b2a0464a7ce61a5b2fad9d0de402c88d2d1379719b5e5b80f8e656d5517f
 EBUILD vte-0.48.3.ebuild 2343 SHA256 b630a9e0709d6a95528b55e6602d4419fdb4aca903dee16147b79858eae2d193 SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb WHIRLPOOL 03dab3f52e1b71328859e7bd17a74f3a1456e16c9934060bf32df409ab2efbf87b7d8e69eff30e63b68e89b9fec7549460365d4a4be977072eda1db8b7b8a5ac
 MISC ChangeLog 12740 SHA256 a95015795d0f34275827e24625ee923e4426263dbcb0604362ea8f070f97d0d2 SHA512 c27b5d62a3fbd4b0b550e2ca4bee4917aa315a5f4986655d13faabeb74e28f284cd19a3e376f7d986f984da05b04f7eddf94fce34188d20c818556c7f8f20608 WHIRLPOOL 54fd57c7358ff253a2a0397549b896c6ce0d186c8c3b58f60cc5cb8f4231cf581d2e61c8ae2234c90f544e438cdc431a8b451b9a29ab97e03f8a113e0dd9001b
 MISC ChangeLog-2015 55694 SHA256 b82586cfbd6b1268c3795822eddc032254d66867cc5ee84750c31e87605e9eb5 SHA512 260cb689bee30cf2c1970f98f34d8bcd0d8fdd6f6419513c5098fea80a9de759dda50e925950516b570e38403b74d3b787e26738a5a4530c06160912d3cbdb64 WHIRLPOOL 8983100c2dca9e9261511c237af5e84afd8132fec63042af20b6e7abc04be4623e58446caa9408dcabf0fa77079227b12dc9180b0912f8e9be8a227e27ea7d7c
diff --git a/x11-libs/vte/vte-0.46.2.ebuild b/x11-libs/vte/vte-0.46.2.ebuild
index b1a40a10a62d..edf961993ad9 100644
--- a/x11-libs/vte/vte-0.46.2.ebuild
+++ b/x11-libs/vte/vte-0.46.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="