gentoo resync : 23.06.2018

28 files changed, 111 insertions, 101 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index fb62dec49b57..4002795441b0 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index cd7f8df93ed0..48fd5faa7567 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -3,7 +3,9 @@ AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f
 DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
 DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 DIST gtksourceview-3.24.7.tar.xz 1390500 BLAKE2B fc8c6695ec94f8c0ff44fbf96fa3c1f8e11d11c9959a8b873d25e420894208444f1f88624d49f7366486039f0e1590692e2b5b0164c08c1358a8ea8b0b4aeaa3 SHA512 d86ef2bea6ae24c128f65e314c82f58265a53309abff22630360b0f5a5f9b640e3fc31fdd58b06221efc28f41c95c0f92613edb8c0a2c8f5c6147d287310a9a2
+DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.24.6.ebuild 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
 EBUILD gtksourceview-3.24.7.ebuild 1324 BLAKE2B c552e0d940c99210b5215733f352048be1ccfb151e4983c59fb32caf9c65d558048073911658194163da337fcdde3bcebfa17408eeb1e02cb7a365caabf1c977 SHA512 6ff72d0d692c45c18eb4d3d8ead62e12da77cfb5c063cabd9d70561f23d5c776aa2fe21ddaf2a6fa8ea940d2c359c84d7d03fad014e28b0712dc08935dc31d3d
+EBUILD gtksourceview-3.24.8.ebuild 1331 BLAKE2B 12e4d6f54651c159eb77b492aa771a39c837bf1fcab5412d9557f36dbf896ba519f785dc9a6a228ec314a50cbf888f022132abd58c13fcd041427016759d5afd SHA512 2a323abde1e2c2ca9eb3a6f008410db0222b36f05f8bc367f7d2ae9d088e5bb8c4f65e232ee659548d4dcc78cfd6e3f12fceeeed8369338bc40204978be12b0b
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
new file mode 100644
index 000000000000..db3725e99188
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
index 7e2ea0e918c5..a670fd4ffe63 100644
--- a/x11-libs/libXaw3d/Manifest
+++ b/x11-libs/libXaw3d/Manifest
@@ -1,3 +1,5 @@
 DIST libXaw3d-1.6.2.tar.bz2 551851 BLAKE2B 13a03eba7af518fcaa33e89e0cf7c0955c175866348d314210f15a291590fdea98e1b5b9628252932826069bb3a3e89b2377dd80f1adfe3a2bb06e6f82f85408 SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea
+DIST libXaw3d-1.6.3.tar.bz2 561594 BLAKE2B 85f3fb6d39a9a0ccb7d2c529eff84a4a9e85bf81be16487f2119da0a670e40c2d328e17b06ca237f69029e8d43daf6eeba8488029e6e4d2f56bc1093a2f305ad SHA512 f79f997ff8442563c74f38c7d76fab2c9253691743ca3143047ce698adb4c126d02dc968be7bdc79ab3052b785fd705375d2f01171e3a3266736beb531c91424
 EBUILD libXaw3d-1.6.2.ebuild 671 BLAKE2B c1b541170f716a2aeeb1b60243bb2e100c85e357e1f077980e7bf4786e56dfea1c0e511368d9c5bbbd129a5b04997e2bfb06a19b584362fbdc8631addc0735fd SHA512 1afa7f6c9b7ab380132c8b04ab88e410809e4d3871f1a46d35dd668f9c01d87fa4a2d2effcf4ca0dafcf6aaa56ee30ae5f1d30b865cd4300469209f767a1d960
+EBUILD libXaw3d-1.6.3.ebuild 724 BLAKE2B 2a550dcd488cd993de8e5db94d2d8352b9ae353192d49b9375d81788dd50ceda8ec05b724b7c9f13b90b9476c8a31ae966e1c7e39619837dc3e1b0bdbe53ba85 SHA512 a161f8529389c8086d749ac78724e37c92bf66f1b6fbf59ff148742902c0c115679b48152acf9897eab4f20c46f44d02c92f9c94593bc6ae130f5243da7ff06f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
new file mode 100644
index 000000000000..b92be978bab7
--- /dev/null
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw3d library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode xpm"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	x11-base/xorg-proto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable unicode internationalization)
+		$(use_enable xpm multiplane-bitmaps)
+		--enable-arrow-scrollbars
+		--enable-gray-stipples
+	)
+
+	xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
deleted file mode 100644
index 52b1850b3e10..000000000000
--- a/x11-libs/libXfont/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libXfont-1.5.4.tar.bz2 528883 BLAKE2B d94a91dfa64e6b78bb4cb7f5ce59300b1cf31826308f3b3d29d495e166403ef57ddb8467033c08ea2b7a4fb0b160d25380f49aed79cd6b72a305eab07a0be25a SHA512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3
-EBUILD libXfont-1.5.4.ebuild 841 BLAKE2B f7f7be8175b3e1e0ee2b0d737744a2b0d068988681c8a99a81b525662b0748ac16d0cac12e47d2154f3b810974df963cdd7d3bff77a191b94508ca0440c23f28 SHA512 1f54de94669309baee085e852945635759e565a1cbc823c61da1570e0b93b48ba4eb284063139e3e67bb02ce9d70c94dace755edfe9b666f79cd9e56e194537f
-MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont/libXfont-1.5.4.ebuild b/x11-libs/libXfont/libXfont-1.5.4.ebuild
deleted file mode 100644
index 564cae8622cb..000000000000
--- a/x11-libs/libXfont/libXfont-1.5.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-inherit xorg-2
-
-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"
-IUSE="bzip2 ipv6 truetype"
-
-RDEPEND="sys-libs/zlib
-	x11-base/xorg-proto
-	x11-libs/libfontenc
-	x11-libs/xtrans
-	bzip2? ( app-arch/bzip2 )
-	truetype? ( >=media-libs/freetype-2 )
-	!<x11-base/xorg-server-1.5.99.901"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_enable doc devel-docs)
-		$(use_with doc xmlto)
-		$(use_with bzip2)
-		$(use_enable truetype freetype)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
deleted file mode 100644
index cb2e6a7213ce..000000000000
--- a/x11-libs/libXfont/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
-	<use>
-		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
-		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 2ff560ed94fb..7f856132f1a2 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1,3 @@
 DIST libXi-1.7.9.tar.bz2 486312 BLAKE2B 2dae307168431ed0a629ee1be1fa0f93732105452be822bc9cf54cc0863286306c2bdda67c16bb7ed92d63d669f884a4a67ae67ffcc7c170f91848039d470c0b SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5
-EBUILD libXi-1.7.9-r1.ebuild 795 BLAKE2B 46fb44e14f4fd806f24f9a61fff8f89f96118c6cba0cf07cba1e07abcb0b471e2a1cdae571978ee7aecfe5039dd5ec723eb0727852f3b4794e412ba5ca73f628 SHA512 61050bf15e1329fb125cc103f30816c51493c46dcb17aa94fd759502534729c526f1220874eb87cfe4164c3151482ba2a77d739a22853563fe0661e0748a040a
+EBUILD libXi-1.7.9-r1.ebuild 794 BLAKE2B c93a5ef0b4240e89210d2e328c4059f12b041691e4d6b837cd43ee3f1db698bdec0ddf4f5aadbed950604d202a713b6e97627f90fa8b7fd4da1338b11db18863 SHA512 eeda44c73f36a7135cc82c3eaf31ccccac880af1a7b4df427649d3e18911c2b83965db6fd092e3af2ccae3cd649e0173f6285ffb8a4f7e91af0bd9f05745dded
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.9-r1.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
index 90e84aacb9d9..07c4fb0b20e4 100644
--- a/x11-libs/libXi/libXi-1.7.9-r1.ebuild
+++ b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-2
 
 DESCRIPTION="X.Org Xi 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
index 1948bd4c2dc5..c77159554b51 100644
--- a/x11-libs/libXpm/Manifest
+++ b/x11-libs/libXpm/Manifest
@@ -1,3 +1,3 @@
 DIST libXpm-3.5.12.tar.bz2 430736 BLAKE2B 738838f37643e4e8ce489d34adf33d2459e7bcd7b1eafb21415cd44620c3d4eb18750381a80d1e2c9a2f44ccf00159a029df18164ea7a7834dfee8d104303783 SHA512 a5707d5f758d577414101b0723af334fc8ac223e5b9f869994765735e1cbd8dafed48ea2851ebc479fecaf84381bfd5fbef842ec971a487f7fa9e77d54d3a17e
-EBUILD libXpm-3.5.12-r1.ebuild 934 BLAKE2B 88090cae2e330bfa85878d3fa28d302b7d5b860112c961ac0f1687ffb247a56c1d06da16b8e4b8d1344efd066eb9eccd522843e7ff3b4405317d8137fbddee17 SHA512 6d246df2a80d6df571c11aab76969c7f50bf8c1ba76ba63097a94d3a56a8d631619c9af3986fc060bb4bc941184976b16989780ed9a4bdb8a03879d5dca3bcf7
+EBUILD libXpm-3.5.12-r1.ebuild 933 BLAKE2B fb19302773d3b0237167da290b5db9d4ae57a467ea23de4eda0db28f9f29560c17d641c7585c00edf6c59d2e6712508677a01a2c3a3a8ba8d4f859f5555b7f75 SHA512 9110462cd8f59d20f2418717eb6b94f4993400fc036a00a32d7719825a53b609e78ad4d4d763cc45041c66d8fe7d826e5976258741d08b889971e29e71647605
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 265319ee68ef..8f1106a177a2 100644
--- a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xpm 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"
+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=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index 18b05091e63a..5b21d6cc0f7c 100644
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -1,3 +1,3 @@
 DIST libXrandr-1.5.1.tar.bz2 315769 BLAKE2B 5cdf69656ac804cf8732e35d8e46d5f29b5959851a0313d17d6c767b4cce0e55a1e137f074b7f7029e031397572ad934aa2649ea7d8e2719a69f16cc1c3e172e SHA512 ddcee1c50da8810412fd747b05a073ee5522b2f3b0a74e6a9b48b489ce9712356d1bc3009f8898aeee85671cdb44e2dafa04c8caf23d97963b36b1af9174445a
-EBUILD libXrandr-1.5.1-r1.ebuild 623 BLAKE2B f94d84a6e3d264886d0d7fe8959d0508bd907457982f96e386e09465738b94281db7e878456f5b10d91a2234b6c64a4625e182ea5587be0e2bef6c61d20e17ad SHA512 943653f6d3d4774ac9706bf6d21ec087f854cc236fc9325459a3bdf8fd64f5c118a23c0114ed74faab87168157e38a9118096b1f1b4bd7053ed88d5291a9d466
+EBUILD libXrandr-1.5.1-r1.ebuild 622 BLAKE2B 1ddcade8f5892de00edcce38b04b14f7153d59bec6e6ca8138495846864ef0e155a2bfdadc76dd88d1fca066514a2275841394660fc8af859151d0a51dcbd5ad SHA512 5d78983a856a884da06b031e9ccbc41164cb04909de9bc8cbe424b2393e4afb1aac6b447a317b7cecd9fd67d4040f6fda542362f0b66739dfa7e37b8b965c6a9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
index ea5d42da85ba..271af5bb90e6 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xrandr 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
index ec7aa8a57b21..4d07443b8647 100644
--- a/x11-libs/libXxf86vm/Manifest
+++ b/x11-libs/libXxf86vm/Manifest
@@ -1,3 +1,3 @@
 DIST libXxf86vm-1.1.4.tar.bz2 295346 BLAKE2B 22698db5beb0ac06663e9163e13f8afd99597afc6dbc9f9d4fb232682df6b41a155d63fc1beb58da3d83bd0e420872c457671696246dbf39a6451454a6e24b9e SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0
-EBUILD libXxf86vm-1.1.4-r1.ebuild 557 BLAKE2B 8ac6953e77d18c497646c78ceaf7b35759bf364f125dda468e210e66fbd7decc87880b1876afc11048996e62b4805d8da0c61d3d6c7a58c27a9e253a937e7a69 SHA512 1d6f212ffa33aef6a299971026825e83cfbc74acc0b7a79e857b73cde484c10968bc3a1d72e6a7f5feacca93e17a751007a727dcfc90109e744d6560aae350e1
+EBUILD libXxf86vm-1.1.4-r1.ebuild 556 BLAKE2B 4f40c0194f745451087cebda55d683da433fafa89542a4a2de64e64f1aa92f6b7c41bf05a8253952bcd9b2506ff19ad0cb38d14d52390837c288cc1970fe2aa0 SHA512 9482e0e9f7600fb734d1848c21bff3e989a9249d786ca61709597a07cc9530993f11c4774f43609074f865e17644528364ac8a5397a2b39ad36f6bdc1483a69c
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index a43801d9c3b7..0f80ab8fea46 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xxf86vm 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
index 50d7f3987c4b..a93f7dd333fe 100644
--- a/x11-libs/libfontenc/Manifest
+++ b/x11-libs/libfontenc/Manifest
@@ -1,3 +1,3 @@
 DIST libfontenc-1.1.3.tar.bz2 301494 BLAKE2B 1d9d5387cd11820b1d458cab8de26fbaebeb2d0b5c6197a455b0261e53004e6d8eb9cea7dab27ad163c8897237a864075f981ec3a740cf8056c3f15be23ecd3d SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c
-EBUILD libfontenc-1.1.3-r1.ebuild 551 BLAKE2B 86f980e63033e2b83b0d252d9b18b9cfc6eb137aa366bb8a8edd8e517ad2964cb693eef73fa5d3839d284a1d9d46d5cb9fc225cae98729b63b0fd71084be3b12 SHA512 43529d2b9713a861abf15b32a9211caf5ff2ea61ca7a7f166fc362218abd67a9dcdcc9cfd04da1ca7862f9390d85fdf9481043fca6ace55c18d30e0cfb846b08
+EBUILD libfontenc-1.1.3-r1.ebuild 550 BLAKE2B a8496bb2aa5b8ff63a1c4bd3c7a6cdf7aa5b2da053d534c0bf97badc207be396d610414b04867a201c10988a9ac15de064855568ad8068797b55e5a10a8e9074 SHA512 f0b2a74693e893a0751800b4d1d092da195fa68fde632b8e8540622480be24cbd3dc599b3235b5798995a8ec99bbd1fc1d87c6ff8e34315ee3b586c15a319d53
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
index f0b707ef6947..260a06ad7415 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
@@ -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/libxcb/Manifest b/x11-libs/libxcb/Manifest
index 0716302a3012..17d80532c95b 100644
--- a/x11-libs/libxcb/Manifest
+++ b/x11-libs/libxcb/Manifest
@@ -1,3 +1,3 @@
 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c
-EBUILD libxcb-1.13.ebuild 1480 BLAKE2B 7f3fbfaef1ed787023ee3a89223d847290f125dfed4bce76c97e66fcb7b785c027e2a5b9084313d0a4350789e9e8f3b60262e49df5a9ce488fae0de8bc0bca51 SHA512 8a81b7791eaba7057579a5de35305b4abd92665a254afe26403a14c4202b58b6b5291c0e431f229b959bc6994e05ace2a3403251d3da2f8170cef8db7d716c47
+EBUILD libxcb-1.13.ebuild 1479 BLAKE2B a998f7866d63a3bc0fbb98421ade5455630830e5888dac09c36217bff41730fd0fabbde297c9e9363fca89bcf2b4d02157075a03344c64d4cae3cdee0cd7b5b3 SHA512 888672e99916705f6fc2f88a2aa7eb35c9e1bdb2894b87e2a9c599f42ca0a015875aca6077ec590a1d6bcbc71d2a017ece2c56df4e4e437edd34e7b583a4c010
 MISC metadata.xml 319 BLAKE2B 8dc76aaf5b8760a5b4a1b6785de5c77cac259c44ec88e41a02834e240cabb2037cf90117462c9aeadbd73502f63e8fdd1223e7dd07fdbfa11fee2c6eb6659cc2 SHA512 099359a62cca3897168fb9cbdb25f48feb8ca3524bde0c7f36b271059c84e567bba9fa6e47d999ba8effb2969e0a918bb52ede5e1a8737d9ff5a13a69f709a5e
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index dcb64fbaa989..cccb4a8a0b00 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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="doc selinux test xkb"
 SLOT="0/1.12"
 
diff --git a/x11-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
index 640c2f653334..b31f829e3783 100644
--- a/x11-libs/libxkbfile/Manifest
+++ b/x11-libs/libxkbfile/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbfile-1.0.9.tar.bz2 348009 BLAKE2B 2b4f398c7ef35ae6fcae8491733669408db98a27c2351514ea1cd0332a34cd995a34d18013c0ed2a70977935ee1dec527f744bd3a01530e6eefcf715752be9e1 SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1
-EBUILD libxkbfile-1.0.9-r2.ebuild 521 BLAKE2B e9ebab7506e0d0355ca50eacf34474508a1029da39505785732e1f0797a5f5d97adbf5370846e02311a23cfc891bb01076a64e24592ba0e2b2f100a09b83da73 SHA512 279faec968a64dd75afa950d9a979ad29999166a911b927ad58b769c7527ceacbb6477eb8a6c4d7a6f269a3005a63fc429869d28f43750f1b299ccb89997b177
+EBUILD libxkbfile-1.0.9-r2.ebuild 520 BLAKE2B a67f348b166ca924103cb215a850a9b34e040eec80e670c1f94e5658073a0f5a762bb31656082e518a2faa1018d4255e83ab79a0d75c354fbb753418dbd7a0f4 SHA512 9c5708fa7038f0003f1edfbc3e10ad6b8aad4837d826f65d5f5e14040e9004c1cffe83e3f4edfe9697a5c27ca30adbb7a6b0b9d3a617e90b7a3c56ec401b2a7a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
index c624ff0d36f7..74a529e35b09 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org xkbfile 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index dcf23e539fdb..693abcbc78c3 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,4 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r1.ebuild 747 BLAKE2B 0bd1a1abcddf3bb38b92f32374738f0d77cf4d6c49e767d64843c6373cd9ea892b87c3f3f71c0e5945b5d49b1136f5c0f91a76301c6aa0d7e1da1a26467d97da SHA512 ff3cade37f66d9a02ee8eb87ff76b5640bf78a7b0d03e6c4676d40c9c9dd65fb7e975123e94d1fe1aeb52bebca9632c51399b9652ef01123e93931c014bf96c8
 EBUILD neXtaw-0.15.1-r3.ebuild 743 BLAKE2B 3712991b9d8cecf44be34be3124897815a995b2c8bf4aa29d9881001a847d8ed0e42bb3732b839a4f3cfa6826d651395ab53bc047dfd1d42756eb508e061e1e3 SHA512 96183c10e6218bd56b56e2545344a4b2fa7179b7c1983f91760f2dfec0e5834d043d44845234ce42a146e972384622a926c18bbfa3185eeac135a90527e41087
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
deleted file mode 100644
index 8af31b14ee62..000000000000
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
-HOMEPAGE="http://siag.nu/neXtaw/"
-SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libxkbfile
-	x11-libs/libXpm
-	!<x11-libs/neXtaw-0.15.1-r1"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index d5a6e456ad56..0e104a2690a4 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,4 +1,4 @@
 DIST pixman-0.34.0.tar.bz2 739656 BLAKE2B 8e235ec6332125046ac952c32bb3d6d2adabae01f121a952f62aed66470c367f31268f7fc5d4387db5e3a6145cde4f013871f2d82d2d8765e5a41cb8247d4761 SHA512 755a3f5596e7bd9710abc8e5bfd341adaf2177f5b21f7aaae7f85b8fb57580ea48df586ad32bf6adef6ce0430e7cadaa57754a2fa466bc4b15bf70ee64cd1418
-EBUILD pixman-0.34.0.ebuild 985 BLAKE2B 5e4b5039ca4a7677091565c4d16df6b2c16ed99a47c677396f9afd92ca902e536232eceda36e2befc5fa105cd259c88d57dd03fb2a6ec49c60baa4684bafab63 SHA512 447485399d2818149526993c184b2c3d9272c4dd5f03b19d2e33345394d7715477e92fbce620a3b443c37c342ccbf59b41e12964f57b42726eb83bda0033a5dc
+EBUILD pixman-0.34.0.ebuild 984 BLAKE2B 3e8a899f9cc1acf7c55de7fc3f95cec9e72287b39fdd506936e79bf27b2d062dc2c16b63452acc0678ca18dcd8cb0d0802621c96247cb4070ef1afa362d87c77 SHA512 0d843ec8a12a80b90f2d8ec7381232d880c3e618b08f373280bdab3013e86328b0c1fed0f254f877f670bd6f3e0b87a77e9be57eb83417788b30d778fcf4eb74
 EBUILD pixman-9999.ebuild 997 BLAKE2B f52078ba688d6ca303ebe78c4cc0b3bacd597f52ca16274e26d8a5272a2cdc40dd8e3a0d69f228b46b8c200b42bc4c63287222eda3f47568b40e2439b8adce0d SHA512 bd1b90d98fe6567b632cb27915351981b820666bbb284f84a19960cfda57602b097e289c8bbf4b662154bbe236bb72a0e11dc62b14c511f8554f4873b078b9da
 MISC metadata.xml 391 BLAKE2B 201ddfb7a766c48fb4e5b48d67564de3b6ef85847a8369cd56acdce186716872be35ddd8501604fce1d30502eb5ea4c328c01406837bb0e0d90c81655a859233 SHA512 3e9dfb3f70cd8c7dfa763bae9fb3415c276bf0104822122f72cf6df47bdc7926a654ddd653321e5ec4bd04ed7f0dd1335a4924e23d1ac37f63c05a536c1defbc
diff --git a/x11-libs/pixman/pixman-0.34.0.ebuild b/x11-libs/pixman/pixman-0.34.0.ebuild
index 7ea8007f19cf..f9a23e06bb2f 100644
--- a/x11-libs/pixman/pixman-0.34.0.ebuild
+++ b/x11-libs/pixman/pixman-0.34.0.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 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/pixman.git"
 DESCRIPTION="Low-level pixel manipulation routines"
 
 if [[ $PV != 9999* ]]; then
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
index f7d8326996a9..e20a302134c1 100644
--- a/x11-libs/xcb-util-wm/Manifest
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-wm-0.4.1.tar.bz2 321855 BLAKE2B 095d1f39e4b42e85790830b46c1faeeb8ac3bd7b792c3db8dca15a998a0ce835fd4fa148e8ed896c81d82e2113d1b9650e35de7741e9629883908d3b81b927f3 SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326
-EBUILD xcb-util-wm-0.4.1-r2.ebuild 870 BLAKE2B 153ea5d52569bf80ea4935e98d48c80c6a09c96299abd54dcb5202516962778fb1788e63531a87dbc2071f44d234439bbaf4e3cd6cf380e0b4e077f7d71593d3 SHA512 7339504d7e2f1e07ca534a2c33e3920f05f1a5fc9ab6fdb7c75c7f1948837194e908ff7959404e080ef9009ed18d4b183bcb01fbef2355361c4da1b204f238ca
+EBUILD xcb-util-wm-0.4.1-r2.ebuild 869 BLAKE2B 6d3c9947149ed5bbaa628701ef0337c14cafa7671cf9955c84334130eac27c238eb35e806828b9db4f4296cbf06cba1cb168ee6ff2015ec5edafed2633c541b5 SHA512 c6f4b5eeab8c8317ee992e3fb6f3acdfc58f64d7f9d1182b045f74f3c794a6af9763f5d4ae7738fb628f1c41345becbb7278aeedf9a411b1c6360d73eea30a51
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index c5ea04a317a2..1d3d20515d38 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="https://xcb.freedesktop.org/"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"