gentoo resync : 05.01.2018

16 files changed, 78 insertions, 110 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 0c8cf12ddb90..335cc3c1b32f 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index b970c13eae5b..024a32975dd8 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,3 @@
-DIST libXcursor-1.1.14.tar.bz2 311896 BLAKE2B 0317ffab4b69de9bf973c15dd81b48bda0e2226953e0f711eb4ac6d487fe75d08873e3392f99ba1478ab99eef43fcbcf319c907535db5e801a4f3e2bd01a71ae SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6
 DIST libXcursor-1.1.15.tar.bz2 331607 BLAKE2B e39179902bf0a7c1b8c32f8c5fe856b51113a0c7fe98158f04d019df4737afb7d42b02ea509df66753d128c38c68dc976b2dfad8f6c8899002ecce9396fc4d8d SHA512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5
-EBUILD libXcursor-1.1.14.ebuild 909 BLAKE2B 7d2f560dca312c2ae4ab301d7a175adc9955000ca386eb2a0dd92e6d19118400712523fa30500d79e70cc487cfab9620bb80536db26cc098e73a0015ebaa63e8 SHA512 eb5fad96a13c3791257ca3a28708a81bc28ea43b33fefc9446b91b313aac2901090cb549a087f882da71b29da0f0cdfb1cd84371a6e0408066d6639d45018908
 EBUILD libXcursor-1.1.15.ebuild 909 BLAKE2B 7d2f560dca312c2ae4ab301d7a175adc9955000ca386eb2a0dd92e6d19118400712523fa30500d79e70cc487cfab9620bb80536db26cc098e73a0015ebaa63e8 SHA512 eb5fad96a13c3791257ca3a28708a81bc28ea43b33fefc9446b91b313aac2901090cb549a087f882da71b29da0f0cdfb1cd84371a6e0408066d6639d45018908
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
deleted file mode 100644
index d929b596bba2..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org Xcursor 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=""
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-icondir=/usr/share/cursors/xorg-x11
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index 7df6d79c8f4c..379edd3e8653 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -1,5 +1,3 @@
-DIST libXfont-1.5.3.tar.bz2 519793 BLAKE2B 1c0ea6d7b14b838445239612adc18927a098905929da69978339da6dc1dbbedefefeb92028b8d704ee16c2061e2ea73bfedb3be3a7faf046ba44ec9cdd739d56 SHA512 e7c8a09c4d174129e5d550194d3c3dc2b4abf797e52fe588c6002920727c52cf33b7db8d07fc69c2987e766d3af2d6ddda72f0c70eb21b135c691c97656a81b4
 DIST libXfont-1.5.4.tar.bz2 528883 BLAKE2B d94a91dfa64e6b78bb4cb7f5ce59300b1cf31826308f3b3d29d495e166403ef57ddb8467033c08ea2b7a4fb0b160d25380f49aed79cd6b72a305eab07a0be25a SHA512 864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3
-EBUILD libXfont-1.5.3.ebuild 868 BLAKE2B 91e94121579fe06d3b12217efe04ab8db60176ec8543ed4363f3e851d520cad2e9c8838d874b56009ddec26ccdc1400f21955266763b323c52c86b52cd8547ea SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f
 EBUILD libXfont-1.5.4.ebuild 868 BLAKE2B 91e94121579fe06d3b12217efe04ab8db60176ec8543ed4363f3e851d520cad2e9c8838d874b56009ddec26ccdc1400f21955266763b323c52c86b52cd8547ea SHA512 bf29ce3df705a3ac6072722c520da24b838cc93577267a27491f1121ca2aa6bec548f1cdb50c92ceb93ffdc12b3914df92139a7839ca19a4ebd20cd8eaef698f
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont/libXfont-1.5.3.ebuild b/x11-libs/libXfont/libXfont-1.5.3.ebuild
deleted file mode 100644
index f54a49c17cf5..000000000000
--- a/x11-libs/libXfont/libXfont-1.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 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="x11-libs/xtrans
-	x11-libs/libfontenc
-	sys-libs/zlib
-	truetype? ( >=media-libs/freetype-2 )
-	bzip2? ( app-arch/bzip2 )
-	x11-proto/xproto
-	>=x11-proto/fontsproto-2.1.3
-	!<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/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 8ca964430bd5..099151328e16 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,6 +1,4 @@
-DIST libXfont2-2.0.2.tar.bz2 476173 BLAKE2B 12a6e4b8e475d35866507e8dcf622b2727f64658cecc8e819f1d5443de6be2bd26f57588ec21dcb725b9e2e7f550800e672a5c120937cde5304a2b81758f6903 SHA512 d62b0c3d663a2c668796cca8c6c2a90f83feeae1253b7d946668d33502cd8099c963285b88db4f745efb0d4ff783c118eb3d84cb8e6e1724586e1ef2be23e593
 DIST libXfont2-2.0.3.tar.bz2 497085 BLAKE2B 91780c245d5e08b45fca6e940b0fe910b43417b2bed77fa600e0b8ab2b2c5a423b8a1c680349b95592a77f5bac45b1f5a7991d05df699aad080e8c3cf4d614cf SHA512 648b664e2aa58cbc7366a1b05873aa06bd4a38060f64085783043388244af8ceced77b29a22c3ac8b6d34cd226e093bbbcc785ea1748ea65720fe7ea05b4b44b
-EBUILD libXfont2-2.0.2.ebuild 833 BLAKE2B d470192afccde65732e1605b745c2c6eb1e3f322da11dd2ebf37e4ddbad28cc0beb5f42d94c5ff9eed97a6f24483ef8bc9c1c47fa0ed74bcb17cd16abc0d2880 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd
 EBUILD libXfont2-2.0.3.ebuild 833 BLAKE2B d470192afccde65732e1605b745c2c6eb1e3f322da11dd2ebf37e4ddbad28cc0beb5f42d94c5ff9eed97a6f24483ef8bc9c1c47fa0ed74bcb17cd16abc0d2880 SHA512 79693fcda9ec5c9990d28371a6817ff79c2bfd6a0d18b48b070e9455fa896e21a2602c7916f474dd1cd060f0d5347e5d4984fec7c74e6350556aad94f972c9fd
 EBUILD libXfont2-9999.ebuild 708 BLAKE2B a672500d5c0e604e32bcdc29db056a727a2c505bc665633b139862850980dab34befc47ac20c7964d2c20d09aa88dfae2ab995ca597a9e659f1289d9da1feeda SHA512 8056ae3ba2f101b84534c0b3b41e609e11a5673d73a4d135501295c198a0f58c2b1e67e7f7a0bbb4a6c565cc67dd7c9c799d68ea190c18f56d238d6b8f8697f1
 MISC metadata.xml 475 BLAKE2B 8a544df9e1c34c23726d094b23cb1dc11e643dd6d9467840494a6aeeddd252a9ff41eaaf664879804e52344718f91a6e562ec0a397b2b81b3cb6fc0357f5ea99 SHA512 11c5f77e0ad6453c90b4403b7f336449ca7d72cd0f61bab37f14357710173bda280895736f098674ca0cb48b969bcd5d2a9c166161c1c717a036e09b777f7852
diff --git a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild b/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
deleted file mode 100644
index 333ec175f52e..000000000000
--- a/x11-libs/libXfont2/libXfont2-2.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 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="x11-libs/xtrans
-	x11-libs/libfontenc
-	sys-libs/zlib
-	truetype? ( >=media-libs/freetype-2 )
-	bzip2? ( app-arch/bzip2 )
-	x11-proto/xproto
-	>=x11-proto/fontsproto-2.1.3"
-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/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ebbdf7d95395..036bda3e9556 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,8 @@
 DIST libdrm-2.4.82.tar.bz2 754053 BLAKE2B 83d0a7203826c093bfb6b3ce4836f3ec6182a75f08f4cecb142e5707eb525cfbba9a123a94235b09370ac53cb7beb443604cb7dfba4cf375e0d0a74f71ce8bb4 SHA512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0
 DIST libdrm-2.4.88.tar.bz2 796583 BLAKE2B 4130633fea39e12514e6c6e7a926ca7ccca618ecb15a67cd27ee577a4ad56ecf6d09e20a323546a2b9698d7e41bd28377e7e04e8f478a3ca957868e1ac51cf98 SHA512 0d9d4bcc0d9be1fb6b1ca075339b22b0f927288a4c02bbcbf95406b5c095051890f3d2e0d32e529ef9b6952ce1250afd1e0765ad3188c2bac924dda8c33afabb
+DIST libdrm-2.4.89.tar.bz2 792940 BLAKE2B 86c8227a06060e827f39da9f1debae54784e38e34becfb3ace1329f68b0fa4cfb90532606cd3618987af2cb48b53f0277e4032055eccc164f7e6b910d3c055e0 SHA512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d
 EBUILD libdrm-2.4.82.ebuild 2038 BLAKE2B 684c6a522fe07fb77bbbaa6f06a45db8055898368e420c6ad555afc795957a789b03a5c2a3a4480d00314b4c9e3a1bb239242c0e2031a4534814ea0f7a6149b8 SHA512 ddb3b11965a574dc79e135df8d6f6b7cd93460fb45f86e7855fb4be704dbf40b18ec15a8cba6154e4c72bd3a1f0bcf0d895cc40906ee95748916846d7bb04d37
-EBUILD libdrm-2.4.88.ebuild 2041 BLAKE2B cc0ea5ed53c1656ecccd9450d2a327cc34021446cd008026716272cb5c45bad789510e9a8fdc6b71166a04ae3e1716888105117d90e1fd9b3ff9d9b36f7b19c9 SHA512 2a08c4d798585e0583f13edac2016bc3136ca0fb039d9e9daced0dbe65fa7fd1a3e1a85f873bb162117e9a01ef90c501c960e70c938ffb4405ac08dfe085521d
-EBUILD libdrm-9999.ebuild 1913 BLAKE2B e345ca85c9a743193bac55d2a29d128d68bd7a022f30f8bf1d804a6ceed0b380b41584d96c64642f4d577fd62b027c2fde11a24959fd6e3afd9b8b04173a45e2 SHA512 838f1ee18aba8bf9a31fe3b81300366c63fb7d34d386d5cdcea9aae23241c01d40863f80ecc84844867b72ceb30a9290558311c2302a88a3fdbd933bb5bad531
+EBUILD libdrm-2.4.88.ebuild 2040 BLAKE2B c2ad4b1562f73e6c2d8ef2f92a56ed3fd6e641987f7cd141b8bcbc7135569dad2e7deedd53b28706318f6d27e2f2daeaec78b8f66717e1bf03b4c5ccc8dc65d8 SHA512 6549f96311d070c6b7cb1284b203c540a285f6167eb3f5587bb85ea37d31a44314e6bc57a78df96047b40e0117ad0e0e5ebc93dc5484018d5678fb82b5b5a4f1
+EBUILD libdrm-2.4.89.ebuild 2048 BLAKE2B e96061f71c45f1f8dcb4e934457647bd39de3993c8f9f2ec2e8f461d1fd0db31e64fede53a2d6b14c28ab5be67e6f0aed306ea54d25eb7c312b2d6d3e2e0865e SHA512 b22d6d45e3655ec8e59206494258517e16bb5845f8f9c7741664308e9a3bea2bfd7fb5e819d7942a0f57dc0a6fa041af7f15d8fbe4d576c1883b8185f958783a
+EBUILD libdrm-9999.ebuild 2048 BLAKE2B 420563dabca9536a39d9b6d3d2e4bdc8f17f456340d24759711514fad31095da3fce792ea5dc53b3f52bb619dbf9ce6264f9d2a5171afff040bb64063f7dfc60 SHA512 20ef3baf5ff00c1be17b121086b4c92e2012e77d5bca81979ef543c3710890411f76ec06daf0eec37eb91fc6b260f81ce37e6fed5c61ab0519f6d8fb1bb9c3ac
 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da
diff --git a/x11-libs/libdrm/libdrm-2.4.88.ebuild b/x11-libs/libdrm/libdrm-2.4.88.ebuild
index 2452a6ff7951..67ce15275409 100644
--- a/x11-libs/libdrm/libdrm-2.4.88.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.88.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libdrm/libdrm-2.4.89.ebuild b/x11-libs/libdrm/libdrm-2.4.89.ebuild
new file mode 100644
index 000000000000..f9f91008a7ac
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.89.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="https://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
+else
+	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+	if [[ ${PV} = 9999* ]]; then
+		# tests are restricted, no point in building them
+		sed -ie 's/tests //' "${S}"/Makefile.am
+	fi
+	xorg-2_src_prepare
+	epatch_user
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		# Udev is only used by tests now.
+		--disable-udev
+		--disable-cairo-tests
+		$(use_enable video_cards_amdgpu amdgpu)
+		$(use_enable video_cards_exynos exynos-experimental-api)
+		$(use_enable video_cards_freedreno freedreno)
+		$(use_enable video_cards_intel intel)
+		$(use_enable video_cards_nouveau nouveau)
+		$(use_enable video_cards_omap omap-experimental-api)
+		$(use_enable video_cards_radeon radeon)
+		$(use_enable video_cards_tegra tegra-experimental-api)
+		$(use_enable video_cards_vc4 vc4)
+		$(use_enable video_cards_vivante etnaviv-experimental-api)
+		$(use_enable video_cards_vmware vmwgfx)
+		$(use_enable libkms)
+		# valgrind installs its .pc file to the pkgconfig for the primary arch
+		--enable-valgrind=$(usex valgrind auto no)
+	)
+
+	xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index 9a326c12fb8f..092c800d11d7 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/drm.git"
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
-KEYWORDS=""
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 48e0bc91d84f..8785c239f917 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -2,5 +2,5 @@ DIST libxklavier-5.3.tar.xz 315684 BLAKE2B f0aade6788a834eff74b33ed0df6af3651142
 DIST libxklavier-5.4.tar.bz2 390428 BLAKE2B 3cd109c6200ef977533d39b1362c33f871c2cd0b011779b726546aa7dc95bf7dc89931dff7ca2e9a012a51aeec602a53df499591ab30e1dd813fcc823318a2e2 SHA512 e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
 EBUILD libxklavier-5.3-r1.ebuild 1178 BLAKE2B 40d13db2e20be4466e822b7358c92a6bd18df3768bc737da8c50e771d6286a637987a77d581384e090f58044abb4137e8a676ed61815bfdaad8a64a0b1c20009 SHA512 74dd647b2e1ce0c2788de30da4b82aaecb3fc63bcdc2074efcd09640b10ec11528d81144fb45e95de06246750163a8d4a288089bc3fe87bbe58b2c1262c6ab26
 EBUILD libxklavier-5.3.ebuild 1279 BLAKE2B 95e9d6d74a8aac0cf7e4ec3bf38807aec35c41f3a75c24edd424967e87b441cddeb513fc9182d0b18c4c2176101cdf788324fc26cb359179fa67699af3415064 SHA512 5b2e76069674dfde5fd44201a3af4dfc3202ace10393fc95cdb4dc1fb74cab834521bcf4813d3f4248452348c3c3d3d849082fd811412a1a21915ccd1f3030f4
-EBUILD libxklavier-5.4.ebuild 1350 BLAKE2B b83b97800252729da6f27e68661d566ba4916e7ac9e67e290e711785a727d01dba50c03950c3ea37a3291ffe0f4564dcce01a633751fe249070ec177447d3517 SHA512 a3d8456f6e8d799700450f355d8c2b0304fec13e7044c9c0e1cd1f3b282f993f7dce99dc27ac105c94bd21e6e3fe27dbd536eb35c89dd657a1cf8d39173bc203
+EBUILD libxklavier-5.4.ebuild 1349 BLAKE2B c06c540e00f5d7e0cc237427e955e31eb5a9602395fa7176a9d5b7a4074d633b2e28d71f521724b022a110d9b35e7fa74b82955fcb954c0e888ff132a1c57059 SHA512 f40700a7be1187e5e10319773501a949b0bbade13232c9e3a3b9d85661c60677b4c15a4a7262ace609080479d09ca4ef82cdbdb7258fd5b7b3cdaf47b156d5f9
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-libs/libxklavier/libxklavier-5.4.ebuild b/x11-libs/libxklavier/libxklavier-5.4.ebuild
index 8e4a944eabda..ee2d145a5738 100644
--- a/x11-libs/libxklavier/libxklavier-5.4.ebuild
+++ b/x11-libs/libxklavier/libxklavier-5.4.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=6
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~svu/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 70995d47f79a..6c1c00653c83 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -24,6 +24,6 @@ EBUILD wxGTK-3.0.2.0-r2.ebuild 4321 BLAKE2B 89c98fc8d165ce80648d56ddd9329d6af278
 EBUILD wxGTK-3.0.2.0-r3.ebuild 4539 BLAKE2B 2ec974f3cc0b2e4426030ca1a16564e2c9e215ce5f2479180fe88b4e04a91c4cbbe91c789e21ae738139554a482c4c45801ac63fa598d319bab09b549e091928 SHA512 442db7de10d3d4b069ef19485cb882966c0b20f7da41f36cf00a054b74214f81b04915fcf637190458a91e00b22acc0d33114dc40dad557ce856962e41cd5204
 EBUILD wxGTK-3.0.2.0-r300.ebuild 5062 BLAKE2B 971833ccf9e6b4761f5760a6f9ea2e060df4efcf2ba36b19351499413dee08fbe573f18a2b044e18438639d663cda6ab4e67b40951818c20ebb50bb2b7f1eadf SHA512 666d0c45c7711fa5883e5b5b99a0b84e3e85ef1a1060ebff57e14f562c0f6d17de0605507bdb6c90483d8c516917d7620aad9ed213dcca613b1c1d2326799531
 EBUILD wxGTK-3.0.2.0-r301.ebuild 5292 BLAKE2B 9ff8380ead99e923c1fdb32066d9519400321918011c94012117be87dd524e787d418a9434f5a1eb6443c9b44db68f7360c725f8cc8869141027ccc394c6f5cc SHA512 309f9f41afc1fff5001f9a01189c022bb9c40a2f4bfb66dfc4f41361cff9e6214f68f5f5110364b53dab3cdb0c28c7b1bb96893262829c3f54301f5e8723a970
-EBUILD wxGTK-3.0.3-r300.ebuild 5161 BLAKE2B 2868365f96d84e8a3485af92b7885e2fe790c7790e400f4e34acac020e6875c6979fe32382a53d98f0ee59c01047ab010e62a216757c2245a8644a3ea7963e4d SHA512 c30a548a1b61644990e8733e53718f28a2e4e60976b42f9004a77bbbac5f38e9ef3e94417657b4f542f70867cff92e16975737cb3730b4ff7791820cd80fb09b
-EBUILD wxGTK-3.0.3.ebuild 4091 BLAKE2B 9c9be9bf855878be16ab310903058883925cc218b590934d25592602548cf702d86c29f445610411844e006cddbb158c9331e2b504fde4b3b5a32c68370d1f50 SHA512 901ae63f06f1ae1285ac746aa8c5a1ad7cbaf6b3aa8229723ec94dfb74eec5bae7bfab758e23b26ec25ca7cc7f996d0a1f8a265a0f165167338f4e2ffabb0752
+EBUILD wxGTK-3.0.3-r300.ebuild 5176 BLAKE2B 80083420300535ba88704b9c25271931de3ce9da76ac40db0aae31cafccf5794fb737e10bb1ebd0f4a443d73a0cfbc510228d056ffc367ac8d9872beae59d870 SHA512 bc531ed938cc83bbd6ec1fcd30b71991f718cafdc6e6701ce9fa8b32e5f937feac8dbf1092fc87b3b41112ddb9fae5b7ba7dd95cb88b5df9f5da89588387fd80
+EBUILD wxGTK-3.0.3.ebuild 4106 BLAKE2B 2e91c3bf8f8af1561badbe01ae841029319fda560fe9322489ac970f6d499fec9faa7dd323a835a394dac3ba4119531b80ee11f01ee9dfbe6c36c750312bd67d SHA512 a5cd139677acbf1d77829473722377116dc20885f7f01e050499a13b3c7bb8b7d24ade26c09c49f02e93060ad9f3bca1eb012cf88df32eca84acafe81ea981d8
 MISC metadata.xml 856 BLAKE2B 9f03dc05155eba5aee9ca7233d96dc7d0929df2a016dce4131b3b639358eea8ebbecfb5e7f59e7382f5467259885c14bcdc3df416a678f213cd58cd3096b4252 SHA512 f5308ab2b8d9d1964c23b175b30c6e728b16522a09a9cf907789a72296b4703f1da9a7b4d116d14cfffb8b38513d4c2830a70acb98b2df62a5dc67ed4e069abb
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
index 2a61e20e6702..24f12cd85a90 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3-r300.ebuild
@@ -159,9 +159,8 @@ multilib_src_install_all() {
 	newdoc base/readme.txt base_readme.txt
 	newdoc gtk/readme.txt gtk_readme.txt
 
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
+	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
+	einstalldocs
 
 	# Unversioned links
 	rm "${D}"/usr/bin/wx{-config,rc}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
index e49514911b55..2a970c3bafbc 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.3.ebuild
@@ -125,9 +125,8 @@ multilib_src_install_all() {
 	newdoc base/readme.txt base_readme.txt
 	newdoc gtk/readme.txt gtk_readme.txt
 
-	if use doc; then
-		dodoc -r "${S}"/docs/doxygen/out/html
-	fi
+	use doc && HTML_DOCS="${WORKDIR}"/wxWidgets-${PV}-docs-html/.
+	einstalldocs
 
 	# Stray windows locale file, causes collisions
 	local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"