gentoo resync : 25.08.2018

24 files changed, 599 insertions, 436 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 4986b4d3ffe8..ff4aed057134 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 77baa6c59493..5396864ddf5f 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -38,6 +38,7 @@ DIST NVIDIA-FreeBSD-x86_64-390.77.tar.gz 63638514 BLAKE2B 8a63f1c93cb24400ce099f
 DIST NVIDIA-FreeBSD-x86_64-396.24.tar.gz 60839222 BLAKE2B 4baa266d945525a8f43d69e14df1b045d5a2e7212eb3a92208f8efb454642e657ea3cf00a9e625ef5efa9f54c8a9e2f87ef4847696368de13b88a0721364d9af SHA512 28c456cfc9f779bed84d671e104f2ea68940053aed2dc7964390e84ec553a9062be6b5108a78f123c129c25548a7b3027060da67417c64f857b23c95ae9f908b
 DIST NVIDIA-FreeBSD-x86_64-396.45.tar.gz 60850050 BLAKE2B 1bc8e761fbe38637ee17f996ec74f63c4e9da7cea6d38029fe2fcad5cd85da73e10773e019e2744d522aefecee2d6a8d3852db6ad5b9e1e746bc36ccdb4b7c9c SHA512 76955be8e86645376856bdbda7339601b88067e6b4d39b768ec86586eced7e77a437eb990bcf0fa77b3671968b00df91b53be53e1cdcd45d3e0c6a96ab5f1d77
 DIST NVIDIA-FreeBSD-x86_64-396.51.tar.gz 60903199 BLAKE2B adaf32bce51a11a15f71dfb3fb66a203237a6e153437cd4c95bd5d9d7d694b9b959d7e599d9481e3201eff243655e2d3e39cbea72bf40d9c40448d4b55cf22ed SHA512 903af39b5d8681d80f0016db4fe7a4b84cc2c1325c295be6c44b95aa98006d395f46b9d26ca5f08aea8998ca62f1c51eb4b1c0c2b3d082943d35c4bb437a57ef
+DIST NVIDIA-FreeBSD-x86_64-396.54.tar.gz 60938322 BLAKE2B a23488b625a15703b0c40bc6871314b05d117d489f64a6f7c70ac3c934b02028b9623be10f0369c98c7d3b5e018e1eb6f1d2cde9d9e1b90be5065f06f6a646dd SHA512 52df85364bfd45a23394078855859ce85de996f7990bb96ba63eb33e516c3cf8e72c4391af9817213f735286f2cf6444bc8ed00312365f12ae17373cfbdc3fc7
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099 SHA512 28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 2b3c540704496a290be7ae3f1ff378487c75af2298c12488da8b3a1814446e5df02a1ed99afd8ee7fc459d950aab472155359eae0bf56ac83389711d70638152 SHA512 253786a821df85fa926ae842114321b3c70502f887ea7c2b6790dfe3836039ee5d390e6722ca8785904ec6487e465916923d3042dc6191b3b4522c3161b80cb0
 DIST NVIDIA-Linux-armv7l-gnueabihf-381.22.run 26815484 BLAKE2B e5f0241b07d1e54edea2025dd30061d1018c68cc2c7136c507eb894bbad5be3d0724494e2b9f33d1f8f60da4904999bbb964e6f2e78d045d7cd86bcd46b7f6d0 SHA512 934cda37c7aed26243b5b661122e1c060de5b4df890aaf2295b6650dddea37cb4f0e3f0bebddb00b5d687b66ab5e028a203195c4d4ad3379593babda42febe77
@@ -66,6 +67,7 @@ DIST NVIDIA-Linux-x86_64-390.77.run 82722543 BLAKE2B 46bc7b365b4a8bd2d9444ccccec
 DIST NVIDIA-Linux-x86_64-396.24.run 86545234 BLAKE2B be297b4585275362608cb5119c9f7f77bcf7895bd1320603cb5f8034ee5f1dfa6d0150e58d4a11dd4656b50476d6cb6a372c18db54d33fdd685250ceb0793d3f SHA512 dfe837804d01e903cdf980353add0227362771cd252e4a7d8aff99fc489e5535edfda51ed1a20b9d60e23f1a9e7312f23309c59c67ff0a09a9b9214e52f09077
 DIST NVIDIA-Linux-x86_64-396.45.run 87016131 BLAKE2B 988392f69fc4f1f60acd03bee50245d836976728c81bbd21e5542b13e0bd93589a2bf8482d544e868f294e32de65b62c13512e465ec25afaae1ae405ae4beb3c SHA512 243253ebc83e4bc5116223ecaa29e55786a611484d9a0fba302f9f87961576bbd7f367422635725173662f013e27ef88a09f7282c9fe9912f9fe4665bdf06822
 DIST NVIDIA-Linux-x86_64-396.51.run 86541408 BLAKE2B 2cc41d2f6fe73a49c322828a9001383d8a23890a6d1d18593b649e18b77d2424fe588fdfbfd71fce6819a4620c4ba21d8e8ce7f2a8aa8411961099d40cf54edd SHA512 961c1a5b27a0f6cb54e387133a8d4038ddda0df39e70e84a637d8d64eaeb4ec937e37d6a737179d72750785614d20ade5e99f0668e3d53fef2cfa70241de4fe3
+DIST NVIDIA-Linux-x86_64-396.54.run 86946680 BLAKE2B 9b3ab39c9d09c663238d0fac6346c24feea6ecc44b0ecaf3de871522697685c1c474ec4cc83f3bab0a2bcfecc7c77acea0e6bfee6e8ca8e6883bd338fd6da8a2 SHA512 17139abe99d4f32ec87379ee57af2cc0fec7d24605b2be7e3cd6609d9fcdf871e3c1cb7414b3544e14eb32d2213fec7ac45b3261f27c8d6565d510ccb14a1247
 DIST nvidia-settings-304.137.tar.bz2 1481361 BLAKE2B cf52a55a34eeb03a685a683487af6a198ba467dd8ba9983cc75624a37a226373cd931d98e8448b7b8ed430c54be2118c7b240ed2a9100b19bec5e832e2f6cdad SHA512 676d1f70c9a78ee234f5f1a283412430a386fa604de211afba02806a45906c5e246a002989b724d74752178d28c92a268de1c98d4c87876797d991253f16b0cc
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-375.82.tar.gz 2114647 BLAKE2B 26413fde8397e748fae362984039286c53a7fe104228452f3188b5e77b084ff4bf00131e77359ff5e92dfc325680c1f662950175cf806403d2a524ba86158f51 SHA512 7a374be56c8be52767d73a048029d9e55dc2abcf2f6a97eb4931544c927c85a1103a206be9e8d1ffcef36fec2caf2416f33699ad4d51e7dca17e4e844c37a595
@@ -78,6 +80,7 @@ DIST nvidia-settings-390.77.tar.bz2 1109358 BLAKE2B ee59fff5a679301b0e1f24fce3a1
 DIST nvidia-settings-396.24.tar.bz2 1115673 BLAKE2B 5b0bd156505e99a5b788fc61458c902cc1760d999b18c8c6309986d8c315eabc65cb2fea9ef6a823acbe57c4a11bf67938575afffb36fea91320416fe40a7507 SHA512 841470a324bb09683fcd863474f987a525a38213432be3bf4288a48671c674692f44642d260f3d2d0710e485e323153f867d0bda4cfa9b11d0e3c61a36370353
 DIST nvidia-settings-396.45.tar.bz2 1116216 BLAKE2B 85769b7e3152bf2ff029083d5e1cf695751fa713b9db858d77f344f19266b545e8f70a07dcb3b017dd6ab901e25df6acd15a1e584bc65efec1a3d24cdd56cfca SHA512 2ec1c1e2ba79a95c1199724c476b8433ea34b7c88acfabf9b49484073d8b0251a7f466bfe71f501772915ea77fdc34b4bc539fc62e8844a06c28af7570fe0bee
 DIST nvidia-settings-396.51.tar.bz2 1116520 BLAKE2B e7362bf71d0c7e595a17e398aacfe53ad845e1d29db6792e0d4e7769663c9eba1267c95c8a629473f7419d05ab48c02ff198bebee11db8a3d9de1ed4444c4124 SHA512 139fde3ab704562db5d7247b0ccd578260baf2650de24d6844a02439d6847681181681fb6bf84fc962434597259887b735b1cb2e596ab5112924d70ba4c6fc6f
+DIST nvidia-settings-396.54.tar.bz2 1116371 BLAKE2B 114b88f393b0909c8d84a56a280854e258d0e7e7ce800ee58547ef68b4989f22a3bbb380795472b8222493a988dc9308fc20ef03c81589448b518a12285cf204 SHA512 23dc3c61bef71200b3e8185940dd52a50dae7ca7f2b8a68fa96eaa937aabc87ded5d5f73081af51d1e7af2b78b0ec10ab80d28dadbcf10a046c32ec14db1d83c
 EBUILD nvidia-drivers-304.137.ebuild 13647 BLAKE2B ff0bc9bc9d98a5f38ebd791c696291d6c88d0e10ab68509c73ae7b9e1f8b3188027627dd02b99329b551c77819a4bf2d77625762d6ff2bbe25c3bbe14afdd0e5 SHA512 617d92a8eca878b7a69b7bedead069b672d827c48e7531da49d985a913d4295039d8f5d9e2566c9ee9192cc5191bd3c70400310ea682b71c479df6082692e70c
 EBUILD nvidia-drivers-340.107.ebuild 14648 BLAKE2B 3456f822cf41e497637b880898189ee040b2113779fb28ba2a04193180ac3769e00d61e80e697f779f50dd55b055a95dfc480f8e2f6fe5d78a30219ddda5c30e SHA512 d3df565fdb9425fe568eb16c9dc7ca50ff832a54629012a92a5d8c3e60f358f4a286f371b14cc6365dc8465bc78e1a1bdf5cbd4ca9ce26497ad4cacd695cfcd8
 EBUILD nvidia-drivers-375.82.ebuild 15848 BLAKE2B f89ad536d15a0df282744c7c26c995dc1d94b8af60e2a7fe3d40a06134526b8eba96c06ae999ae55efca4a21655893a4e53498d0f729f1b35affe891b81438cb SHA512 4778befb48304ed07f9e47174eaf0e519dcdc261906151246e54f3fb8383c5fb5c45b45e42165d69523057007ab44a9c7b400a907ddd167dfdd29dc422995f93
@@ -89,5 +92,6 @@ EBUILD nvidia-drivers-390.67.ebuild 16291 BLAKE2B 7a3748763d42bc2f51b7410b89a030
 EBUILD nvidia-drivers-390.77.ebuild 16293 BLAKE2B 5263b9481915c21b9df6c4477697e541dd10f5103fd98d2c66f45166dc9e8bbe425490f483396d3bb3bb5bfa9dabb202116d649f782a9c902d728dfa8d940b2f SHA512 b03219ab61b1b39f7d3c9ca00cd3442b15511c6bc93a82053f89560cdafb540492c0b91d081aab19d4e04960b6df3aaba819607e51a44698faad29a14bfe1e30
 EBUILD nvidia-drivers-396.24-r1.ebuild 15944 BLAKE2B 08a71847cda1985aaf86817cd865e4943de4ce25609a1db42861c07cc063456afec1abdd8e46c3fdba49c05bc57fd4b66a46f9a2e4e42e029355becad028fd87 SHA512 e9717a8d09b68f9fa9f44fba55e612cde824c4eb64287fd95fd3ccf47797e56fe137f6a93907249dc5f060af9607c52b9e125a0fdf9b859f53e11b154eb0e471
 EBUILD nvidia-drivers-396.45.ebuild 15944 BLAKE2B 08a71847cda1985aaf86817cd865e4943de4ce25609a1db42861c07cc063456afec1abdd8e46c3fdba49c05bc57fd4b66a46f9a2e4e42e029355becad028fd87 SHA512 e9717a8d09b68f9fa9f44fba55e612cde824c4eb64287fd95fd3ccf47797e56fe137f6a93907249dc5f060af9607c52b9e125a0fdf9b859f53e11b154eb0e471
-EBUILD nvidia-drivers-396.51.ebuild 15945 BLAKE2B 01bcf2d8b1e4423fb89412075bbda270a018fad08166c4c4351bc57fa225107142c9dd007f22407cb224e0261f430a79787d06dd21d8f04075cfdcfef8dd8e20 SHA512 c742ec64ce005a4f7e9937ce2e6eb959920aa4ee6dfcda7b140423619990c954959fc6e6ae39417cb8f7e72f085fe06abeaf9585718b289fc003dd822e3280ce
+EBUILD nvidia-drivers-396.51.ebuild 15945 BLAKE2B 3f250f4d31e384c921b65ff9c22bfda2f13880f29c2012c54856106e63d4fc2cbf3b1f0db6beaa9637f78763aef01ba55aa5ec063e97092e01155c6dc26232b9 SHA512 1d23da2e6b8921e3c851dd73d5d7e53d3f7b6e1e6d0cee8d24a07e6f7da1bb3f73f697394e7d7dbf85ba5ba85c9cf1560d74130cf10e2b6e66902dd0febc68db
+EBUILD nvidia-drivers-396.54.ebuild 15945 BLAKE2B 3f250f4d31e384c921b65ff9c22bfda2f13880f29c2012c54856106e63d4fc2cbf3b1f0db6beaa9637f78763aef01ba55aa5ec063e97092e01155c6dc26232b9 SHA512 1d23da2e6b8921e3c851dd73d5d7e53d3f7b6e1e6d0cee8d24a07e6f7da1bb3f73f697394e7d7dbf85ba5ba85c9cf1560d74130cf10e2b6e66902dd0febc68db
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild
index 49a63be02100..8fc4f36564d5 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.51.ebuild
@@ -86,11 +86,11 @@ nvidia_drivers_versions_check() {
 		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
 	fi
 
-	if use kernel_linux && kernel_is ge 4 18; then
+	if use kernel_linux && kernel_is ge 4 19; then
 		ewarn "Gentoo supports kernels which are supported by NVIDIA"
 		ewarn "which are limited to the following kernels:"
-		ewarn "<sys-kernel/gentoo-sources-4.18"
-		ewarn "<sys-kernel/vanilla-sources-4.18"
+		ewarn "<sys-kernel/gentoo-sources-4.19"
+		ewarn "<sys-kernel/vanilla-sources-4.19"
 		ewarn ""
 		ewarn "You are free to utilize epatch_user to provide whatever"
 		ewarn "support you feel is appropriate, but will not receive"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild
new file mode 100644
index 000000000000..8fc4f36564d5
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-396.54.ebuild
@@ -0,0 +1,581 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic linux-info linux-mod multilib-minimal nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	tools? (
+		https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+	)
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~amd64-fbsd"
+RESTRICT="bindist mirror"
+EMULTILIB_PKG="true"
+
+IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib pax_kernel static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+	tools? ( X )
+	static-libs? ( tools )
+"
+
+COMMON="
+	app-eselect/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/jansson
+		gtk3? (
+			x11-libs/gtk+:3
+		)
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf[X]
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrandr
+		x11-libs/libXv
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+	)
+	X? (
+		>=app-eselect/eselect-opengl-1.0.9
+		app-misc/pax-utils
+	)
+"
+DEPEND="
+	${COMMON}
+	kernel_linux? ( virtual/linux-sources )
+	tools? ( sys-apps/dbus )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? ( !media-video/nvidia-settings )
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		<x11-base/xorg-server-1.20.99:=
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+	)
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+
+nvidia_drivers_versions_check() {
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 4 19; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.19"
+		ewarn "<sys-kernel/vanilla-sources-4.19"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Do not file a bug report about this."
+		ewarn ""
+	fi
+
+	# Since Nvidia ships many different series of drivers, we need to give the user
+	# some kind of guidance as to what version they should install. This tries
+	# to point the user in the right direction but can't be perfect. check
+	# nvidia-driver.eclass
+	nvidia-driver-check-warning
+
+	# Kernel features/options to check for
+	CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+
+	# Now do the above checks
+	use kernel_linux && check_extra_config
+}
+
+pkg_pretend() {
+	nvidia_drivers_versions_check
+}
+
+pkg_setup() {
+	nvidia_drivers_versions_check
+
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	if use driver && use kernel_linux; then
+		MODULE_NAMES="nvidia(video:${S}/kernel)"
+		use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+		use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+		# This needs to run after MODULE_NAMES (so that the eclass checks
+		# whether the kernel supports loadable modules) but before BUILD_PARAMS
+		# is set (so that KV_DIR is populated).
+		linux-mod_pkg_setup
+
+		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+		SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+		# linux-mod_src_compile calls set_arch_to_kernel, which
+		# sets the ARCH to x86 but NVIDIA's wrapping Makefile
+		# expects x86_64 or i386 and then converts it to x86
+		# later on in the build process
+		BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+	fi
+
+	if use kernel_linux && kernel_is lt 2 6 9; then
+		eerror "You must build this against 2.6.9 or higher kernels."
+	fi
+
+	# set variables to where files are in the package structure
+	if use kernel_FreeBSD; then
+		use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+		NV_DOC="${S}/doc"
+		NV_OBJ="${S}/obj"
+		NV_SRC="${S}/src"
+		NV_MAN="${S}/x11/man"
+		NV_X11="${S}/obj"
+		NV_SOVER=1
+	elif use kernel_linux; then
+		NV_DOC="${S}"
+		NV_OBJ="${S}"
+		NV_SRC="${S}/kernel"
+		NV_MAN="${S}"
+		NV_X11="${S}"
+		NV_SOVER=${PV}
+	else
+		die "Could not determine proper NVIDIA package"
+	fi
+}
+
+src_prepare() {
+	if use pax_kernel; then
+		ewarn "Using PAX patches is not supported. You will be asked to"
+		ewarn "use a standard kernel should you have issues. Should you"
+		ewarn "need support with these patches, contact the PaX team."
+		eapply "${FILESDIR}"/${PN}-375.20-pax.patch
+	fi
+
+	local man_file
+	for man_file in "${NV_MAN}"/*1.gz; do
+		gunzip $man_file || die
+	done
+
+	if use tools; then
+		cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+		sed -i \
+			-e "s:@PV@:${PV}:g" \
+			"${WORKDIR}"/nvidia-settings-linker.patch || die
+		eapply "${WORKDIR}"/nvidia-settings-linker.patch
+	fi
+
+	default
+
+	if ! [ -f nvidia_icd.json ]; then
+		cp nvidia_icd.json.template nvidia_icd.json || die
+		sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+	fi
+}
+
+src_compile() {
+	# This is already the default on Linux, as there's no toplevel Makefile, but
+	# on FreeBSD there's one and triggers the kernel module build, as we install
+	# it by itself, pass this.
+
+	cd "${NV_SRC}"
+	if use kernel_FreeBSD; then
+		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+	elif use driver && use kernel_linux; then
+		MAKEOPTS=-j1 linux-mod_src_compile
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			AR="$(tc-getAR)" \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NV_VERBOSE=1 \
+			RANLIB="$(tc-getRANLIB)" \
+			build-xnvctrl
+
+		emake -C "${S}"/nvidia-settings-${PV}/src \
+			CC="$(tc-getCC)" \
+			DO_STRIP= \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LD="$(tc-getCC)" \
+			LIBDIR="$(get_libdir)" \
+			NVLD="$(tc-getLD)" \
+			NVML_ENABLED=0 \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1
+	fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+	# Full path to library
+	nv_LIB="${1}"
+
+	# SOVER to use
+	nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+	# Where to install
+	nv_DEST="${2}"
+
+	# Get just the library name
+	nv_LIBNAME=$(basename "${nv_LIB}")
+
+	if [[ "${nv_DEST}" ]]; then
+		exeinto ${nv_DEST}
+		action="doexe"
+	else
+		nv_DEST="/usr/$(get_libdir)"
+		action="dolib.so"
+	fi
+
+	# Install the library
+	${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+	# If the library has a SONAME and SONAME does not match the library name,
+	# then we need to create a symlink
+	if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+		dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+			|| die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+	fi
+
+	dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+		|| die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+	if use driver && use kernel_linux; then
+		linux-mod_src_install
+
+		# Add the aliases
+		# This file is tweaked with the appropriate video group in
+		# pkg_preinst, see bug #491414
+		insinto /etc/modprobe.d
+		newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+		doins "${FILESDIR}"/nvidia-rmmod.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+	# NVIDIA framebuffer capture library
+	donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+
+		# Xorg nvidia.conf
+		if has_version '>=x11-base/xorg-server-1.16'; then
+			insinto /usr/share/X11/xorg.conf.d
+			newins {,50-}nvidia-drm-outputclass.conf
+		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/egl/egl_external_platform.d
+		doins ${NV_X11}/10_nvidia_wayland.json
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}"/nvidia-smi.1
+		use X && doman "${NV_MAN}"/nvidia-xconfig.1
+		use tools && doman "${NV_MAN}"/nvidia-settings.1
+		doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+	fi
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+
+		insinto /etc/vulkan/icd.d
+		doins nvidia_icd.json
+	fi
+
+	if use kernel_linux; then
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-persistenced
+		doexe ${NV_OBJ}/nvidia-smi
+
+		# install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+		doexe ${NV_OBJ}/nvidia-modprobe
+		fowners root:video /opt/bin/nvidia-modprobe
+		fperms 4710 /opt/bin/nvidia-modprobe
+		dosym /{opt,usr}/bin/nvidia-modprobe
+
+		doman nvidia-cuda-mps-control.1
+		doman nvidia-modprobe.1
+		doman nvidia-persistenced.1
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+		newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+		newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+	fi
+
+	if use tools; then
+		emake -C "${S}"/nvidia-settings-${PV}/src/ \
+			DESTDIR="${D}" \
+			GTK3_AVAILABLE=$(usex gtk3 1 0) \
+			LIBDIR="${D}/usr/$(get_libdir)" \
+			NV_USE_BUNDLED_LIBJANSSON=0 \
+			NV_VERBOSE=1 \
+			PREFIX=/usr \
+			DO_STRIP= \
+			install
+
+		if use static-libs; then
+			dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+			insinto /usr/include/NVCtrl
+			doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+		fi
+
+		insinto /usr/share/nvidia/
+		doins nvidia-application-profiles-${PV}-key-documentation
+
+		insinto /etc/nvidia
+		newins \
+			nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || \
+			doicon ${NV_OBJ}/nvidia-settings.png
+
+		domenu "${FILESDIR}"/nvidia-settings.desktop
+
+		exeinto /etc/X11/xinit/xinitrc.d
+		newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+	fi
+
+	dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+	if has_multilib_profile && use multilib; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+
+	readme.gentoo_create_doc
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local nv_libdir="${NV_OBJ}"
+
+	if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+		nv_libdir="${NV_OBJ}"/32
+	fi
+
+	if use X; then
+		NV_GLX_LIBRARIES=(
+			"libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+			"libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+			"libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+			"libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLESv2.so.2.1.0 ${GL_ROOT}"
+			"libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLX.so.0 ${GL_ROOT}"
+			"libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+			"libGLdispatch.so.0 ${GL_ROOT}"
+			"libOpenCL.so.1.0.0 ${CL_ROOT}"
+			"libOpenGL.so.0 ${GL_ROOT}"
+			"libcuda.so.${NV_SOVER}"
+			"libnvcuvid.so.${NV_SOVER}"
+			"libnvidia-compiler.so.${NV_SOVER}"
+			"libnvidia-eglcore.so.${NV_SOVER}"
+			"libnvidia-encode.so.${NV_SOVER}"
+			"libnvidia-fatbinaryloader.so.${NV_SOVER}"
+			"libnvidia-fbc.so.${NV_SOVER}"
+			"libnvidia-glcore.so.${NV_SOVER}"
+			"libnvidia-glsi.so.${NV_SOVER}"
+			"libnvidia-glvkspirv.so.${NV_SOVER}"
+			"libnvidia-ifr.so.${NV_SOVER}"
+			"libnvidia-opencl.so.${NV_SOVER}"
+			"libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+			"libvdpau_nvidia.so.${NV_SOVER}"
+		)
+
+		if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-egl-wayland.so.1.0.3"
+			)
+		fi
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-wfb.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_FreeBSD; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		if use kernel_linux; then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-ml.so.${NV_SOVER}"
+				"tls/libnvidia-tls.so.${NV_SOVER}"
+			)
+		fi
+
+		for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+			donvidia "${nv_libdir}"/${NV_LIB}
+		done
+	fi
+}
+
+pkg_preinst() {
+	if use driver && use kernel_linux; then
+		linux-mod_pkg_preinst
+
+		local videogroup="$(egetent group video | cut -d ':' -f 3)"
+		if [ -z "${videogroup}" ]; then
+			eerror "Failed to determine the video group gid"
+			die "Failed to determine the video group gid"
+		else
+			sed -i \
+				-e "s:PACKAGE:${PF}:g" \
+				-e "s:VIDEOGID:${videogroup}:" \
+				"${D}"/etc/modprobe.d/nvidia.conf || die
+		fi
+	fi
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use driver && use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	readme.gentoo_print_elog
+
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use driver && use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
index 849891b44fa6..215c71b6a8a4 100644
--- a/x11-drivers/xf86-input-mouse/Manifest
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-mouse-1.9.2.tar.bz2 377685 BLAKE2B b51d5fa14ba3ac56b75c108376d5605dc927f3000ce1da63da0f8469d5af7851bca3c646bc60597e801322374e771ed3b15f90ce80d2e6daa7c38da094c9305a SHA512 30fdc4f699d434e2fb4a9f8d2f4f980538d646a6e4d2d572737fc5498c0bce0fb1ba080173ea0aa3480f574dde3f58d5a7ac837afdb29640ccb092b3f18ff209
 DIST xf86-input-mouse-1.9.3.tar.bz2 382013 BLAKE2B d4b9b006c7f8d12fd460677020031dc0957cb1f31af7cef81eeb051a5e0375ddc5a5094a5d28a14a49a00bb1166a79ff832c42652fd4084904313f3e72abd61d SHA512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f
 EBUILD xf86-input-mouse-1.9.2.ebuild 369 BLAKE2B c8cbbe1e5b64491dffcc93cbc9c593bc90aae82db88c7f5147f562b1b07d332e434d215f34006b51e6c7e60890fa10f4e53da82b91f8429c6745d5b20fb50860 SHA512 0c381639b3ba9aaef570e8ac30519b410fa141c45f6f177dd5f0f0be095db2caa0b81867679b78145883e14c893123b26a8602dfe9964ea7e648722da7465884
-EBUILD xf86-input-mouse-1.9.3.ebuild 378 BLAKE2B bf49b4fa873227927ace00059810051624eeefc024f1a51aa2401901b8355da3b22180a180b4b79eef83edda0c7189d2102874a5993191395282a6ce2db8f3ff SHA512 a040e2641d99bd66b95a0a3c610b97b1730405d17aae842c0178c601be5499d5c370d8b7d807cd31956cf7beafffb53873b7da3e99d399a269f4ef383ce4e9cb
+EBUILD xf86-input-mouse-1.9.3.ebuild 372 BLAKE2B fe045545f2ecb49b8602c20f5e0d3d8246e8482e32806582da6bcf48b4b9af47451195065b7b328dc5ebcfcff2f103f2e7179412eefe8b1ee42461a3507c982a SHA512 01cd8e25c1b91bb16a55d169e01041772a20cdc3cc4bbe055d4ad075a904cf88062daa6281cbb91e277878c8b9173113ffaa41abd534f500ccd2512dd3029507
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
index 995741242ac5..cc5ccc6c5e48 100644
--- a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.9.3.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org driver for mouse input devices"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.7"
diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest
index 50c5e12b87ad..79586160db2f 100644
--- a/x11-drivers/xf86-input-mtrack/Manifest
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -1,6 +1,3 @@
-AUX xf86-input-mtrack-0.2.0-drop-mtrack-test.patch 370 BLAKE2B ae2e56bcb86898269157f9e2af597aa9896170288b437f68b2cd3496264a66fd4e6edf9807a85ebec7c6374c8fa11103dded89046255a0d9fd405d45511f3622 SHA512 368c407119963e432ae10c058c40b026099bc0359b23a888f5d72909e30189354e2620692516eb919648217bf48b7939b736784208beae7cc8f356cfdb10deb0
-DIST xf86-input-mtrack-0.4.1.tar.gz 386733 BLAKE2B 6d7a49bd34894df6e88a900a86eb249a69a396d046776dd801b41a4ee505d07145f7ce66c2a83a21fa209cb78c6d709fb697145a30cf5cb5f78badd589844bd7 SHA512 2c517b27f4915978a01ed1d6d63f156b84c4eb1006a5e972183616a01c6d672fd7bc1c248ae22dcb09024be670afce1130c8fd8325b015811d58d020f244f010
 DIST xf86-input-mtrack-0.5.0.tar.gz 392992 BLAKE2B 7b0697dde374d558eec304a5b26b50d62fe85c8a0bbde916096ae0296b6bae372c499138a4ca8500e4b6bfeaf7782a18512813c60013476decd2ae6a4a838aa6 SHA512 d30551e0b8be47af336fa3d5207537eb115586f0bb078b2eb6d823fed695a2157e2e63bf145757f04b09359b94206211df817dc2d1182813a3f6370a2a126846
-EBUILD xf86-input-mtrack-0.4.1.ebuild 875 BLAKE2B ec2bcde3aba6c698bb84932cd566d1b7c377973e5a54d13f74ee5780fcd6d840df30795c3f5f23ca0db20f6e72b8b32acb71949be8b54c0137a0021bb6f2b07f SHA512 fda127708e6bfd937e3edf1bf91fbede89fb7aa99923633f8922418a2aa699885dac433edfc2eba5662ef09d8f3a4f81a66b03536885dd838a521109ec103b2b
-EBUILD xf86-input-mtrack-0.5.0.ebuild 928 BLAKE2B ea86abf4a0894534cdfb29024fd685f2052687aee04efab7c209793a7f738441185cd3047d23bbf0fe1817b7b25b9f8412c471304672fc259c5c413a30b614f8 SHA512 c2694a43b5b30d6ad2948512c50775229ae3d6feb3ed054f59c6a87ca5857300c0710aa728afd815b0b1879af1b36821385668dedb86fc7268c8bf44871f47c0
+EBUILD xf86-input-mtrack-0.5.0.ebuild 926 BLAKE2B 61359d0569184d2fe345078f3c34cd724c8d2dbc128ce5fdefee7de1be0627a99645c4c1463216b5298db9afa6cd356ee7c832cea4bc4e0bfa99204e4c4ee590 SHA512 1df08d2140d1e067b4c106cb243ff01c29b3b184c0dc9d5f247d372e7b6cbc5e83870b54c41b73fa11732ab04552b89af1d6f14f65312c783018e8de405931ce
 MISC metadata.xml 338 BLAKE2B ee56383414c84d6bcf018537f7fc1e44dd31db002639568c2cf7e5e02439dcd28cd93f01547ed8afeee2a01871788d24e1f3c167eb0ffcb97658ee282480aa6e SHA512 fecb11e3d6179589887afc269de0a37cc20a4a555372d7dfc875570458e27c89e1574f2b0ec8bc2a9e60e66f437261318887404b0d445794715b9a940db8f448
diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch
deleted file mode 100644
index 5ee5e55db355..000000000000
--- a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index b22df2f..ed4c53c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,7 +14,7 @@ SOURCES_COMMON = \
- 	$(srcdir)/driver/mprops.c
- @DRIVER_NAME@_drv_ladir = @inputdir@
- 
--noinst_PROGRAMS = mtrack-test
-+noinst_PROGRAMS =
- mtrack_test_SOURCES = $(SOURCES_COMMON) \
- 	$(srcdir)/tools/mtrack-test.c
- mtrack_test_CFLAGS = $(AM_CFLAGS)
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
deleted file mode 100644
index 1b5ea1efe16f..000000000000
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot
-
-DESCRIPTION="Xorg Driver for Multitouch Trackpads"
-HOMEPAGE="https://github.com/p2rkw/xf86-input-mtrack"
-SRC_URI="https://github.com/p2rkw/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
-IUSE="debug"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-RDEPEND="${RDEPEND}
-	>=sys-libs/mtdev-1.0"
-DEPEND="${DEPEND}
-	>=sys-libs/mtdev-1.0
-	x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-PATCHES=( "${FILESDIR}"/${PN}-0.2.0-drop-mtrack-test.patch )
-
-pkg_postinst() {
-	elog
-	elog "To enable multitouch support add the following lines"
-	elog "to your xorg.conf:"
-	elog ""
-	elog "Section \"InputClass\""
-	elog "  MatchIsTouchpad \"true\""
-	elog "  Identifier      \"Touchpads\""
-	elog "  Driver          \"mtrack\""
-	elog "EndSection"
-	elog
-}
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
index 3cac497bb4f8..d8bb80ed22c3 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.5.0.ebuild
@@ -12,7 +12,7 @@ IUSE="debug"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND=">=sys-libs/mtdev-1.0
 	x11-base/xorg-server:="
diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
index 0e404bdc649b..200f7aa1cd96 100644
--- a/x11-drivers/xf86-input-tslib/Manifest
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -4,5 +4,5 @@ AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 BLAKE2B e5421a0cf4f0fd645d61777e
 DIST xf86-input-tslib-1.2.0_rc1.tar.gz 12029 BLAKE2B 28841961882af8285d12830c5774eb86b0c4a3ed515394d493d384933209020e6593680a087c9d70a6e7b351e6556bf73246e3deff4eee7ab52d57f89ecc8f7c SHA512 6ab358470b01c5c29e8004624c5a0ac9e9737bf7ccc946a08606a2d5fe36657af7c062cf8a8fe98f692f9f352a3bc7aa90592faa43647fc133ac22ecb52d4805
 DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 BLAKE2B 05037c2ca9339245b0987ce7e0121f4825a840dab24e60ce901d290b13841a3843d6c93ef9910db92d47418d649189d78e18e26ec248c4ff9ad1131e54b81240 SHA512 abc6060ba595790dab02a191861ee128a729916a6ea2df2a818a0b3388839dac933a0d7ee5530735f376f917f33bf8db40d42a7dce90b20a7682344370bc7b48
 EBUILD xf86-input-tslib-0.0.6-r3.ebuild 781 BLAKE2B 3b4040ab660975e9135dbd8768e2832f297571fe85cc6f2cba83c8abc89e9323780d6de62a9ba989a0db8c8e34fa8b26b3dfb3a8cdabab33f1448c7e96e251f1 SHA512 c7b8f2629e3d4517c5903ff5ca758dff7ab780b3400c94a61a309706d3cb1c465804919cc59fa5c3942b5dc66dae11b5cd8c545935dd468beb9f31e0d28dce25
-EBUILD xf86-input-tslib-1.2.0_rc1.ebuild 665 BLAKE2B 9028d86232cfad3b908d90a00aa6e5f24550ad57a15c031b36aa12b564024413d5c7717c9168db90848666492f0b42756063f83f306455f573d5ac3c982507aa SHA512 02b534838907bf1469aafe4709cb879dae1148cf2800b8c2c9fc31239a6446fefe259a05e663e60a9a8d787ede854206e9946ab55edbde3ac972667cce79088f
+EBUILD xf86-input-tslib-1.2.0_rc1.ebuild 659 BLAKE2B bd1b1ca1eb04836e4764369e591bfd770418691ac4400086db9cf1f1fab8b6f72fbf4ee58b5da3926487cc9c47ece85895fe0ba56bed889d84f801851cc2140d SHA512 9985f1cfeff11dc84bdc7c05703d441edf7943a73174935ae56e075f88c0ecfb6cc3e111a73fe331f204b2874c6c43c9637aa7c74783d0416428ee5768ec233c
 MISC metadata.xml 338 BLAKE2B 3f7f7614c07d92a52a1499634820de2891cf891fd2c86230b69a99b83afae1af395ed8eaabd32b4b17b19b3ffcfd717ea6e7963beb18dfca0ae3db77269eeb87 SHA512 cf7eafaffce2e1064714ac53d374fcb81a4a77cf7a3b9826c595b0b40a01a54b0280ecf4c824b8741b09893d770e80495084ede42281242959f283b5c0d51d2c
diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild
index 8054b93e5ad4..cf86f86fb894 100644
--- a/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-1.2.0_rc1.ebuild
@@ -12,7 +12,7 @@ IUSE=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
 
 RDEPEND="x11-libs/tslib
 	x11-base/xorg-server:="
diff --git a/x11-drivers/xf86-video-fbdev/Manifest b/x11-drivers/xf86-video-fbdev/Manifest
index ab09b2a89cd6..761ece6ae255 100644
--- a/x11-drivers/xf86-video-fbdev/Manifest
+++ b/x11-drivers/xf86-video-fbdev/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-fbdev-0.4.4.tar.bz2 293545 BLAKE2B 36dd322a079a6f6f80357b5e4f24ef9e83aa66cfa4dc0fbb9df3f2fc918226c32ccdc299bcfd0a565b542372e9aaf610c8bf8a69895d7d5048ca82c7e2313d3d SHA512 942ccf7e528b7cf0af19ef0efc9f5c60ab558bd865aad330f1c58a9ef063f9b38b4e62e5622270c0bfc237cb3cbc579d43b854aaa64fa2a9130eede73b1e55e9
 DIST xf86-video-fbdev-0.5.0.tar.bz2 295102 BLAKE2B f3696662e782f35eeae66a755761b8f5d6f1304321976ef7e17758576da014091c0dce9046c4fde6b0ec4cfa1dce998b4b9130e646911d4d1dad983bd530d06b SHA512 c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448
 EBUILD xf86-video-fbdev-0.4.4.ebuild 359 BLAKE2B e62bbc0e75cf6f9d63785b0de8f8d1fe06605ceb28838095a371557fe734ea7e3a56cd9dd3d233e528f8447aa9dbb2164f07570bba3d52f141d8296e624a5626 SHA512 a0f879b991c8ba2ea65af475bc508dcdc4f08e8080f150a73ab88a54a7492860f2c0f0dd0482d339b49ccb92be9e7f2d7191c96da8e4dd4e9f1edd8fdb025581
-EBUILD xf86-video-fbdev-0.5.0.ebuild 368 BLAKE2B 625e431e80c5cc999004bf90621d0667fbbe7d1aad29460ff0995bba42832ce2ecc23f8600d4c41b11bcb81e113e64d90e65fb1ebeebb0c4a24449053204216f SHA512 985adda53cc886a8b508507e1e676765ab4c2ae43e9552960a39d9757e4012c33d4858840af0f5181ea86fa3850c5793fcb4a06d9577342afc9177047c224f15
+EBUILD xf86-video-fbdev-0.5.0.ebuild 362 BLAKE2B 8dae4b1058255efb2bafc96e30057243c23b608470cb1f58e9a006721f4fe6dabc29a1b204bd2d06ce3ba92e0b3efba3f82c92b8b7fc0942cf4adef3dba7c8fd SHA512 7ebf350c736afffcff72560d9ba16b426111b3ee0acbbd090f5462fb3d0cf714759239cd9ce698fd65d60a55c75c41b99b04d87dc38aa8b2fc7587d3cd23aae3
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
index 420258d15ded..6835c48b05b1 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server"
diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
index 13d18089bc8d..42a4ccc16f8b 100644
--- a/x11-drivers/xf86-video-vmware/Manifest
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -1,15 +1,3 @@
-AUX xf86-video-vmware-13.0.1-damageunregister.patch 1095 BLAKE2B 165fe9d5db44cdd0fd608a06f389d90bd5f1f3c9097a2fbeb16ed2c52cff4973c22846f410e2e21322a0237c8371258b7fb77a857bea9204fe1719c5823696d5 SHA512 d6b9a37dba30b7d47624f86f824723fa4b98b8b06072b33439a65ba44ff7c18123dbefd5aad7d19c079c3bf6028d683d9c852b014428fcff79412bee779a0efb
-AUX xf86-video-vmware-13.0.1-xa-compat-2.patch 830 BLAKE2B 3fbe88590f5305ba6bdef10a4421d8d2ac358dfc275593033720fb337bba5fd32dc095db610a77d002bb251b55a5435f33970b904a2b91390e734486870f63f8 SHA512 332ce8c6f0cd1a19a3b718cc07a599bbb73f9c34a146be2f18e8ba1596dfa4bd4e0d5ed95e4b593bc17fb11601d3c1b9b47b146836d56bab361dec26c8a41b8c
-AUX xf86-video-vmware-13.0.1-xatracker-2.patch 5781 BLAKE2B 26c81fb8783d79185d71993f7be8203a226a82a5f70c9ef102c7cbb2f3ebccb3c7ca5d7ccc2bbfb21f3a6b4d08b3015b175525996648c628b6b995658bee2558 SHA512 5325801b0c5f228d6241df62e16de5505d670bdbf77888ecefb3e7d7c83822070e8f9295beea9dc51ab714163b7825200e5c472042248b389911c57e275f0e8a
-AUX xf86-video-vmware-13.0.2-fix-includes.patch 1396 BLAKE2B d9d525e28e57dcda0053434918837462b66766b28b481e6a217e217db66a8db99d3a2d40e5f119f202ad49090e7a508b47bd5c777b92228292d51816d65b920e SHA512 5e0d419952e0f9ecc56a9b34bbb55bbd4086682a8ca1500244799f3283244365161e1b26ffa62fac8c5b46d6b3bc0c3d02dff704cb58ba26f3c0b644fe80f3d8
-DIST xf86-video-vmware-13.0.1.tar.bz2 432401 BLAKE2B b529f27deec2a254862140f3e57fda471f2bca97d300c8b7d479d4a54f41c4a77703d6b2d1f33913cc6122850384f7aef9e29d8e5c3196adcd8deea5c087a9ac SHA512 2faf5fd524dffd2cd89a8b5a06b5470acbc51c3ee4f48bafc425b8e9c7c76d294201651cfb8c1d104c313885108e22abb6da736de1f3dbcf134a0926158ed147
-DIST xf86-video-vmware-13.0.2.tar.bz2 438773 BLAKE2B 49a7176813b2b399537d6e3f017765eed8309ce76661048535967cd1991700e2fbf7404a53d23459875a97fa538e77ed93aa5191090ffb09ca61528994864a54 SHA512 18d6867c0bd497d9f2aeb96d04b26fa0e3af1d37ae7628d19a8c1e829ef1df825371225c68e140d4d65097fa53178e6f1a7d3e371a623c9ef6cd98cccc0f826c
-DIST xf86-video-vmware-13.1.0.tar.bz2 459255 BLAKE2B a675ceb723c3609f87a08e0e4975e8c705feb5761db8b5ceded803ac86f8b6a73445b3daaca12f26506aed9303b8df175261f13b232e621f60ca0903c3d40dad SHA512 43d6a15e40896c793e49a1670b937e417271baff15b737b6b8cd3845bb7d2fc6354bf53cb40350caf0e7aac1e005a0fb2c9c80ce25690678b79e8e48f05f1de0
-DIST xf86-video-vmware-13.2.1.tar.bz2 470601 BLAKE2B f0ceb9d1d2c791f7bb6a88b44266949aa7e09747d051b9b0150ed791ce56d2140bb809930b439a53c72fdb698b16e61738f4253ef51010bc39c5a4540419d583 SHA512 9c48eaf5be6ece5685e07a53842083d091edba482ac0ea8318ac5b0adb9fc468f932685e4bdaf7e565f7a1cf723dcea2731616613798ebde2bbc18418a369a9d
 DIST xf86-video-vmware-13.3.0.tar.bz2 473527 BLAKE2B 8916c5d95d4347ff3e874d4131a32660777c0e3ab6808b537cbe668c30cf775ebfd2fb7900aa43f6a34d0578ceac4545614024498f6f0143e9b07035f6e99c3c SHA512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca
-EBUILD xf86-video-vmware-13.0.1-r1.ebuild 479 BLAKE2B 6aae2267c7f21a8510161acbee801a0ea1c373675738d84b1fa785e39b513c36bcd3af771d89a5f2b19b96be3e2c03ca9e5890b632ea73532548f7d8fe79fe51 SHA512 63a326d8a58ae031ce15bb74ffaf15d8fd866bac6544a5913308c446836484fb86479548999180f92c1d114e070feeda64e782a4119bfcedbfae40d164195883
-EBUILD xf86-video-vmware-13.0.2.ebuild 382 BLAKE2B feb1067b9c63498338f449627b619040287fd8ceacc7811c8158e06a3bd8dc19a4d213ee720b69830f17e451c7b891f64a573840114d6d867e8993abc4819fc8 SHA512 b7374c9823bc6f3f326705caab8c3b858ff6296532b9f76e42e53495663086f38497f9882aa3164c5de4e1fadc4d4b0af6df0cfd6db02863c2cd2b8007218020
-EBUILD xf86-video-vmware-13.1.0.ebuild 367 BLAKE2B 9acc01f097f1abd8d724212734166a76c039172b77052fc65ffc91f1d40aeadcbaa69cd7a371550d608a3fe0f5bd38a6ef15e7f2198272294e8f80390ab4aaa7 SHA512 a97549539aaec0e8964db79c43a91d5bc299613a5333263662c0f0fa7dd04ca986f8ed1bebd308688d7427f87139955b72e3f1d315b97d9d459997940243ec86
-EBUILD xf86-video-vmware-13.2.1.ebuild 367 BLAKE2B 6bd0bb8f2d83c6ca5fb41ed396721dd6aefb1fc4b33d3d2f5ccf9132831dde8a86d087ea213a8d152f428a083c13940cb914e4451de3680036d78242c9687670 SHA512 681ff0529f319848fef188999d33e231b193d13a464b2f4a4f3c1b037fb60e2ca27303e9575977f36019a22b78ddbc309c489206fe960072891d886abd05ba2e
-EBUILD xf86-video-vmware-13.3.0.ebuild 369 BLAKE2B 5f47fe378a41ab4aa8b42a6702850942ebd78d6b520fbfc371094aca72d874d3521eb7189871b6438ffc577c54279dbe62b36c48b81e506871566cd6e8d9dec0 SHA512 d5c28c0f927a61c8e06beea79b3b8d693ef15a7673b9a0efb8878e898ccaddf7f4b62f026683849c8390eff94e945e14a8924fb25c7426417819f9bbe929f9e6
+EBUILD xf86-video-vmware-13.3.0.ebuild 367 BLAKE2B 5fa5c972ffaa111710abf95ebe2a9297dc5be9274d39eb8b3863370375ffabc2e433ed86269d773215ebf55f81035a4c9d7687812f2bc138e2b544038368eecd SHA512 dfb90019cea67dd916b20fb4f986330fdd945061a4ccd8d5827e59efe07ae82a01ae56cba5ae22a99652f551f7de338d4c6d18a0ec5ad70a6c5cd1500e9bf34a
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch
deleted file mode 100644
index 0b2a8e6869b3..000000000000
--- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-damageunregister.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001
-From: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon, 28 Oct 2013 22:21:29 +0000
-Subject: vmwgfx: handle changes of DamageUnregister API in 1.14.99.2
-
-Fix is inspired from the intel driver.
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index fd80682..346e7f4 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -26,6 +26,7 @@
-  */
- 
- #include <xorg-server.h>
-+#include <xorgVersion.h>
- #include <mi.h>
- #include <fb.h>
- #include <xf86drmMode.h>
-@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
-     if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
- 	return;
- 
-+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
-+    DamageUnregister(spix->damage);
-+#else
-     DamageUnregister(&pixmap->drawable, spix->damage);
-+#endif
-+
-     DamageDestroy(spix->damage);
-     spix->damage = NULL;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch
deleted file mode 100644
index 15f603c3c569..000000000000
--- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xa-compat-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001
-From: Thomas Hellstrom <thellstrom@vmware.com>
-Date: Wed, 11 Dec 2013 14:54:02 +0000
-Subject: vmwgfx: Really allow XA version 2.
-
-When XA starts to correctly advertise version 2, we didn't allow it.
-Fix this.
-
-Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 6301c29..4e28097 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -79,7 +79,7 @@ typedef uint8_t uint8;
- 
- #define XA_VERSION_MINOR_REQUIRED 0
- #define XA_VERSION_MAJOR_REQUIRED 1
--#define XA_VERSION_MAJOR_COMPAT 1
-+#define XA_VERSION_MAJOR_COMPAT 2
- 
- #define DRM_VERSION_MAJOR_REQUIRED 2
- #define DRM_VERSION_MINOR_REQUIRED 3
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch
deleted file mode 100644
index 9435f06ddd7b..000000000000
--- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.1-xatracker-2.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
-From: Rob Clark <robdclark@gmail.com>
-Date: Mon, 10 Jun 2013 17:31:31 +0000
-Subject: vmwgfx: update for XA API changes
-
-Signed-off-by: Rob Clark <robdclark@gmail.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/configure.ac b/configure.ac
-index 0631bcc..dccfb27 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
- 	PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
- fi
- if test x$BUILD_VMWGFX = xyes; then
--	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
-+	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
- fi
- 
- DRIVER_NAME=vmware
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 7de0772..2f007f0 100644
---- a/vmwgfx/vmwgfx_dri2.c
-+++ b/vmwgfx/vmwgfx_dri2.c
-@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
-     }
- 
-     private->srf = srf;
--    if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
-+    if (xa_surface_handle(srf, xa_handle_type_shared,
-+	    &buffer->name, &buffer->pitch) != 0)
- 	return FALSE;
- 
-     buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
-@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
-     struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
- 
-     if (--private->refcount == 0 && srf) {
--	xa_surface_destroy(srf);
-+	xa_surface_unref(srf);
-     }
- 
-     /*
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index 7863ba2..3002285 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
- 	return FALSE;
-     }
- 
--    if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
-+    if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+	    &handle, &dummy) != 0) {
- 	LogMessage(X_ERROR, "Could not get present surface handle.\n");
- 	return FALSE;
-     }
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 63df3a1..ed3c1ee 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
- 	vpix->malloc = NULL;
-     }
-     if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
--	xa_surface_destroy(vpix->hw);
-+	xa_surface_unref(vpix->hw);
- 	vpix->hw = NULL;
-     }
-     if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
-@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
-     if (vpix->gmr && vsaa->can_optimize_dma) {
- 	uint32_t handle, dummy;
- 
--	if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
-+	if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+		 &handle, &dummy) != 0)
- 	    goto out_err;
- 	if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
- 		       to_hw) != 0)
-@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
- 			     (int) to_hw,
- 			     (struct xa_box *) REGION_RECTS(reg),
- 			     REGION_NUM_RECTS(reg));
-+	if (to_hw)
-+	    xa_context_flush(vsaa->xa_ctx);
- 	if (vpix->gmr)
- 	    vmwgfx_dmabuf_unmap(vpix->gmr);
- 	if (ret)
-@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
- 				 &spix->dirty_hw))
- 	return FALSE;
- 
--    xa_surface_destroy(vpix->hw);
-+    xa_surface_unref(vpix->hw);
-     vpix->hw = NULL;
- 
-     /*
-@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
- 
-     (void) pScreen;
-     if (src_vpix == dst_vpix || !src_vpix->hw ||
--	xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
-+	xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
-+		&vsaa->src_handle, &dummy) != 0)
- 	return FALSE;
- 
-     REGION_NULL(pScreen, &vsaa->present_region);
-@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
-     return TRUE;
- 
- out_no_damage:
--    xa_surface_destroy(hw);
-+    xa_surface_unref(hw);
-     return FALSE;
- }
- 
-@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
- 
- 	if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
- 	    xa_copy_done(vsaa->xa_ctx);
-+	    xa_context_flush(vsaa->xa_ctx);
- 	    return FALSE;
- 	}
- 
-@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
- 	return;
-     }
-     xa_copy_done(vsaa->xa_ctx);
-+    xa_context_flush(vsaa->xa_ctx);
- }
- 
- static Bool
-@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
-    struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
- 
-    xa_composite_done(vsaa->xa_ctx);
-+   xa_context_flush(vsaa->xa_ctx);
- }
- 
- static void
-@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry  *entry)
- 	     */
- 	    if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
- 		goto out_err;
--	    if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
-+	    if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
-+			 &handle, &dummy) != 0)
- 		goto out_err;
- 	    depth = xa_format_depth(xa_surface_format(vpix->hw));
- 
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index 449266b..2971ed7 100644
---- a/vmwgfx/vmwgfx_tex_video.c
-+++ b/vmwgfx/vmwgfx_tex_video.c
-@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
- 
-        for (i=0; i<3; ++i) {
- 	   if (priv->yuv[i]) {
--	       xa_surface_destroy(priv->yuv[i]);
-+	       xa_surface_unref(priv->yuv[i]);
- 	       priv->yuv[i] = NULL;
- 	   }
- 	   for (j=0; j<2; ++j) {
-@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
- 	       REGION_RESET(pScrn->pScreen, &reg, &box);
- 	   }
- 
--	   if (xa_surface_handle(srf, &handle, &stride) != 0) {
-+	   if (xa_surface_handle(srf, xa_handle_type_shared,
-+			&handle, &stride) != 0) {
- 	       ret = BadAlloc;
- 	       break;
- 	   }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch b/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch
deleted file mode 100644
index 434cb679f761..000000000000
--- a/x11-drivers/xf86-video-vmware/files/xf86-video-vmware-13.0.2-fix-includes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4664412d7a5266d2b392957406b34abc5db95e48 Mon Sep 17 00:00:00 2001
-From: Stefan Dirsch <sndirsch@suse.de>
-Date: Tue, 7 Oct 2014 11:29:32 +0200
-Subject: xf86xv.h cannot be included without first including xorg-server.h.
-
-Without this the build fails on systems with the latest glibc,
-throwing this error:
-
-In file included from /usr/include/string.h:634:0,
-                 from /usr/include/xorg/os.h:53,
-                 from /usr/include/xorg/misc.h:115,
-                 from /usr/include/xorg/screenint.h:50,
-                 from /usr/include/xorg/scrnintstr.h:50,
-                 from /usr/include/xorg/xvdix.h:55,
-                 from /usr/include/xorg/xf86xv.h:32,
-                 from vmwgfx_overlay.c:38:
-/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
-strndup(const char *str, size_t n);
-
-This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h),
-causing os.h to redefine it.
-
-Signed-off-by: Stefan Dirsch <sndirsch@suse.de>
-Reviewed-by: Daniel Stone <daniels@collabora.com>
-Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
-
-diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
-index ef1d541..2b05b0e 100644
---- a/vmwgfx/vmwgfx_overlay.c
-+++ b/vmwgfx/vmwgfx_overlay.c
-@@ -35,6 +35,7 @@
-  */
- 
- 
-+#include "xorg-server.h"
- #include "xf86xv.h"
- #include "fourcc.h"
- #define debug_printf(...)
--- 
-cgit v0.10.2
-
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild
deleted file mode 100644
index 41ee92e97667..000000000000
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.1-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
-	>=media-libs/mesa-10[xa]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-damageunregister.patch
-	"${FILESDIR}"/${P}-xatracker-2.patch
-	"${FILESDIR}"/${P}-xa-compat-2.patch
-)
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild
deleted file mode 100644
index 029baa4fad5c..000000000000
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.0.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
-	media-libs/mesa[xa]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-13.0.2-fix-includes.patch )
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
deleted file mode 100644
index df20f6cc4cd6..000000000000
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="kernel_linux"
-
-RDEPEND="kernel_linux? (
-		x11-libs/libdrm[libkms,video_cards_vmware]
-		media-libs/mesa[xa]
-	)"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.2.1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.2.1.ebuild
deleted file mode 100644
index c8bddfa62215..000000000000
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.2.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit xorg-2
-
-DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="kernel_linux"
-
-RDEPEND="kernel_linux? (
-		x11-libs/libdrm[libkms,video_cards_vmware]
-		media-libs/mesa[xa]
-	)"
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
index 2d7a86e13987..3ccededf146a 100644
--- a/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-13.3.0.ebuild
@@ -7,7 +7,7 @@ XORG_DRI=always
 inherit xorg-2
 
 DESCRIPTION="VMware SVGA video driver"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="kernel_linux"
 
 RDEPEND="kernel_linux? (