gentoo resync : 02.08.2019

33 files changed, 23 insertions, 389 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index be049f61722e..e27fbbf9551d 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
index 08e091adfa26..ae6e9abbb684 100644
--- a/x11-libs/dnd/Manifest
+++ b/x11-libs/dnd/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile-fix.patch 1139 BLAKE2B b8e6a2e3d7c91eaccde9cb47228a7a810d313e5f0e38fe999451a50078ef86ae66e22dc6df8a2430c1d1e6d4c6b84897f2894158bfddb53325c12ebaba6add50 SHA512 57785cec0adfef150f9560be79cad9f6170c0476060b7653705fc8a2e17e81c93996a4ca1cfa11cece609950e8d4afcae113f2169a6b5d622494c3ae36cd6c26
 AUX dnd-1.1-gentoo.diff 1532 BLAKE2B 5bc035212d46f712b0f8ad016a0fc649f0b36f19674e8c90eec0b2a54a7a6a8e735bfdcf4d4afc0d5792236623a9c43b34775053704e8ad4916488fe55458edb SHA512 68e3fe2a8c36a1b9b8bfdf57ef4eef1e5abb11debd160633cc0d323cf90b1ba579ee87aad82fa8e29b086cbbcfe19326f2202f6191749059cfe638fa7940ec5f
 DIST dnd.1.1.tgz 227598 BLAKE2B 3d6bc4644d492cdfcb9160b87b1c8d2a0f0fa3ae30bfbc948e4327b390f80247c4e4fac562c14972ede2f807e11503d78edc845bac53ad5c5a42ce0439e60c6b SHA512 8644d669ea6553b4e99469f30144286e262fd64379a00b8595d1574d0f4f0e504799ed18979a9036cfc89d74074d325ffca94b4147e350969f3a1c5ff9cf0ff8
-EBUILD dnd-1.1-r3.ebuild 728 BLAKE2B 1c6fb177f6980589586bf555c5b3a8fb18cc8be1975ce0aa183873631b579deca02a42d2c6c145f5908d78f175fa02feec92a107579a4570d48299a2db8870b4 SHA512 88c25042c616bf14a7cabee1b1aedc159293baefa23be450284dce1273b8886fe0a93f983ee8d821915a7e903abb53e8debbbe552a5915916ffa70622a37750b
+EBUILD dnd-1.1-r3.ebuild 724 BLAKE2B 009d9442b6bc5bf5e5589861ca2a4f33d5cd5c1610887ef90c3ff182d4652b408604c6d56e5f7c5ad3609acf719eea65f66eae3c70b64b8beda67313c32ed287 SHA512 c23e686f805989715fadc617ae97fbf8a793ea4b43c7a6e626983261a718aab84789b9921a89f9cc6be617686f9c74b5f0af6bc6ba93d37dd49a5ad886178679
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/dnd/dnd-1.1-r3.ebuild b/x11-libs/dnd/dnd-1.1-r3.ebuild
index 7c2c6d77fb43..3abbc01dae67 100644
--- a/x11-libs/dnd/dnd-1.1-r3.ebuild
+++ b/x11-libs/dnd/dnd-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index 6a9d8430082d..fe9a3026fe64 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,13 +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.10.tar.xz 1422888 BLAKE2B df344049095a354d49474d0ff0ae9d875d1b523452d19f894a3e4615889ab402bf20c4870f4aea7665ea89fd219dc7d441b8b40576e331f90a2d218d4815a45f SHA512 990935ed7c3b10a1659cf22bd36eb71e76088768f7b70234b50465f542592720bb6b206746e0606c96ab99ba0208535fc6073b4f6c0f3427acd0ab5a43420d46
 DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
-DIST gtksourceview-3.24.8.tar.xz 1408964 BLAKE2B e406aa9f776821abfcc87333fc955b4f3ae334f73a8b1dfa0b123067df24bd4f473e326347c99df7dc6c97adbdde8739cb301e45ca70324f6e8de2ce9e1ea973 SHA512 84a02278344f9fe3c1b8f2440c6179feaea53df93061c63023d92bcaa1ec7ff8e95e1f3a463c23d8487c74492469f3dc367bcca3975ef169bf03925ecee7f7ff
 DIST gtksourceview-4.2.0.tar.xz 1410764 BLAKE2B 8f20a762c16a0abc47ff191a2ea4d6b44a397cabee056e98263d0ba59cbc7207ac72341a630aa83fe7855804bd6add77e0d93e706ac9561c9577843f17e00246 SHA512 f2350b1e7042309c01be0feda6059d788a7ef55c4ccd48e16b4c92a71292ed6f92243455ca42aa0950db61de8d68f4a76f4fac46cd46316b690bcef1ea34c641
 EBUILD gtksourceview-2.10.5-r3.ebuild 1371 BLAKE2B 07d773c8d95b87d929fc337d131d3c334a7063be8fd0af0d83631e02e14357aa3f57773f72f86c38b296e73fa8cc91b7d5e873e20041938cd5a214180bad921e SHA512 b4fb25286017d10ed43035293ed1bc7bd5e89b13ed411d3b3d22cfdc551dc2447c0ef21dc0efaf7c3ecb21b1a69c7d9f5dc9f15b78c358005f17987085f6b04f
-EBUILD gtksourceview-3.24.10.ebuild 1302 BLAKE2B a379a8c41d4cdffba099cc17d765ee739d1cf11bf304c09cc762920a184fd51410469a7bb480f11247a0bd56748674dd2098a580ac8d85a8cd4b7e1431da506f SHA512 b92533d806f0ec2afff0a2bad8bc20401d5a8e4dfdf05b4a1263872b5199b773c781b394bc420807ccac279479cb494fd030c54ba825e42117bf224800bcc09b
-EBUILD gtksourceview-3.24.11.ebuild 1298 BLAKE2B a0488686730da6ca378ce426e8ddd590d5f1439d677f3f58d099820e303c01bbe7be536fd3f3587e249dd449f9c9a2cf8de7785c75458c28960e24fa2288cfae SHA512 1a0c41538b5cf82e7b0c45f08d0bb48352aabd859dbdd28ca811db985c40700707d6acb3d6c902827ed8685dd2af7e4501abb7b42c1284668db4ed4787d21b2a
-EBUILD gtksourceview-3.24.8.ebuild 1341 BLAKE2B 394f5dd3f61147fb8ec00df11f9d3b2fffe3bbf6bade00e816509753f842110d1bcab10572b901f1825bd937d05c50e6d3e7a05fc6646dc77a9409cc35dd4291 SHA512 354e3549b4b61259abaa4e8ce5a1f4bc191adee90ba9ad1ca8adb54796d86141f498ecaf35a7839149f2e0804172448a3dac700371951530c9cbff3bd7a6891c
-EBUILD gtksourceview-4.2.0.ebuild 1644 BLAKE2B 2f03e337cf53ca9a5edf31e6b72c71d0a50a4c7655c3df23dfa3b94e94cc164416a842b573718ef0665eab04a7f3b3f3a60ab230ac4c9e2134d8ef873ddb4b50 SHA512 465999a1319f257397373df7a6a75222ecbd14c5ac5ab479c12c0e394d61ca2bd2f0b5ce7729d5bfb3d46e54a79417d2008395b984a09db2da6695b93b998799
+EBUILD gtksourceview-3.24.11.ebuild 1296 BLAKE2B 736ad7b853854ea395d1c57603c0ee8073b5a9c110fd9beb6234053c6109a8602575f5ea1b24a1d5eeb49093e495de849961f3296ca75369033ceb986a7407ea SHA512 083563db470de759fcb8a2e439ff54fe140222d721cdaa8d265d07c4a7df3a5bd1b4e7be594a30f14dd23d6a906c96a1f267213a49dd788ab81978bf53c4c5f1
+EBUILD gtksourceview-4.2.0.ebuild 1643 BLAKE2B b9830dd27e1a6b4bc713e9b0a4dff9f2bf7af6b3e034184b0eaee3a4db71c27182996b4d11f49c88cfd1d90ce4e7aef74a7e814cbaed8c6ae034340597004c3f SHA512 685641cb585b5eb62e555f104392b5951151c15422a49d066dae99086be92da62a0d0a7e868f357d48217e2184fcad096874b540d50eacdd063d61e6cebff963
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
deleted file mode 100644
index e804eb2a6441..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.24.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(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.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 10cc6bf2be8b..56272d5b1ce7 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.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/gtksourceview/gtksourceview-3.24.8.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
deleted file mode 100644
index 6b5b4cdefa25..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-3.24.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/glib-utils
-	>=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-4.2.0.ebuild b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
index f1554c1121fc..3fab679122c3 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.2.0.ebuild
@@ -16,7 +16,7 @@ SLOT="4"
 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/libX11/Manifest b/x11-libs/libX11/Manifest
index 18bf36cb4146..11ecd6942f6b 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,8 +1,3 @@
-AUX libX11-1.1.4-aix-pthread.patch 300 BLAKE2B fbf3b97b3c7e70875b28a6813525435d37ae1aedaf62b0aed499303f60585ed1e3bebf9ca93abe64c8556cff9a96b4591537da02626eef81590968bc4fd35bb9 SHA512 53680a5ffe7ec0892d3e39414ebdffe466c3a98494b164efa5b21939e9e981abea16929da249c6c3a72315ebc3ad297352cc74877d0610d2dd5537f324f0827b
-AUX libX11-1.1.5-solaris.patch 246 BLAKE2B 38bdf941f63ff7ca3adb13af2bc26e1248e41bc84ad47b58db88d63a0994ac4a30841c85a1d9471686fae517f95edbf5f514c7af7b90d79203e1ba72d4c8f1ac SHA512 8f6faa51f5d3cb25f32c9a3ac6ce96140748836cc5d101b5a1202d6d68d45d10401d7a4e45bfc11b9e71872acc96616b180795a7a617491058e1d856e7762878
-AUX libX11-1.1.5-winnt-private.patch 420 BLAKE2B b940d4dbd7d779ea1620ea1b4446edf3fcb49f0e3a3acd43e4d0c1b5dcc3fe2e9a6556171f7d55712e37dfa6dc54d1c2463b872f310629ea24a131f945a55bdd SHA512 71f036f88ab45286826bde20fafaa1eea86aade16d21601e4da0ed935e2a937c6570969e3b173967e1860778c594b0ea08eb905e7c47b67e147d65834905c251
-DIST libX11-1.6.7.tar.bz2 2290260 BLAKE2B d149d3eacdb1cd80de378076dd96bbaa2cf0cf24d4431ed1afbc00f6ff43cb5dbbea01345230e8b06cd05900d77d4771a72e3b8c5ddda69cb25c95f02a58d9ce SHA512 edd2273b9dadbbf90ad8d7b5715db29eb120a5a22ad2595f697e56532cc24b84e358580c00548fa6be8e9d26601a2b2cdab32272c59266709534317abbd05cd5
 DIST libX11-1.6.8.tar.bz2 2395911 BLAKE2B 50f8871d7ff2aee14767085a6cf78e9f6e2b01c5143227089590c86db8006836432cb051d6259893850d78d2daea3332a26885a34f07989b869c14b8ddeefa28 SHA512 1de8e0ec466308bc48946d1ce7a7dc6bd3120b1b365cd01afd1bd51dd7369e3d1870dd379b0b7c5b07699095d59761bd23e2e02ab60929de32c39b6885016e76
-EBUILD libX11-1.6.7.ebuild 1287 BLAKE2B 82da20e7f5c237b6b98dbac3075ed9aaa57ff094adfe0fc35ab6f8dafad0a97885869525c45884958d1cd0891b4afaad3aa3c921374533a1bca3319cf0caeac5 SHA512 6f8f758a1f1b01d7b1858a19c17647805f9c67c453def0c1e3d1a108a9b070c3397a442a9616447701a5933685d9efcbb4a04e4d78faa86708f30089c40c8396
-EBUILD libX11-1.6.8.ebuild 662 BLAKE2B 77d6e70327ec63320be890670c68d3430c6054efa3d333822df82a5382ed79cbe6ac218c4124743263544e84dd6834b78980bddb145b24700d81fb392d36aa27 SHA512 b08048aa0b31e67127b83b84f4cf9ec4ded5a9f7d96ba93a64aa132fe080b1eb596ce73547024fa3511c4439c202fa35e015bbffb53b8d98bfc5b01b92684e78
+EBUILD libX11-1.6.8.ebuild 660 BLAKE2B c7aeec4439b9e54ee7ac99849c2337cabf7b2ce8b83738f6925b22c3f98e3d7b33af0ea883c337302743204a8d3198837530a72e6858d2482356f33627c36a9a SHA512 078bf5aa6955f5e10be5ef7bd86ba87dd0c6cc23c02358e9ff8705f2f56e05571dc79ba154f350b13a614793c7a4dcde4ae4754d7226de5b840d5a4a2126d4ab
 MISC metadata.xml 311 BLAKE2B 1e5deaa311245a5794e72574f94028f60c1c712a06820551cae811b113d633816a60fd3920ff5f2ca287558dbcff28e57537d5c0d3ee3a325c7540bc0b98da13 SHA512 760d09a1ed93bf16d8e26a70fa1178c02c6b336dff9aa29f900d5eff305686b9c3fae4bc93bcce58c0427f567d3759dd3a8adcd8707d07fdd90c6db79d4e13f2
diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
deleted file mode 100644
index c854e0b4080d..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-07-21 15:48:33 +0200
-+++ configure.ac	2008-07-21 15:49:23 +0200
-@@ -198,6 +198,8 @@
-         XTHREADLIB="-pthread" ;;
-     solaris*)
- 	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
-+    aix*)
-+	XTHREAD_CFLAGS="-pthread" ;;
-     esac
- fi
- AC_SUBST(XTHREADLIB)
diff --git a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
deleted file mode 100644
index a7926a53d78b..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-wchar_t is defined in /usr/include/stddef.h on Solaris
-
---- include/X11/Xlib.h
-+++ include/X11/Xlib.h
-@@ -71,7 +71,7 @@
- #endif
- #endif
- 
--#ifndef X_WCHAR
-+#if !defined(X_WCHAR) || defined(__sun__)
- #include <stddef.h>
- #else
- #ifdef __UNIXOS2__
diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
deleted file mode 100644
index 4539f111faf1..000000000000
--- a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h
---- libX11-1.1.5/src/xlibi18n/Ximint.h	2009-01-16 10:14:37 +0100
-+++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h	2009-01-16 09:39:48 +0100
-@@ -37,6 +37,9 @@
- 
- #include <stdio.h>
- #include <X11/Xutil.h>
-+#ifdef WIN32
-+# include <X11/Xwindows.h>
-+#endif
- 
- #define Public /**/
- #define Private static
diff --git a/x11-libs/libX11/libX11-1.6.7.ebuild b/x11-libs/libX11/libX11-1.6.7.ebuild
deleted file mode 100644
index 583aef14eef0..000000000000
--- a/x11-libs/libX11/libX11-1.6.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="ipv6 test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-libs/xtrans"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
-	"${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
-	"${FILESDIR}"/${PN}-1.1.5-solaris.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-	)
-
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
-	xorg-2_src_configure
-}
-
-multilib_src_compile() {
-	if tc-is-cross-compiler; then
-		# Make sure the build-time tool "makekeys" uses build settings.
-		tc-export_build_env BUILD_CC
-		emake -C src/util \
-			CC="${BUILD_CC}" \
-			CFLAGS="${BUILD_CFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			clean all
-	fi
-
-	default
-}
diff --git a/x11-libs/libX11/libX11-1.6.8.ebuild b/x11-libs/libX11/libX11-1.6.8.ebuild
index 2826e685814a..378e2f72aa92 100644
--- a/x11-libs/libX11/libX11-1.6.8.ebuild
+++ b/x11-libs/libX11/libX11-1.6.8.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index 009231bb9cd0..5f63bd36a246 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,5 +1,3 @@
 DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-DIST libXi-1.7.9.tar.bz2 486312 BLAKE2B 2dae307168431ed0a629ee1be1fa0f93732105452be822bc9cf54cc0863286306c2bdda67c16bb7ed92d63d669f884a4a67ae67ffcc7c170f91848039d470c0b SHA512 9f1536944fcd232ba725addbc3afb1154c4e0df3c4380f4a54bada31371029ce3714fe0458529cd6b2787e3283f3bd35366420bca15fedfbd41f2f6b10eddce5
-EBUILD libXi-1.7.10.ebuild 758 BLAKE2B 487822f2f637a5a2681411365af3078b2ab7bfb6bdd374f44289923c1ae84411125a13877d2997bec5f8ae088491d94853d3ee3901a39ff5fe1af8a1b7fc162c SHA512 7a2365ff0e5169126cdcba0c9c4f73e9bee85e9e862138e6acea9b701ae68382f8dca3e536e2cddeba0d6338e18feedc0cc63c25656a5a5906d0c820ea55821c
-EBUILD libXi-1.7.9-r1.ebuild 783 BLAKE2B d94b72e1fcd97ecbe865e5e4afeb2d11ad66d84f29c35a3159c73a816b66855e1037947c985ac57fe01b7ac555720492c0012cf5599b904840149a9de699f356 SHA512 2ec5e1467eb55105c367f49a90a182c6ed3a08aa7d8d4375b7815a5cfab6f3d6da39ac05668dfca05ead845ab553589c42862fb0f5a5e5b90921992bbaeec403
+EBUILD libXi-1.7.10.ebuild 756 BLAKE2B 221fa1dd86c5f5f9e26bedb093b393017913d7b9ca2824624091c77bb19a47380fe4e3db4fe57d3b9acde5f1f64d35ec30995e31a83a026e7c1f5dcde2fcd940 SHA512 bd7aec0591e9b994a4fe4f7b7e25684385028fce8857f01b5a4b0877f94daabfb4495bb6758dad9c4d7b34d0e53edd77c91968b7ec11465e0c7bf520bf1b661f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
index 50be0ca18cc4..1d09b6065486 100644
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ b/x11-libs/libXi/libXi-1.7.10.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
 inherit xorg-3
 
 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 ~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"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-libs/libXi/libXi-1.7.9-r1.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
deleted file mode 100644
index d9480e375ab8..000000000000
--- a/x11-libs/libXi/libXi-1.7.9-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable doc specs)
-		$(use_with doc xmlto)
-		$(use_with doc asciidoc)
-		--without-fop
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index c4f7f8216d54..efffc5b9f8c8 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,3 @@
-DIST libXt-1.1.5.tar.bz2 771567 BLAKE2B c3624f1ab81fdace1b2eef8749807e9a2157ec6f60e2f5f8b463aae088057d4eb82f9c6de547e286798b98f68be8f8097ff291b490baf49a4204e62566c1a9c4 SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b
 DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
-EBUILD libXt-1.1.5-r1.ebuild 752 BLAKE2B 3a7dc7462b012c6f8a75d3fa7d23351da7291eaf8ab5613d9e72fbf8e150696f02b6717f891b471ceee17562e09c57545ba0e4d2614f824a3b4959c10d2b03e6 SHA512 1851a262d4f32042bcf76ac7d1994b8b4c78de8c966a408000fcebf068be0261821980338d04b180ad3c65965fb33c267f30d37eb9dde2e434e80b9be346936a
-EBUILD libXt-1.2.0.ebuild 853 BLAKE2B 9eb986f397ede6bb2424a13ed8e4807f06d3aea1fc25b25db1d9642e37645b0d8108056b228454d251b8da249f73c90d3c36c3ca5ed691be27f50d715d8acd83 SHA512 3354972e0fae459bc35341135fe0ca7e92813651f7117c03c3d7a8c105c99a4d1c7fcd6fa296eb91bdf4cd248a91be9129ef834b59ad7d293dc7403b4b5e2d6f
+EBUILD libXt-1.2.0.ebuild 851 BLAKE2B 2a0fc36cd9a345317d340c91b868cf48adb6785a835e5280c835c64c28ffe215b9a36cfd64da40565f7b34814f60edd40bf4341c2382aaa92796b4c2b1c609e0 SHA512 9f25690a9b29173c7c017f054a55030658bef159c0d712f7ab723e8c2350d914ce25e0bc716e015715044f1240ea4106c60af21a606cc770444d9fa7028efc59
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXt/libXt-1.1.5-r1.ebuild b/x11-libs/libXt/libXt-1.1.5-r1.ebuild
deleted file mode 100644
index 1a1ba3b20e4d..000000000000
--- a/x11-libs/libXt/libXt-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="test"
-
-RDEPEND="x11-base/xorg-proto
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/glib )"
-
-src_configure() {
-	tc-export_build_env
-	xorg-2_src_configure
-}
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
index 757133c25d11..c12e5e220c51 100644
--- a/x11-libs/libXt/libXt-1.2.0.ebuild
+++ b/x11-libs/libXt/libXt-1.2.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org X Toolkit Intrinsics library"
 
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="test"
 
 RDEPEND="
diff --git a/x11-libs/libdlo/Manifest b/x11-libs/libdlo/Manifest
index 146c33048af0..0849c466d9f9 100644
--- a/x11-libs/libdlo/Manifest
+++ b/x11-libs/libdlo/Manifest
@@ -1,5 +1,4 @@
 AUX disable-testprogram.patch 832 BLAKE2B d0658618b0042f51e0f85efbff77933e62efc2acf571bbc539f908a771d290834d5b60f3840cac317d56f378f0c3b1c457fb966782df417d8d3af33c6dee88c5 SHA512 b07a0ddd5eca10f13e82039690c3d310981cdafebc38a9e632a55be38c5c8ff22b7dddffcf0ab0f9795e650e61f9079ff1d9c12b3ddaad8d018f060c377aecd3
 DIST libdlo-0.1.2.tar.gz 476865 BLAKE2B b2391b58046e1f403b7e0d1eb915a46aa17c47e8ad804246f12f3b94f9ffb4dbc811e5d08aac29c2f4196b5d384e7244bddad3193adff5d5e890a7463a503fbb SHA512 6df69bebcf3142e0a87f66bb9d690fd78b96e08c2ae5d46fe0f3d91bc135364d5f5dd0c3a481705c3cd90c78a0a076757220fbcc3b0ad4343cdddb54501e3f2f
 EBUILD libdlo-0.1.2-r1.ebuild 1152 BLAKE2B 343b0c53c6039c61951c3f9579b02f92a24e0ca89894ca542219cbc72606eafa6345403fd14ec45de7ce246de9168cb2bb552a2ad172b8cf02030a7b79d99420 SHA512 0b4457a6ca89b41d242fd2fd497e3fa7ea361e62540c6d6c44611162e01bb7b2405ecb0a073ab31ecf8cf6987a0f4ec98779256c962e8f8f05a74f5505c0e414
-EBUILD libdlo-0.1.2.ebuild 1156 BLAKE2B 365edc96e982b7117522e2e7c7a919df0902cde231cc4a2620251267f9099668ac5686c735588e6ce144a5cc1098466f722a09914ba43e209056009d48db7633 SHA512 15ad7c1e7169480830b882f5172d3f70a941b707d8f62578ef036873b42649b85c1db2a36d06b8c58b37135834fe3720c0fb1695b01b44195280ccb0b824abc4
 MISC metadata.xml 807 BLAKE2B 84e05485afa5f0e78ea57310124a541c4f1855c36ae9b49568fa9a4d672484e6fe5d02b71e4325c3a07cf5edda074b02410c4b7b52a967840bb695b98e135546 SHA512 56c18fe35f8c672f9d694fc2c62ffd864774baeeeb9cfd8f75118cf7e51376ee7a4280933d53aa5ed5e85dd605ecca737a70a37c4b82b7293bc2963d250a4c96
diff --git a/x11-libs/libdlo/libdlo-0.1.2.ebuild b/x11-libs/libdlo/libdlo-0.1.2.ebuild
deleted file mode 100644
index cf803d91d789..000000000000
--- a/x11-libs/libdlo/libdlo-0.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A fully open source driver which supports all DisplayLink devices"
-HOMEPAGE="https://libdlo.freedesktop.org/wiki/"
-SRC_URI="https://people.freedesktop.org/~berniet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test-program"
-
-RDEPEND="virtual/libusb:0="
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS" "ChangeLog" "Guide-v104.pdf" "README" )
-
-src_prepare() {
-	default
-
-	# AM_PROG_AR must be defined or automake will fail with:
-	# archiver requires 'AM_PROG_AR' in 'configure.ac'.
-	sed -i -e '/AC_PROG_CC/a AM_PROG_AR' configure.ac || die
-
-	# Only build the Displaylink test program, if a user wants it.
-	if ! use test-program; then
-		eapply "${FILESDIR}"/disable-testprogram.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Rename the Displaylink test program to an useful name
-	if use test-program; then
-		mv "${D}"/usr/bin/test1 "${D}"/usr/bin/displaylink-test || die
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index 99f5205fee99..e50c51d108a2 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -3,5 +3,5 @@ DIST libpciaccess-0.15.tar.bz2 366454 BLAKE2B 8a17a7178e735b17e726fd0fd02235e905
 DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1
 EBUILD libpciaccess-0.14.ebuild 855 BLAKE2B 6f82647d77e4b7c50c337f62fa9f86502874884f15876ddc96b285795ed47c10e61f4a89c3b4b5c96f650771a4a72c3a102b86e75a019339496ad45ff17368b7 SHA512 e70c8a94f594c533f5db7f6d5fcbac620be6d9207f8a6f3516b10e2184dce3aac6347416e02816c781bb4c44823b4c7cdd51d6a68eef31cdf641ae12f8ac0260
 EBUILD libpciaccess-0.15.ebuild 844 BLAKE2B 036d8d8b1cd979d49140f9a01261f62654f9a8d2386bc84ea756c76c5580f16a743e516b439d74030a639d6f370e2512f6eb7bb2c2d066522aa8be1066325aae SHA512 91b64a5598451871e3fecdb293b290d05f20453ff5c8156d0f219156c4847001f8976066fd2cceb5abda6ae3915ba7aff394e9822de46d2b2904706bca401a8e
-EBUILD libpciaccess-0.16.ebuild 844 BLAKE2B 036d8d8b1cd979d49140f9a01261f62654f9a8d2386bc84ea756c76c5580f16a743e516b439d74030a639d6f370e2512f6eb7bb2c2d066522aa8be1066325aae SHA512 91b64a5598451871e3fecdb293b290d05f20453ff5c8156d0f219156c4847001f8976066fd2cceb5abda6ae3915ba7aff394e9822de46d2b2904706bca401a8e
+EBUILD libpciaccess-0.16.ebuild 844 BLAKE2B 6a1381d6e6ebfb92c86ba54ec5832c3dec381c43bed3551055507142fab0621c6aa7c3c63da372b2fc8409be652866c91878f1155faf0206c802f3fb10f25293 SHA512 34b5bcb529549e8c9e182fb7eebcc784b424f6a490c52fcf058414e12d826ce4c6b18ef694a13d1b98ebc5f076df4501409b6fb2d8517488790da3c6fa54718d
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 553bc41bb9ba..e7e2b9647f10 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -27,6 +27,6 @@ multilib_src_install() {
 
 	if multilib_is_native_abi; then
 		dodir /usr/bin
-		${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+		/bin/sh libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
 	fi
 }
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index f6697e6570ed..4556aa2ec2b1 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -4,6 +4,5 @@ AUX libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch 772 BLAKE2B 69265c1
 AUX libva-vdpau-driver-0.7.4-libvdpau-0.8.patch 446 BLAKE2B 3fd96d388be5d55541a3c15a7eac4248d4dd4601a0d116abc09dd1383b407f926a86e448e470617f65ba3f303a4f8421efee97fd6593419e60e3960a5bb6598a SHA512 49555a2efb0b8a49e2dcf942d97c4b862f67e22947adcad2694bc3ee7f94d2e784dddba474e097e0c2f6575afb7ecf5041d2c95ebc8573ca9e3f5bb641fb6cab
 AUX libva-vdpau-driver-0.7.4-sigfpe-crash.patch 742 BLAKE2B c1e3a3af09c0c121747b0da28cb256ab4f9783254349be6accad512b7c4872065909bb6701ff0bee07c04e8c7ed34b93a7f6e50b964a1207501209d75f70d26b SHA512 f56d7e64bfc36f0c54eb5bef8fec3ce0b3efcbcec3fbb4dcda599fb4d553f2ee494a87b8b8a7a1c642598dcca385872b68b612b31f965eb1c943123e75630ccc
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 BLAKE2B b9cd0bbbe1e638ad29363cd0d8c6452de222023017283ce81f138730c7ba3396f3ffca40478746cab4b93a8855e73de405aa783e44e6c1179c5e347bd7eff657 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094
-EBUILD libva-vdpau-driver-0.7.4-r4.ebuild 1131 BLAKE2B 4e07ca091e60a04ebf2d3dbfdf4adf572f37fd8c990814e939ed6ed62f986fada773947a0ed9fe8fa0e35034a2f08ef89965bf08208b3cdfae4496012cfd9b17 SHA512 869c76363f55138f35f01e9ce2c051d4f46d53263a759cac286dbd3a1028457793c5c234eefbb7909f7af9b4eb5e36ad2d6c6f4cb3fef32ba8bffd86dad881b3
-EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1203 BLAKE2B beb2404fc3f104417100252c216f77921f92bd259b6e3c990b48507100818b407e4a2d8490345221b5cff9fa3cf97d523ec6d6c25e024db9327939a58b92778e SHA512 daaadf8d1073630cd86f26a25a347f7b898517f1c1b34188fc7a0248a33539e3622b6d8b58dc2377e68b5a48324fac886cf61097485a523a65b37fd3a1949b89
+EBUILD libva-vdpau-driver-0.7.4-r5.ebuild 1202 BLAKE2B ca4e6a9cff0490739885a7c4eaa0274f3061903abec0583e6ac9f0a04c73d1d39d6641b3560a4cfd547c4b37d0ceae4f3cdea99aa32b62d8fb1ae141e8f8b95f SHA512 96be908983cb395f53f5314f839b331b05c15c2d43c22d7bc4559be420c98866d04fbc966131aadec59eff5a850c811041894f78d3ce9e57d3316a707c7890eb
 MISC metadata.xml 354 BLAKE2B d83783f14cc4b4e0c43c6fc50fc3324a8b1fc19af5457bfdaa48ce3ade989764d06a4a12702aaaddbf292900903896813beb30fe4506e3e8029d966c446880fd SHA512 99a9dd9651a16776c22ce528709e588a956d4b20d305392054b3c65e59bbd1ef855c2e916f2458cfda9797efa2570ac0ed706ca20d1df2f878435c6f4f6ca2cd
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
deleted file mode 100644
index b316dddbdf9e..000000000000
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib eutils
-
-DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="debug opengl"
-
-RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	>=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
-	!x11-libs/vdpau-video"
-
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-DOCS=( NEWS README AUTHORS )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-glext-missing-definition.patch \
-		"${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
-		"${FILESDIR}"/${P}-libvdpau-0.8.patch
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable opengl glx)
-	)
-	autotools-utils_src_configure
-}
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
index 04300f7f7b70..ddb4845f3a42 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="debug opengl"
 
 RDEPEND=">=x11-libs/libva-1.2.1-r1:=[X,opengl?,${MULTILIB_USEDEP}]
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index 260114961632..08cf40de4ec9 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,5 +1,5 @@
 AUX Mwm.defaults 536 BLAKE2B 675abf74eaa86c9b8f1f9730c3216d06239a6e67cd3657245b4c4095a5e1fc552a0c9c59cd72d3537de71e7f26d10bca87c7d34723e5514890c7a044aa2674b2 SHA512 ef121001e0a124fdea20a2b573ad79a68f23bf4f73c33097e8acc62fa00fd28311d999893b37514be33bceee1d2a22a5b03a02b75b2c02049131c8fedb3e02ab
 DIST motif-2.3.6-patches-2.tar.xz 1600 BLAKE2B 03ef74773c581d09ad89f35f26e9d01ed01ec8b40344cd4d6aba106de80bfe0ce69d65551aafb4c53daf61cc31d1e703c9762c2b4a60729c73783b649a00e6c3 SHA512 09c857f7f2ec0d48660e6fff8afddec99416084e2b80a8793401e7641a3669fbe4eb10811e60f3d9dc106c828a87324dfdd27cc91a62bf3dedbd9154542c7619
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
-EBUILD motif-2.3.8-r1.ebuild 3385 BLAKE2B 0487bb112f7d09200616fece15fe4585f7116d921166fbc7aef7495da79a1b3b780f6407389d8da803a7d10b3e9ebc81f4410247da7b0449f6bf51c30a7990ae SHA512 774eb916f5f71b4345e850b45983f03ea0ad26e8c015716a26701962731bc45e28b539afb5ac72af22a4340fefd12ad86abd269f4c51004eab545e858d11ac10
+EBUILD motif-2.3.8-r1.ebuild 3384 BLAKE2B de3162774006b1bbadafe94f4bbd5b1d1b172b2087d5b6c888b03a8baee9ec65af67355d845385e76797eae1246dc8235c15c0bcbc532c4f3ac601a477c08196 SHA512 6cc2daf8e9f7c787facb0b44675f2c713f05cbb9a358219afd0f6002af9cb23b65b48a22ec668c10b456e29f01d8601b687858fe9f04994c4e3e40ceb207f475
 MISC metadata.xml 394 BLAKE2B 8302e867353fbe09f017b4d54ec2ad043f8872643914ef29002611b41f4f1c0639959da9c7e06b4317c8fec4d0a5fba72cc3927991054a65a1d42a1f4fb9da17 SHA512 5a2fd548df5d694acb6c1bf1d51c8e80adb49915d4328879478a6b7c5a76cfbf02f31e58103967bab2c4afd4873752ffafd9f8f0839f68d09868d7f501542d3c
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index f069601e6a03..f5478550c05e 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.t
 
 LICENSE="LGPL-2.1+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
 
 RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
index 19a4368472fc..5635e7d447ec 100644
--- a/x11-libs/neXtaw/Manifest
+++ b/x11-libs/neXtaw/Manifest
@@ -1,3 +1,3 @@
 DIST neXtaw-0.15.1.tar.gz 577459 BLAKE2B c38e8fe482bf0f51a2f387ab76d62666778d569982e153dbe32988d557dad91876122cfe4d0e8940e5c1d8ca7a8a3af09c09631b8ed656bd6a11db21d16ae331 SHA512 5250b2ac6fc746b8de19d0c2504e6c21e0b6c6ac4ef1a841a9793a2fd2dff082b86a987f54f68e0e35ed8f798900a701e6fd9c6cf7b1412a4bd53179fd07cbf1
-EBUILD neXtaw-0.15.1-r3.ebuild 739 BLAKE2B a7e92358f276f85a740067483cf8564fbb53a5992db8edab7da434ebfc9d9a78857c2ed5954c338e11fa505015b952108986680f73eaa741b4ec3d45bbe3fc15 SHA512 117919d141a9745d2e1c37c912990b2c4896bb22a83886424efaad74a1ab11c79c0740b386f7a6875299fe3a4e1f9ab74f373921eaae70ee88cad50f7f9a8f76
+EBUILD neXtaw-0.15.1-r3.ebuild 738 BLAKE2B a0ab1208494f5766504b626a52f4b1aa9c65a58d19acc62ce2e43c331e9825dce5763f383630ff5b0cb9457cc93e7d044f64920951634b9a1bf01ea75b5b11e6 SHA512 180ad9afab6672d5095b3ed8874bf9cbaf9d99ae0116495ad9e02eab261fce8f9faa079b6a430c13f073744926a8f0a6acb752a4ed7ab095aa611f195a43ebf3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
index 158f386e9c36..bda42cb10d4b 100644
--- a/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r3.ebuild
@@ -9,7 +9,7 @@ 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"
+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
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index b318051a5bc6..d4b99a1a1552 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,6 @@
 DIST qtermwidget-0.14.1.tar.xz 178952 BLAKE2B ae266dedc717da7de0b74c4fed2e89c6047f3d8d7e70c553ed5150ba8507e0b634978304105843009069240e09aabf153288a6c86e9874f9043b63f85f12d3d1 SHA512 6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410
 DIST qtermwidget-0.9.0.tar.xz 166976 BLAKE2B 5f3f56168e21dbf9a5039784fbb42682b5422fc919c3f30c4240acdff23b57dd7f850eb37bba96a50ae18f9b2594dd3ccdde173d3cf002e39611f67085cc9e0c SHA512 fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc
-EBUILD qtermwidget-0.14.1.ebuild 652 BLAKE2B 1b097362bcce211e135074202a0161b96ec0681b6641be70ab7dc55ac863034699b7e7ed4020638b481ddb717262cb5f9873a968cc20b78513ab723ead86ef39 SHA512 37669bc3a93eddfddf62afe8b695a0ad29d45344d6cedaf0f6963500702c8de7e040fe17999e27bf6dbefdf1b66f4210d25b77102e53295e7907566e0e439912
+EBUILD qtermwidget-0.14.1.ebuild 651 BLAKE2B 1fbee7fc1e38c8ab0fd87d65f97acc0aeece53b3e58fb86ad2526caa0e6b3e36ac85b03311cf0a979ede23136119665abaef7aa213fcfb77507411be34e0880c SHA512 b8205f0a2f32c1c329a615b9cd298ec25cc3e6816adf4be93a46d0f2e6ca711fea60d21383ce49d0e037c55a1cc782d5761f448da0874cc99dc7c57250997e9e
 EBUILD qtermwidget-0.9.0.ebuild 726 BLAKE2B 96165db397eba5e17a6533539c4aa869a8d633cc77ce3d0c3e726c4372b3f4cd065316a8e3d39fdcca121c4d505f2aca92baf3c1e0c82012d467bf8d42e35f8b SHA512 b4e10cfb5c5fce50c63256cddc22f6b33de0227884c01d8af21a47053d3ebd434fbf57f5f10bd40af60f2aa1eca7ddb01257adf09c3162280dd77342c416c097
 EBUILD qtermwidget-9999.ebuild 623 BLAKE2B f387d0f3a47afac376cd5661718a61155b0943aa57776d286e279f629151748cd268ed87a75ddfca4c063d33c614c3293a2660b11b1bc812881d2fad7606bd87 SHA512 d335773a0d9aed1322a68bcf7bb0373013e6a49021d406212595c60aaec39244945e31727354c5997a448dfa734cf7470b878aacad22eb21bf074bfe4fb71856
 MISC metadata.xml 602 BLAKE2B fb54623b5c5e38a3eda61f4bc5f116c6da5f7f58dff1a65b2b43b3b4c5f8596ec4fbf4fb93e1705b4d97a5231fe75d23aa1705308523ef125ea81933ed3cad72 SHA512 30175f7c45f4102fdb38223065d4e143bebc2ecef84e2e148900d8510c9c393d8feb7d6787f9593b90f1e4054b5016444e02f17c6a8a51082e7b8cb8294d9d31
diff --git a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
index 0300aff607a4..a4f168095b5b 100644
--- a/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="BSD GPL-2 LGPL-2+"