gentoo resync : 21.07.2018

24 files changed, 34 insertions, 100 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 27bd65b54f00..32618f762425 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 9afc395c7e32..943580fb45cf 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -13,9 +13,9 @@ DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5
 DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
 DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
 EBUILD gtk+-2.24.31-r1.ebuild 9847 BLAKE2B 8cbe3d26447c8ab931c65275248227ad64acc1031a4fb77145d2c59b538c88710015f2a54ebee0903329685c8a966bb93449914db73d6439312044a319d03e1f SHA512 9dbf16c997fee138a096639b6c259680495c9a8155ba12e6cf8598d46212a32f3542e4c4d04aea9ed42ac9ddd2cbf75cabb6f9677a0d17c69e4214ce966ed74a
-EBUILD gtk+-2.24.32.ebuild 10005 BLAKE2B deed3f3eeb7b396ba2f1c221ecfaff3accfa65ab1296ef82bb46b18664a5774fd1956dfe0fc3eef8863a4ac623b6a450d7c01646a667928594f87d351d52db7c SHA512 6fb69629423892a67fa05cdfd29a7c28583d847b455c6d15281d9f8d76bc80fd75fc2804fc13dddc4cf0a48ccd57aea7e26df7f4d1c1f33a0a19ea6107c79551
+EBUILD gtk+-2.24.32.ebuild 10003 BLAKE2B 8f41a13bfec8f1569399b7984e998f37889cfec4f9d513ed056fbc0045253702f28d583d4ee868e9853e26997cdf08d5b5f462478006576f0b1d88913dae57bc SHA512 a782f47fe7df478305600695adc14263aa17cbbc24c21a52946b907c60aa2397a5533f579a11afab39abd1c08c0421fc0fbd817e16095b02a15613f62a9df54c
 EBUILD gtk+-3.22.19.ebuild 6570 BLAKE2B 595194b0e88c2812b45d9399214eb7a436d7248572a4cb72bd742bc45e4a81e4b7e1aa8dd7eb548d410d3901bb9a439c98a12159125056084b08bcb10da11c33 SHA512 f94a69a2b44d3238211e63cf7f72e335d425b8d8d8577f963831eed39a893d558648bba9c3bae3c202c2d26278a7d124e61cc426ff4837d3c1933e9d70b99686
 EBUILD gtk+-3.22.26.ebuild 6752 BLAKE2B ad8b163360e8b06de6d14617f602c32280c624b0dcb524d3d8a5b1f130400ac2e99d664c1793c8360fd66438969f8d0b228f35d1a0e57ab1632fea6b8089583b SHA512 13acbfc400ba56edf340c159df6043c34fac8f316e565aa0dc594400a1438e8f8f2f814333d1c5d175ffc67180c8dcdeff6f958314f87841322cd7d4f0225c4d
 EBUILD gtk+-3.22.29.ebuild 6745 BLAKE2B 2bfa5e1527c0383bdcfeea71f6630fda658fc74ec4f345b0226c905ea78bee90d06f5eb8180db0e1484721500717cad853155668ba3e5bf9cbd524a669e42985 SHA512 d783eb50a899e9cbaf4b7363c46e3a660783107caf6b119c71ea727df3dfc690766d283e93d57e6747e1178a5dc9a34283d4d1b0456f4b0b1568fa9b631f7438
-EBUILD gtk+-3.22.30.ebuild 6749 BLAKE2B ce3e85dadfa309088872909e51e0341c38a9382df2d5f31b755c0d62cdca49fb3e8b535a8e24bae53f5d573d802c4698a6e50fb214499350e7456a4b5282f544 SHA512 8a7db1cac93daf9a7bd9345689cd6b478eafd7d9b9b692556bc80577cd65ac03ab99087759872a3e5f5da58da85ba8e86a017fcc48ace6ab2e37197701885dc3
+EBUILD gtk+-3.22.30.ebuild 6748 BLAKE2B 1416427d0e4f6ce1d28a4dbcb26b22ef9adae3fcd5e453322fc43f8b619be279850ebee3beed3d7232714f16a08665b228c3dcb98c343e1f6e6ea917f6eedf67 SHA512 6604105f0a30917e8a97f194fd139a76773bda5d798c7744dc741169f4f6f83edf63dba5a7691ac060b12f5876a101681e3c2d266b1ab7b9b9a77b7312f8db2b
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index ea3cd170c69d..e2bdfc934065 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-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"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index 9da8f0d30bfd..81fd2fcbc4ec 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.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/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index f6b48bb9c49e..48316f580d84 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,11 +1,9 @@
 AUX 2.0/gentoo.lang 3910 BLAKE2B 12fac758dc1c8029a87e2cb24e477e7ca037b34d89a6c68281b95f34c993f39c8c47b56c17209d84e9a72a818e930f8c1b89dbe7986530a879293b496504b418 SHA512 245fe194ced813fc1cda732d446664af85a7cd9f4443ba6bec14aacd5b6243428e23100fb6f9099004d20b7e52de9bee14f4017f754c6d915c3db580e0a6f8d2
 AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 BLAKE2B e3276c433d2bb6286ea8f6d5b45fc602a798c0261d12e065e8c5e1ed132f686bba93e450db7aa13a155f09841939733208dbcff9d2517f698536df1b7099b1ac SHA512 1a36c45a067cf999494b14f30d3322aa596343b5f77e54e337a382f6fc9857803cdf2f97a44433e4c055a0dc235fa270d335b6536fc682f0d952f06a2ce44546
 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 1323 BLAKE2B dfb4cb0a4f2321b36570fd33eb4e50f2d1357d6915636591f3833fce85324c88e3d80411629dd290f5eec9c38fcd46022ee29b55f0870108d784f2ade72d7267 SHA512 7b8d8b0edcbff5dec0aaf99ad31553ecd1e0d6b35a6fe8e2889f2325cc6988ba177485d6ae4168135358f2ad9c64663610fcf0c7d58dd4f0628eec8ecb586ebc
-EBUILD gtksourceview-3.24.8.ebuild 1327 BLAKE2B 9529674cf02d832782a27f24dc5d8f7e446f569cb591d4cad96eddb7f3fb2510953c19aadcf0bdabbb20c8d7b19768a44499d60335abff9749b492fd684a307f SHA512 25026157b2e70fdb7787d40320af80187598cdd425ebaeaa8ea398deece79c66e0a1cd190530c06eb7f7711234afed248aff430f6944ca6ca89a63897f1681ba
+EBUILD gtksourceview-3.24.8.ebuild 1324 BLAKE2B 0d65727c1ca86bd5a4b96c9cd759334ac6d54f45e7d20621f83f004ea5c5cf07a269fb26506a01a7f06dad2d37ccb8750071e2884ebcd607d0b2774df704af09 SHA512 897b25d124a481cef5f6b3b6135fb9c01d61f3da1dd2589b594a39ebc9775ce5d9cd9509043abdd1e2030c146aaba4b20adeaee888c53e256affea89bfed1da5
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
deleted file mode 100644
index 51f9cbe9b683..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
index 264ff9c5d555..558aed8c8f02 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
@@ -16,7 +16,7 @@ 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"
+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
diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest
index 9a15e4e04ab5..81d1e88e8693 100644
--- a/x11-libs/libXv/Manifest
+++ b/x11-libs/libXv/Manifest
@@ -1,3 +1,3 @@
 DIST libXv-1.0.11.tar.bz2 317921 BLAKE2B 3c656e1f5cd02c936813b3e10a359d23e7a8643a45ade42ddd584084ba04d09cafbefcc68ab9356b78c1a716a050637062e956c7f50a03a522d28ff7aa31c3b0 SHA512 97cb3ab06cedc87799d06e1affd5cee32ed0e551903fa5c915f79e7ed92eded867e3220b4a663822f7ebd86fdc71b09943b7077d98f1200019992e8d24144e58
-EBUILD libXv-1.0.11-r1.ebuild 551 BLAKE2B 5d00505419d8d0617a2f32c7139d6b8ab32014388b5755551d62c8a2a455d66eee3593ef9702e2261c5aebf4f9a1b99945ec4921b5b1ff185373f550b02e7550 SHA512 0e434f33f798ba36f92757a8846d5854b504a16f237ab1ff81596f619388271525c88bf9f8e3b430387fc0ccaf47a606a48fae071e99c69e47dfc2380786a5a6
+EBUILD libXv-1.0.11-r1.ebuild 550 BLAKE2B 938938bcd662ca3344a8dd885b959682d7c9a2ccde1a52eba2d06f4971cf9348de5a6a842499800b0cab99f5a9fea7a5bbda1615ccc794ef9aba3c55c184e80e SHA512 f647e49a1d73f725bb3ac33ded0d0cf918cf12a367856671ae26287e2f81aba487184efeb99a02c67f1287cf0dee4ce77ff0b149dc5a9650f46792136438566b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXv/libXv-1.0.11-r1.ebuild b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
index 6defba6f7438..5755b4641418 100644
--- a/x11-libs/libXv/libXv-1.0.11-r1.ebuild
+++ b/x11-libs/libXv/libXv-1.0.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xv 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
index 796d5305523e..73bb72b98ae8 100644
--- a/x11-libs/libfm/Manifest
+++ b/x11-libs/libfm/Manifest
@@ -6,4 +6,4 @@ EBUILD libfm-1.2.3-r1.ebuild 3504 BLAKE2B b7c0820ef9de929f94807cfd2ca0767033772f
 EBUILD libfm-1.2.4.ebuild 3721 BLAKE2B 116ce5c067e3f05af89accde41d155d87bbb74b783a0a249b6f571dfca9e614471a8195f1794c92a232d42fdc528bbebc4f62d44164761673decba7ee4710567 SHA512 0e06741bdfcae3b237ad9a90184275b79935885057b8008a06b6a1e862e13edcc6532ff8c6e2f80f0d3ed2c4dc827bbdeaf2b221646b5f342749fce20672793b
 EBUILD libfm-1.2.5.ebuild 3721 BLAKE2B 66ac26f51b4088f142b468ad08fd3eacae2b6a2921fc5dfdabdd561fee47701bc37618f512d8b52e1f795156894044ae9e883701e6fdbaa2522f46858fcc04ff SHA512 cf0c08209691d48837e07954654046e5c5798053989bf0299d6e21e890980cc9fc6bab6e0b5e7b937b2edad1556bca83d4710c2aee9a34dab3a3ef8c43fd4c38
 EBUILD libfm-9999.ebuild 3433 BLAKE2B a9f4c902f98da8f78f14a66cc248f043c34443e417934bcf756d931885163abb2016893b4aa44435f1fb40fa8a331d201ef27641c39e1009ef4368fd42e839f2 SHA512 933f45c173ac3df6493e8b190955cf310e119826dd1fdefddf68f03ba956210cd49115659e7a31f2a816168811b5d0f9f7e74074519e2eea17ecf820875dabde
-MISC metadata.xml 891 BLAKE2B 2acc49a000fa81b6bd7e473c9c21d05174a4cc30cc5fcf75b5a1309a8e8354b034c30b7f4e3a44715c76ef9e557a5ff53fb6f156babdc3c5e34ca2b3cea1eb8d SHA512 de30c6bbfed377885da535958c50c726e8e9b69a10b322b5d228b0aa5031c7601e006d8721c2d12a820960e2208c860bb0d8d97af69f8c88f4e6e34591e643b5
+MISC metadata.xml 774 BLAKE2B caefdee6833d990105f460b981552ead9ccf7e463bc54816c93de770efcaec85ba3e9d6bd43c56fb0ed36736ec7e850a70c57b49d5b3f262b25bac1f3712552e SHA512 025fd60a7244e8cc4040da0f53c47be6437c1d4c1cee5601f25fd54a9b6f294abd8e0c10ef356e6a3a390f8bf773a6a9a17271ba448a686764e75d332119b7d4
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index 0bf4befbb5cf..c15f4076c9c4 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
   <maintainer type="project">
     <email>lxde@gentoo.org</email>
     <name>Gentoo LXDE Project</name>
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index c81629c4103f..09b09a495390 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,10 +1,10 @@
 DIST libva-intel-driver-1.7.3.tar.gz 1648659 BLAKE2B 5d5bf82d02c6e887f4afd332fa395e3044ac9b9bbf8e1682aeaf80d6c61c1db537b27ed22b25e932ec71d9011af07d9008f64df2e7c77a2c6f9dd0e10860d41f SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878
 DIST libva-intel-driver-1.8.3.tar.gz 2591242 BLAKE2B 954ad024ea93073f23045530506c6988cd55bc4bce565856071b30cfc0c10b673a225d4cfdd50cd360a3f828bf236386ba2937e59c260f72717dbdf72a29152c SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990
-DIST libva-intel-driver-2.0.0.tar.gz 2831508 BLAKE2B 3f777303099cac2df3d3d2394af28e086bb4f9b6d595585cedf0d3a4aed79c8ab9d0a132b828d9b56c9bf09526cd6d0a7b9354832464a9ffec7a66aeb939a528 SHA512 2f538d97ae2ea5cbbaa2660c1498a2288b8828ecae914c500f250c25a433a8ee289a9a5beb001b557dd0d84fa3f4bcd8bbe2f23c705caad527080ecca29b933b
 DIST libva-intel-driver-2.1.0.tar.gz 3954965 BLAKE2B 6ff759860477896df6ee433d7b1ff8f3fda498e98210bfcbec33dc663a65bc07b8304ae219885225985fc65a785d7510aacb785a17d9fd66fb1c16a0ca7ffd57 SHA512 2df0d617a4a64ee37641fd9134f8455f59160d003c252b0e82f7be47adaad7d531f9f2f3ab16d75457b2852e8893887d5be6da5f8128e64ffe8311853baf6453
+DIST libva-intel-driver-2.2.0.tar.gz 3966600 BLAKE2B 859bf9a51cabf4736b897bc3189ad20f1d36f9f7ee0acdf828a358e9aaed2d20f4908ad214befbd729f1dbce94d7328018376bc6a2a72e625687e8f8a7131364 SHA512 8843e184c0d4d98a694f4fb1ba692a63795968879257b5f791f9bdf2a32e3d0fe3f9cac46533d78721d91c949063778e97b58bbbc1ba4da95b53b306c04e8e90
 EBUILD libva-intel-driver-1.7.3.ebuild 1412 BLAKE2B 9e985438dd80942d725ef893e8185370a0b4f2d6aac804d5165e058f0c25657bf10e00d57293e19eec5693eba1ce1ddc6b721cd9bbd41cf7772bd7c1d2d11b60 SHA512 82f35982511b9fd6d055333cfb1c0717e4a9e50d8785df0f589ecfb76452b443452264fdf6963241fb2104eb46fe3d074747137301cf43cfaedc6d764b4a4515
 EBUILD libva-intel-driver-1.8.3.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
-EBUILD libva-intel-driver-2.0.0-r1.ebuild 1430 BLAKE2B aabb842fd5b41fd85e00a777c40844756a03e32241a35a7241b5132292e2081c04be9a6f711824ad9bce9b045b6dfc1caa68186510a3fb1af0a750ff43b2fc48 SHA512 096c9b223cb3e0fcc7ef60be7a5120f12e4c8d1ff9cd0bf07724d8789aca82e2adfcc7d450b85026847d72d68d7ea60b0501b3cb87cfa4eaf785c34c22379f6b
 EBUILD libva-intel-driver-2.1.0.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
-EBUILD libva-intel-driver-9999.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
+EBUILD libva-intel-driver-2.2.0.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
+EBUILD libva-intel-driver-9999.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
 MISC metadata.xml 421 BLAKE2B f0188d8af65943438672ecd3ca5fdee0050ede13770668e54ebb99cdecbd816a4888f23939ddd1c0f467a000bb9357114db6d1934159cc808d9c981e849ec4b2 SHA512 ce09ecee2e99fa3a1dbb0ba9d320d39b6ed037cb0e6402bc2ea7762acd9dff09313d087e128e377e9d58558cfbc9374dd96acad2ea427a623a68bf1d972b9dd7
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.2.0.ebuild
index bcc260be80d3..92d13cf8a5b3 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0-r1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.2.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
@@ -7,18 +7,18 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
 inherit autotools-multilib ${SCM}
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
-HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/intel-vaapi-driver-${PV}"
 fi
 
@@ -29,9 +29,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="+drm wayland X"
+IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
 
@@ -48,7 +48,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable drm)
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index a440f5228714..92d13cf8a5b3 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -29,9 +29,9 @@ if [ "${PV%9999}" = "${PV}" ] ; then
 else
 	KEYWORDS=""
 fi
-IUSE="+drm wayland X"
+IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
 
@@ -48,7 +48,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		$(use_enable drm)
 		$(use_enable wayland)
 		$(use_enable X x11)
 	)
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 87c212ad5024..ec175bf0e875 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,10 +1,10 @@
 DIST libva-1.7.3.tar.bz2 824490 BLAKE2B 0579492b700b00e9ed009798e6dcf6dd7fd6cd19e32af9fbab6d780ba83ae3a264dbbfab2633a3458a624fec1935435974875e58a9e57baca9be9cb7ce627488 SHA512 ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
-DIST libva-2.0.0.tar.gz 191311 BLAKE2B 1515c39f9ff12137b07f753101692c71a5bdd3e9a1e00da427d373307277aff950a31038d132902b4554cb290209b1b29038214de3e9d34c545e6d9854267fb7 SHA512 85c47355d95026e88ad443dbfb2e2dc12c37961dbc001fc051f85e8adada46da9a350cf5d2fe20943ca36fe749f49f88f85f8ee1b9fb93d69b32a75f710609d6
 DIST libva-2.1.0.tar.gz 214894 BLAKE2B 0e29d3de915ce44d90ac96bc2ead73725efc34163da92da7d8791547d6ca2fd407319093fee89bce5b26b26818cc0131cc0c7f3cd4f511e3f847e3fd2cf1dff3 SHA512 dd4c901f9c75d03fa45b32af5ca08ba24ef68d354ad26ad53d0f87d3290bee152eed9e61b4dd4116c2d15baf0c74f2d37996d08f007d485c57af5e8d9648eb82
+DIST libva-2.2.0.tar.gz 218971 BLAKE2B c715f5f94cf25bcdf03be9ddeeb390fc073fe3fc7cea324e2f6da9bea490b14a99c41cf5f74d89fa3847c1357297d2c6faa877e76dce470319f532dc76d36f8a SHA512 0b026c99be2600a56833377a1cfd8efb736862dee942576d4d360b9844ace1efb21a2f1b9b1c2fabbbe4a9c483af24e47f31dd07516816acc8fa72e207f8cad4
 EBUILD libva-1.7.3.ebuild 2269 BLAKE2B f26dd1b8cc005a35ee3d1b68dcd96015dcccc7191bd77aa50781669a76b226fc2f7c79ff82a348e895994057b39e322181888306d52706e309eb07f23af0c1e8 SHA512 56c8c0c7f479e5fc0a74245001524ee8e9b99920092f2d80ad6392a4c9eee5d37549bcc05b09470a1f323db8107ddff450d6e07a03daba46269f6686f9699b4e
 EBUILD libva-1.8.3.ebuild 2231 BLAKE2B 28f6d39d8e23fd2714acce8982be6462e7035e3fbcbfc91358533a2387a99af25d0247c413ec336cc22fba607dcbbb8ff8e29af5a5ca47f892311ada74fef7eb SHA512 c5d8cadb64d2952cb7e119d87a2c37c3f809b53e8fd5441d54d07e9264d049b50c5115150fd2112da08d0420af53416b6ed90de18db0c8725b68f9160937fee8
-EBUILD libva-2.0.0.ebuild 2187 BLAKE2B c1830574389a66b6de0f7537a810c7ddb818281bb56958ffb9395022e45e5d02660d9ce94b4bbac1fa1bc92e67a2b4a5c81d5b8e3b7c630929a2803616f62629 SHA512 4748f3b899f06b17911ee1cc4ec9b318084bb28a86f30c89b722f181fcb5b1a9478ba9d6a85ee70f2f3b919832ea7f8e411f815715e29930d1070b0a74df3bc6
 EBUILD libva-2.1.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
+EBUILD libva-2.2.0.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
 EBUILD libva-9999.ebuild 2187 BLAKE2B 598cb516447d1d76919c1f49cae124f6a1a63dc369f065eeab02b8378a851874b8b979aa0828b8736e6f2de538aca8f0ebea7dbc6814fe2442bf91bc2b73423a SHA512 83cf290c8dfd618725f6fe02f12d989f80cad19cbf8c7ddf5a8fd9337e05fa465d58fbec87b4b9e9b8fdba54dc9ea9afbf475817e0343dc78045da405405ec01
 MISC metadata.xml 518 BLAKE2B 2d363f9ee3a690cda208cd96d14003254c0226bb8c396e367d4382107b675fe9f5d0713f826ef611ddb250e3dd919da5e19473f6e10aa59c05e99cd13335e34e SHA512 655f89ce0b04f3d31f02617065baf715a4e6394828b83b18fe12f35a7fa3a626192d9165d2520a5731b98215afea3db4e5b50caf3ed1915be1a707389449a367
diff --git a/x11-libs/libva/libva-2.0.0.ebuild b/x11-libs/libva/libva-2.2.0.ebuild
index 56a848add454..2cfeb67ae2f1 100644
--- a/x11-libs/libva/libva-2.0.0.ebuild
+++ b/x11-libs/libva/libva-2.2.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
@@ -7,7 +7,7 @@ SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SCM=git-r3
 	EGIT_BRANCH=master
-	EGIT_REPO_URI="https://github.com/01org/libva"
+	EGIT_REPO_URI="https://github.com/intel/libva"
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
@@ -18,7 +18,7 @@ HOMEPAGE="https://01.org/linuxmedia/vaapi"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="MIT"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 5fd27cc4369a..ec9d275a2cf9 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,3 +1,3 @@
 DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5a1f05ca0656b03716cdcdbf3172344d600b3b2b646da309ea3e4f04bde1b1279c96b07c493266ec6489935177efbbc SHA512 ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163
-EBUILD libxkbcommon-0.8.0.ebuild 927 BLAKE2B b61005d7c7bf19d47222572da239a90d15ba4d5e1ed3bed32891ed4bcfb5da66a102190630d3f004d33da0ac81aaacc0b1cccfd5d506c312883df275e1beffb3 SHA512 583c890dda84aa07a0ad9a42afde72e57c6ec8a6bcd808dceca9a82aea1e2ce5d8b633eedf8a9539f647eeb108ad8135d0a357efd770c711dd465524abb3a91d
+EBUILD libxkbcommon-0.8.0.ebuild 932 BLAKE2B 98608f210178be94f2406156ee8d67c684d701b5d75d447654dde06f364df6eb74e938516f01141b737ec8897c5a3cec358cd7b18729bcf5b66a75b0369598be SHA512 4f50217c180e8a09a34fa89ce939136f8ef59b6989ba07390b8568f74736ed017754759b7f7e2a7f08dd61191713565e6dff9dcd6b1a5a25e4fa29e7f04ca8ea
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
index 1957a763a86b..d8045057b5c9 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
@@ -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 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
index 5681c408948d..8cde4555f476 100644
--- a/x11-libs/libxshmfence/Manifest
+++ b/x11-libs/libxshmfence/Manifest
@@ -1,3 +1,3 @@
 DIST libxshmfence-1.3.tar.bz2 308644 BLAKE2B 6e1e75fbe9d113cb258eb8f6a5106ea565f6749efd79bd3aa21222514063aadf8499d82d2a14bfcd0a69f7d4c4dce49a5efeb38d54d2019eb0c93345f0ba8a37 SHA512 c446e055f8fac62b9aa266132289a4cfc030282147974c45ce96d1768a98d1afb997470e58e4a68513174c404cbf373bdde2f0cd4b34abdbce1d89dd0b6fe2b7
-EBUILD libxshmfence-1.3-r1.ebuild 426 BLAKE2B 6bdf3a30c37bfa20dd1b0df2b33e07ea683b5c84aa0dc3ba398e0cf6a5dbcb678bf1896e5aed707fb7326655be50fdffd93d1ebf17a75943580397529cca108e SHA512 4b3821f758847c1f19d64464e2b4eae8e20b44ca567e35211daa9efdbf5017eb2300f2fd9574aa5b413c604df143d33f09c6f66636e25e91f7e3560fbd48ce27
+EBUILD libxshmfence-1.3-r1.ebuild 425 BLAKE2B 446547fa16a328a88b5cd30fd39c9fe0ff61f232a3afcd59800ff4f38b83000d325919bf03555a23e65c672498cb9e6857528534e490208a883d6eed2f0849ea SHA512 090c2edf8a99b67eb02c2eeb86062761b187218f1eddad736b0c749651c703fd1fa4e1c5e20e1f37f9414c63d1871b17c001158b304b1295dc8c0f7a4e6c675f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
index 4d71010ce83d..f185fc38d7fd 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Shared memory fences using futexes"
 
-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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1d9674462664..eb259a274b9b 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
 EBUILD qscintilla-2.10.3.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
-EBUILD qscintilla-2.10.4.ebuild 1793 BLAKE2B 1972dde3e7161b985c329e54afeb22f19735af3cf207f506df08329e25b66f6a0bb8048cfafc9777975e0957c9e317af7d48ee6d958bcc54bd4962e6ac14b8b6 SHA512 dc28d37297321c35131e096f47ad972b13e2bd7e8a24f6637890d1b6f1a375438c01ec14dad391775ddbd361faf23e637fff32e64613bda06cbaa44d7f0a29f6
+EBUILD qscintilla-2.10.4.ebuild 1792 BLAKE2B c5bc390ece8a01fc8ed9c709df1f941b3df050b61187d2db6868619435e13757fd2212182999cdf5f927123b4e100ad4ca16d291c5a25124eb74034d06b453bb SHA512 c44765c9c30c4e7ff0f9aca8595605f2620eb8b7a25ef7dad535f51976190a158dc1bb9c0a084e4ba9f3b6ca1c0b466fa18c08b9d74995b0d45e9abc0abc3ee3
 MISC metadata.xml 741 BLAKE2B 0ad895f5e6b73a5a89f527ceea61f323c13ec9329352b84a78982594a2bcdca2bd13bd67f4a4f60f21786cebef6da2bb233718fe0a90376c703de510b25e416f SHA512 393c6b16b403a5f14180ca4b010bd74b62dea7043dabaf463e6995690226105f872556d3df54e0cee1a6dfe2140b033aad25998fc65414e7380f41894201f43a
diff --git a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
index 29852a22c94b..087f92e548df 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="designer doc"
 
 DEPEND="
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
index 95168c328442..39f666ec66ab 100644
--- a/x11-libs/xcb-util-image/Manifest
+++ b/x11-libs/xcb-util-image/Manifest
@@ -1,3 +1,3 @@
 DIST xcb-util-image-0.4.0.tar.bz2 327891 BLAKE2B 022536e7b7410ba1ed129f9efc2ad48fda26d9a69e79e54fe6fd4510df38d1e957289d249dc1a5beb4385116b0808f3282ad496b3f2a246bc6f5762bbe8c7e36 SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f
-EBUILD xcb-util-image-0.4.0-r1.ebuild 930 BLAKE2B 14ea04b689d704b49b002c1bb9c57c4493da9b7a82e65deba42b21c93acd6188d7f3ab749d98a53a403767545241ac949e1dfc46d09a34e81218038977ba9478 SHA512 976ce59cd496cdadcf04bd51d0f89a5faff97729136aa9ca03286706d30bfaeaa6756c5a1132de7e6d4a545cc1e266c61fdb3aeee2d9cf5d52cf94ab8a4424bb
+EBUILD xcb-util-image-0.4.0-r1.ebuild 929 BLAKE2B 4521592db7682c80c0e1ba66b6e352b6c3fe019ed94c9294aa140e187c581ce5476060d8a9ea0958c2ea69de70e37d7ec9b1e4a219db4aa6afbb867b43da0d9a SHA512 e2d4550b64c387e3ddaec57234a45877342e4c37f11c713cd19588e053820240d279789848ae18ff7b2b85745403f69acf002a61432d7e60a51c27f272a3c0c5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
index ab30ac4feefe..ad8310e9b70e 100644
--- a/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/util-image.git"
 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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND="x11-base/xorg-proto