gentoo resync : 27.10.2018

11 files changed, 606 insertions, 12 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 91ad9e96d602..d589e456cbe2 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 911056d5ed37..5c0564c44112 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -36,6 +36,7 @@ DIST NVIDIA-FreeBSD-x86_64-390.87.tar.gz 63648591 BLAKE2B 88aa38b11b64b2ad91f723
 DIST NVIDIA-FreeBSD-x86_64-396.54.tar.gz 60938322 BLAKE2B a23488b625a15703b0c40bc6871314b05d117d489f64a6f7c70ac3c934b02028b9623be10f0369c98c7d3b5e018e1eb6f1d2cde9d9e1b90be5065f06f6a646dd SHA512 52df85364bfd45a23394078855859ce85de996f7990bb96ba63eb33e516c3cf8e72c4391af9817213f735286f2cf6444bc8ed00312365f12ae17373cfbdc3fc7
 DIST NVIDIA-FreeBSD-x86_64-410.57.tar.gz 62103893 BLAKE2B 30313d5d0759e85ca9679e2fd5f7a6b816bf9d7b3afcb068b9de50639461d15ef3e1e0b552430271cfbfed32b20762f9bf439ed5f9450b3741c8b3436ac12cdf SHA512 1a7f0d32ce7619ebb9f6f1c1de3c1ef50747fe10864480529d6602534657cc8b9200970da080dfc0440963c00e9fb23f11e1904ced4898010757946c967af8a1
 DIST NVIDIA-FreeBSD-x86_64-410.66.tar.gz 61916683 BLAKE2B 835e40820339ce333a92b757087a09d8340cf957fa42257cbde1337b00c3156bb5ef23ba7c727b94146883c93e6a55a20ae5db4017d28f79d7d58b17d3b372d5 SHA512 c17d999c1f971ec597a6c52067f97f5395c5ca745d8db4b8c8f4d8519bf244b083b2ab0ac65f1bcf8b1525d18f1fb297092231edf7a7bb175befaaaf51601c06
+DIST NVIDIA-FreeBSD-x86_64-410.73.tar.gz 61931692 BLAKE2B 6746f4980a13f5e62816a0ad443a96151fe2053aa6df3184a4c36040a77a52673248474f5025707af1b36d3f3e90b30964f44f251ec804d965792c454b6cd0ca SHA512 3a9aed0996ab1a6cad935ddac669c06d79a82013fbc2297945d8c75fde1a05c9b97d785f230092dc7d931b81f668c8427980f4563ca46d3648b568ad023cf23e
 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
@@ -61,6 +62,7 @@ DIST NVIDIA-Linux-x86_64-390.87.run 82690871 BLAKE2B b43a45a7d48160a72185417360a
 DIST NVIDIA-Linux-x86_64-396.54.run 86946680 BLAKE2B 9b3ab39c9d09c663238d0fac6346c24feea6ecc44b0ecaf3de871522697685c1c474ec4cc83f3bab0a2bcfecc7c77acea0e6bfee6e8ca8e6883bd338fd6da8a2 SHA512 17139abe99d4f32ec87379ee57af2cc0fec7d24605b2be7e3cd6609d9fcdf871e3c1cb7414b3544e14eb32d2213fec7ac45b3261f27c8d6565d510ccb14a1247
 DIST NVIDIA-Linux-x86_64-410.57.run 107221029 BLAKE2B e873c9a21422fde847c10fd4286705e6ad6942c8a8f86cd514cbb8782f792051b1b1645990bd3a8ad025eeded853d23f9925b16a5bb108524346602462eaa1b8 SHA512 2ba6b4b7829410152e0fa57772969ca59f134995ef93d08c12cc6a7a97e081c1d718600a25f541444ce66603ed84b99e66b0ced6fb773ca40f98cd5dc1348d79
 DIST NVIDIA-Linux-x86_64-410.66.run 107130897 BLAKE2B 1f294dd1b248fede6c8a418ffadd3035a9d1c516b9b52a04dc2366fa7dab63993bd2d7d111c0bbc4cc12411bbb219fb504dec1e82e1bfb72a25e719917b32147 SHA512 1773ea5150822735cf02808df68cd2f9ff8b502633632a7748b4bff387daec44527f1bfb0508938c9eee7fb12ac070b99b3f5a903e592bf6d9c6461f4f7a7e9e
+DIST NVIDIA-Linux-x86_64-410.73.run 107004565 BLAKE2B c55655aefc410883b4b2c63305e3a9fc66ce2b611cd79fe8fe3225fec49a31ed73707fa4a6e1998fa19e7d13b859af0b5a5bb76f37109fbd9e39e0aa36afbac2 SHA512 2dca98babb4b2ce319089b179619444e1ef9b4b94c0d1981982c35a234f9e6934febe3ec3ca39cf1b3672a126b4290b1bc54469a0617b7fdebb4871cc4c75bac
 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
@@ -72,6 +74,7 @@ DIST nvidia-settings-390.87.tar.bz2 1109274 BLAKE2B 20eb809ceeade932e89592ac9107
 DIST nvidia-settings-396.54.tar.bz2 1116371 BLAKE2B 114b88f393b0909c8d84a56a280854e258d0e7e7ce800ee58547ef68b4989f22a3bbb380795472b8222493a988dc9308fc20ef03c81589448b518a12285cf204 SHA512 23dc3c61bef71200b3e8185940dd52a50dae7ca7f2b8a68fa96eaa937aabc87ded5d5f73081af51d1e7af2b78b0ec10ab80d28dadbcf10a046c32ec14db1d83c
 DIST nvidia-settings-410.57.tar.bz2 1115668 BLAKE2B 7c6554226110da4dcff9b71bde0f1caa9c857a170da65d0224db0c1c0445b34a91db2858d371cc1f0ddc895d361fe074b95c7c421dc55eeebe478a7faa313db8 SHA512 c909af30b31d32e1369970c9a52eae0cf8018be509ce8297f5a60d25a937ec1abe18dc6462f12c9b20fb52d83157c60af53eb599a353748ad976f7a0a67cd756
 DIST nvidia-settings-410.66.tar.bz2 1115615 BLAKE2B e9e608978849a9b3106745c80ddd85270406e1c1fd6c5353a19e54877a5b3e8aa3f169c06c669a2278a40f64e2cc27930565c02ff2d40250030933b05ecdb962 SHA512 90e4716622d9eabdc32b707fb139390f228db0d60b55bc5d1e3e15ead64ee47a49fd15e47301a85f1ea7dbfb5ae877e03d4b48c88e47db08f3c3ebd280abe989
+DIST nvidia-settings-410.73.tar.bz2 1115717 BLAKE2B 7a6ea49cfc378ba7c91c89be51d0761cf2b5a9e872de2169f59e236d75669e86b29719d0479c26d6194ffecef7f8a57e7a18f33efc9356b44299d99c683ccbaf SHA512 b8b95c8a03242b1793fb5694330d57446e06a2c2eeaae4100d2366a48336941b03a51f426648f78fe3b59f858f4261018f7cdd9d28d2bce352187f74b4d1730b
 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
@@ -83,4 +86,5 @@ EBUILD nvidia-drivers-390.87.ebuild 16288 BLAKE2B 2ddb885d8171c4f06c31460b54ea9c
 EBUILD nvidia-drivers-396.54.ebuild 15944 BLAKE2B e9741974f11dc113a84c55f9fbe863ee6a71e8f36b0ef372c55a775e4a33ae5a8cd1982357a1fb46cb43bbb863554557eae37ec02475427b2dbe1f4150b8ccba SHA512 5e3c9b8db1d22b475459b160d6c6f04d6f238ddd5601b85870d367f0e8530772e3cbce9f8dcc6d416c326ed5a153af8b8aba093a086ef8309e97211370736985
 EBUILD nvidia-drivers-410.57-r1.ebuild 16174 BLAKE2B a1557248b2f07b4a9025ed05f31fb59a96f2ab89209cc8267ef381da6e2fdb47746b3fdec46f00d10e6dc3fd40bbeb1472dd4efb1aea957108a8447ad2c79ea8 SHA512 5de509e3548bc0874079cbe8214639295f575bae473408019fe898e06b18412fc309496df3e4c205644bd97485a90c9ca825f665246c6f87a12bbf6dcf8d6ab3
 EBUILD nvidia-drivers-410.66.ebuild 16174 BLAKE2B a1557248b2f07b4a9025ed05f31fb59a96f2ab89209cc8267ef381da6e2fdb47746b3fdec46f00d10e6dc3fd40bbeb1472dd4efb1aea957108a8447ad2c79ea8 SHA512 5de509e3548bc0874079cbe8214639295f575bae473408019fe898e06b18412fc309496df3e4c205644bd97485a90c9ca825f665246c6f87a12bbf6dcf8d6ab3
+EBUILD nvidia-drivers-410.73.ebuild 16174 BLAKE2B e7ba8f1d5b63f7e012a7cb2e01ec25d791d7e9901d9687106316e723c230ca5e4a469c1adf554327bd3741dd801f7dad0a5e7920a3bda99f2dd6d3fe7429c3a3 SHA512 f38ee45ef5c9be1def85eb06b93df3512b8ce629b67004c4aca2ee47deac81823ab821e2711266992cea679c440717ba4f532ec3d7e2cf41fe4eefecacd8df62
 MISC metadata.xml 1275 BLAKE2B df5cb10ac396802437bf6efb3e80226124c11d6167bef2b64c3e525c17fb27213b13d7413ef909469440804a373b6e5c7088c53e0a6b44897860b7276ac3de6b SHA512 464ba5638a5d82a6e6bcbfe11b52759846f9f81e3f223cc313e0059b923427f21dab95b84595d6bffad4441fec96fe5f01044be572b72add8196a812f5682edb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-410.73.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-410.73.ebuild
new file mode 100644
index 000000000000..3df39be58609
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-410.73.ebuild
@@ -0,0 +1,590 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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 20; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-4.20"
+		ewarn "<sys-kernel/vanilla-sources-4.20"
+		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}/libglxserver_nvidia.so.${NV_SOVER} \
+			/usr/$(get_libdir)/xorg/modules/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.1.0"
+			)
+		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
+
+		if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+		then
+			NV_GLX_LIBRARIES+=(
+				"libnvidia-cbl.so.${NV_SOVER}"
+				"libnvidia-rtcore.so.${NV_SOVER}"
+				"libnvoptix.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-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index 5dd77fedad34..f4cfc6e9d896 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -3,5 +3,5 @@ DIST xf86-input-libinput-0.28.0.tar.bz2 374318 BLAKE2B b8629115fce658d9d432c05a9
 DIST xf86-input-libinput-0.28.1.tar.bz2 375923 BLAKE2B f676e857fd47baad848a9325dd23ff41d9f3a0e1ab148b4e0662fe5c47f1c148bf702189c16990defdc18a33378647373ca18a379cb4421043871ec44f1224cc SHA512 2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623
 EBUILD xf86-input-libinput-0.27.1.ebuild 424 BLAKE2B f2308bb6428e36ccee7681f3e37d978f6aaedef8f81d9f577afcc0d5f8d5ea11a301b7ff19d5208aa7c4d9c6b9e2ded8a5d097fc312fd909bfb118bcecc615ee SHA512 1aac87fc2723d9a1cf5cef59289a807f747b0e99561cdd0ada145ea24dfd4e486f86883f9bed77b05e428a847e924e9da7edf514d199dc70cb341e4cf950bbf5
 EBUILD xf86-input-libinput-0.28.0-r1.ebuild 434 BLAKE2B eeec242b7c0d1e7f7396ca98d9091d425ff25a850f000f8a8d34ed7ede9c26a9bc5d19468542bd2cf5996d099ea8abf80d67388be65f9b44c140c584266e3bf5 SHA512 345005269d8f91d1e9b2a05c4b5158c8109dba78bc1358c7ca31249b2f211655f335ee904c03228a558adb05ef35ff4bce80fc113c0c58f763c0dbe33f339748
-EBUILD xf86-input-libinput-0.28.1.ebuild 431 BLAKE2B 38beb24390f1775df812e229cd1671a564cc3c320d9653a05e8054655c68a3ee6efaa58a990a9ac9a5cdf9da481895b4a10f34e67bc48a77027294ae63c87391 SHA512 59835ed71f403fe8ca333cc1e4154c92483bee2487883b18c9d459675e9278c25c34dfdb37c4a3b3fe3493535c2d95975ff4014ee12fa202d8185419812c5273
+EBUILD xf86-input-libinput-0.28.1.ebuild 426 BLAKE2B 71bb9580815395fdcb512e474bd428f8a636d28af055d577acdf5ae09c269a532cc0692a49ce4014d68df2e781942444d7e6f25f60ac0e4b2585dd65b921ae29 SHA512 72ecab8060583e080a70f6428ab4a39c6e2388687036fb88be082da4d0ab35bb8925a7b19a9ca181e41a455ee0673b001aee6899a625f30d95fa9568532b911e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
index 5095d59d7bbc..a58729651926 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.1.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
 
 DESCRIPTION="X.org input driver based on libinput"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 0a7b2f4741cc..83f201b06394 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-video-amdgpu-18.0.1.tar.bz2 414683 BLAKE2B 767da468b6d2d41d49dbbc54093594163cbc42fa73d5859d4e210f25cac6822b7cb9fede4c73a15ac2221ef07a10df8b77f6f928b134382b373d5eedfde90225 SHA512 eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4
 DIST xf86-video-amdgpu-18.1.0.tar.bz2 430542 BLAKE2B c582c6d5357949833b5b9408e638e3037e38530f9a1d5e85936d1ee866effc4da1c56d7da2e8aa48cde73c09107968840262941e7b0063aa7d2aacfecc5bf120 SHA512 371f1a9f6cd2ce3b7117361222d196950c5efa01d957783c79a37c19a2273ce33d133fa51bb68432b8535aad61cb14fbb61d173a167d318b2533eb2507b7a903
 EBUILD xf86-video-amdgpu-18.0.1.ebuild 478 BLAKE2B 6ecafe6d38bbb2cf22c5023d65ef02848c43da18eaa0229446f90c0779daa15127d75e70b12b3d106be4fbc2dbb581a35c31ae77cba09307b3c08447d228a926 SHA512 bf5b172b9a1acfd6d4dd3e5981671e394fce667ac0786149536df933afdff80f7aa6ec523e7fed764f80650ab876756b1441b413afbfe7be085655296265ab26
-EBUILD xf86-video-amdgpu-18.1.0.ebuild 480 BLAKE2B a6269c9013f052ffac95225516bf7c2c537d24022597b380c2e76a191b5f5a498a9923589ee581d9c494795ee231c7d05f3c34b8820f5495593917fa50bc6355 SHA512 e0d351b013842529e7fc115d84a5e62684517f275a3ef4a0df5212001a85f2fe6769f224d3de476524b2fc53d4bc6ca4d15c3b772ed97c49319d485daba9145f
+EBUILD xf86-video-amdgpu-18.1.0.ebuild 475 BLAKE2B d3d5f60942be4b1baae4a73f2c43bcec78161ffd2d86148bb4d04d4292f74f3fd50b9fc7f029f0ba1ce179f67692abd72042d00433321aebe814e06eda9a32d9 SHA512 988242b2fa40e480d834eade07093263c82e9890024427211ede4d479dd5ea1983063981dc887b70e16e500d182a7169777fd63ff15fd5e44ca82aa0c1f571f4
 EBUILD xf86-video-amdgpu-9999.ebuild 480 BLAKE2B a6269c9013f052ffac95225516bf7c2c537d24022597b380c2e76a191b5f5a498a9923589ee581d9c494795ee231c7d05f3c34b8820f5495593917fa50bc6355 SHA512 e0d351b013842529e7fc115d84a5e62684517f275a3ef4a0df5212001a85f2fe6769f224d3de476524b2fc53d4bc6ca4d15c3b772ed97c49319d485daba9145f
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
index 90a061997083..7e47777406d4 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit xorg-2
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index bc4ffcab5ab6..603fb14a0df7 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -2,6 +2,6 @@ DIST xf86-video-ati-18.0.1.tar.bz2 881457 BLAKE2B d45ae191239d008261230804161545
 DIST xf86-video-ati-18.1.0.tar.bz2 891953 BLAKE2B 9092554c708b583f9b99a6788104a1e9420537fbbeaaaa6ae7e82be2a2299ad834365d00f8b146ce845afb5e2a08d3de3da591143eff63d4fb34c7040251f443 SHA512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53
 EBUILD xf86-video-ati-18.0.1-r1.ebuild 882 BLAKE2B 0c93dba335511fa8ee7ac33339b9f6edfb2efc620fe36869f3b155dd62389e534e752672fcecd39ce62a3e1fe14d125e995e9974d4fad56301c55db38c49a5cd SHA512 b6747348e5c01154999a9e3da2807abffb0cb9632bacee4bf3390e3e0df3ce2debfe8d3b0839b8ac615d282724aad2a13644e05e84b3db163f304fa172749bc0
 EBUILD xf86-video-ati-18.0.1.ebuild 877 BLAKE2B 603b0e38c741bdd7716bd6f5cde3bae5863b4b8ab4866a377b9f9f6a836b1a1bd8572a517136f72020e5613113cc7e6d8eb6686db2d64510ca55ba2f1b51d2c1 SHA512 7e685d2adfe1ab320e6d241a46b6063713d5ad3b6635c4fd0316bf9d1635188a6f6f80d844ef033cd0b49e6e9622d93fc40d0ff187af3eda85768780dfd8c293
-EBUILD xf86-video-ati-18.1.0.ebuild 889 BLAKE2B cb3053d3b4d9559610a574e422aa6056d66ec852c34f56796bbd60fc84f4f0bdb5fa4aba0f38d70c70bc2ad9dc648783990d35718f18df099ed4c7f192f83079 SHA512 b74c5488cf036794ddb05040782f9a082deb518a22655c6a9eecc53b50bed3167e5599cd2cef6f1cea380deb7e78636510b76b7e2df8f5b36691bd90e0b2465a
+EBUILD xf86-video-ati-18.1.0.ebuild 881 BLAKE2B 42270a0d803a878363f9ea9fe166a4226777b343785a563583216402a36e2dcef5ec1d6c6e72bc0366797c25826d3fe8202c6999baa663452f4fbb1987909335 SHA512 44f21864951796130a08fdf27efc85b1e2504baa45d73d7d54fe8651bba176bbb9015e60f4b796b227db299e9246fe8dd024ff70323e827373b908af1b2edfe8
 EBUILD xf86-video-ati-9999.ebuild 889 BLAKE2B cb3053d3b4d9559610a574e422aa6056d66ec852c34f56796bbd60fc84f4f0bdb5fa4aba0f38d70c70bc2ad9dc648783990d35718f18df099ed4c7f192f83079 SHA512 b74c5488cf036794ddb05040782f9a082deb518a22655c6a9eecc53b50bed3167e5599cd2cef6f1cea380deb7e78636510b76b7e2df8f5b36691bd90e0b2465a
 MISC metadata.xml 308 BLAKE2B b9e4150ed35f39b333f5ba4de65f52d82c50e5a5d1b3ca46f14b8a9a5d0ae12ad461f0f376a93d7312a7e4b2ec7a7529e137b0eada1b85f1db643739083cf20c SHA512 2f2c9a682e7aa5c413561df59a02c5dc7f77da6eae4513e93196b7c76d0ca9d76dffc5c644e77396afaa86f922947ed1cccdd133d161f1c441a28554eec68708
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
index 3f5390aec7a0..a18f3cd17146 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+	KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
index 0bc2ebe1a0f7..9ac4f9753635 100644
--- a/x11-drivers/xf86-video-r128/Manifest
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -1,6 +1,6 @@
 AUX xf86-video-r128-6.10.2-fix-stdint_h.patch 194 BLAKE2B fd054df8e84c8db45c054b6405fb6414d56045461183e49a7bf8d5ca1bc7ed6dea50c5de9bb9893491d5607a4288725527f0532d2a194ccfc5d5bfd8b9446f40 SHA512 fb494532052ba73cabe52d8ac9990a994067f55f9dd56f39edd923bb5f4f2fbbd16333b3c1e5820135f21cb79a6b12745b2fd769df0317c1126ccdc1d6dbb9d6
 DIST xf86-video-r128-6.10.2.tar.bz2 504031 BLAKE2B 3d74d0aa82167f8e883b0a92e6d57cf688f36a45971b03327a2fb8171133fc155cd0f233b854f3c3f9713b478c1ac2cb0b4cac124d49431c8429a954a71c68dd SHA512 564b65454ee538c1b9dc5d22a52a57bdff0c1f94e1832719a8310699cee7167c1ca8fcd26243dfc4089832b1fcbab9efafb69c9061b328532f689d02a0acac23
-DIST xf86-video-r128-6.11.0.tar.bz2 482903 BLAKE2B 04222bab109be719cd8cbb4d759d0ba98563e2348b95bce30c48e65d2da0964386d46ce57ade9162e817b6db797cab330fb454e363304479cb87e30d8404f310 SHA512 1211cac52f65010aa4e168a173660186ad2b8595688a910ac545b0321d0d6879e02284b3bb26779faf3cf5b3b3031f33adb63ff596fb55a8f7a1f465ca0db1ba
+DIST xf86-video-r128-6.12.0.tar.bz2 483999 BLAKE2B f3433ce0289a7c356b69871ad4acb9ce9b0a947c1bf6ee9bf436a5d27ad1324fc81bb2d3c9be16ddf588f286ae092091dafd161c39ce8bc1bf20b6cb36ffdb72 SHA512 0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38
 EBUILD xf86-video-r128-6.10.2.ebuild 576 BLAKE2B f06b52058b47d8beafa75e47d32c08d77c65a9c8aba7f9fb4c6bd442447df926c53140dfd1bac012cd06af357b33c5fa588f6cb30bfda88184c80fb1a4a0b6fc SHA512 d8eee58f13fe73efbb8f2ce728f124c34fbfb8ba1be01eef9a2128a3fe27e4d41a91c5cf8549f2737b586a641ed78765ef6d2537b390638c1f60a1232f209601
-EBUILD xf86-video-r128-6.11.0.ebuild 532 BLAKE2B 9dfb63bfbb7344b09d8102b0dd4f8b79ad2d6ae4d3d99c77e8385bea8b01b62e3739f6b0f00804105e448afb6f6c31d89554b25b36c72702d886a316d55c421f SHA512 b610fd0a277841d0524f60a7be8527a3eb70e0c990d33d51d700fb3cd21ee5eb788f85d5f4a65aad5afdc9aecf8c7e69388c0278ab2b1c2ddb6d86fef52a6c20
+EBUILD xf86-video-r128-6.12.0.ebuild 524 BLAKE2B 8d713708dee8adc2348bd0977128c5ae964ab9b9dbc8aab735758aecea95737e988cd9e7bfa2369573ffe7603d7f497b3ef1354209fc76fb6b7563f353a4d3fe SHA512 64101499f8816932ad77bdab29c05bee6e4684c8229c34aeb00080bf6fe379c4bdc93ff3d86a79f13bd3a7a38ab5d244d723efda11d1b3c06d7de3d41f02a318
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.11.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index e770f425a248..7f490f56e3d7 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.11.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit flag-o-matic xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"