gentoo resync : 05.04.2019

27 files changed, 608 insertions, 131 deletions

diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index c10baf251b09..7b0d73e1c80b 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 bb2db4752f07..08a41d296d2b 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -19,6 +19,7 @@ DIST NVIDIA-FreeBSD-x86_64-390.116.tar.gz 63651658 BLAKE2B ae1714b5b279dd6f552ed
 DIST NVIDIA-FreeBSD-x86_64-410.104.tar.gz 61995820 BLAKE2B 281b7567fcba6e7457bcaf5a91759670ca6f5f041efbd407237852a31dbd6d13f1df18d54cede17b0f8acd4a66fdded123de91691938dee03be077f1cf50e29d SHA512 77097ec2bc446a18f98a8da93964033054cab2e79759d296f12d1392fd65aec51c279c2823e3bebf0ccb3bb1130c5f03998f71ea1d6b245af1daf890ec8f3304
 DIST NVIDIA-FreeBSD-x86_64-415.27.tar.gz 62389955 BLAKE2B 39ac5970ef1a6ffbb03abe8b758a6f5d7eaca787231845fa4b4bff5f26aa770fb7c695bbd5585d919c934c65b9ed0cfe42f9674bcaabd796c9bd8b89cea87ee6 SHA512 857d1523bad2fca21c75b45c29066be0f530afa8ca124806bcaa36509ac5135df1c4037e6b09e5718c701f085b3608925e2b1fea45d0681e69a99ef709c307d0
 DIST NVIDIA-FreeBSD-x86_64-418.43.tar.gz 61479168 BLAKE2B 7ed91e8ba7c93ab69f45a916fb200c40b6d4ee66018d11f1216fc64828a5c402bdf45cc34a44444a19abd2af59d6844c7a9e0d1b858e9c0c3cdd49b3abbbb3e7 SHA512 1ceed9548be7a0ef9b5f4094e60a7c0c9f707d152f5f7d41d161e5e008b0266b0e178c4c9252b073e2cc440fdb6b0952ccce87dcbf4d5d13a86b4dcd790589f5
+DIST NVIDIA-FreeBSD-x86_64-418.56.tar.gz 61498228 BLAKE2B 5c02af2e627880ab2c807e82de1c01fd3a58cb6304ad9aebfbaefdf7a14e80791c2e8cec061e1f5faef03c10094fea7a813c6f064b4c42d2e608d33b034282d2 SHA512 e956e20c6f2626693078a5bc76687d72f83ed7261967b07c943ddfcbd6a0f59cf3e2af50595fe948dfd78fa53ff601edd61da84eb82f75f7ea0615929e3e7ee0
 DIST NVIDIA-Linux-armv7l-gnueabihf-390.116.run 28852021 BLAKE2B 82eb44ea1bd50610218c9ffe4f7e586d2541cb7d0ca6692feeb7a26ea323d7304e2d09e77a20e02fb529b19d2ca75f0819df07c3cd27d72a5b6d9ceac6984fa8 SHA512 7aa93f42a36aa910388f901879659e0b03ec8a272cee3caac553b960603417e5b23f1bd88d9dd5892f3509d7a029a29c067200c8ed577ed98aa24f034dd66475
 DIST NVIDIA-Linux-x86-340.107.run 39016798 BLAKE2B 2632c8f257d0cf7c5b9294eb2c0b763eee6feb60eacc316024655971e4d067c4af6548aab3b7b2b295792b064f3f3ac3e6403a2ecfa096761d308dfb6b2569b8 SHA512 0add713942bcdb639d19b5c36f5e0cea14f9e07490191d46dfeba0515ede7700fd8e9467ec531d38329fe1e76bf45905e70e0d440e7bc2dc79c1d767eab03338
 DIST NVIDIA-Linux-x86-390.116.run 47707973 BLAKE2B 33b58fb600df83d7e132b428de952f583f1d300af45ff00c4302b48625af370baddab0ef34974dbe26e284cd907e27c024c80f9453abdfc6296bd2575c6481df SHA512 be9aa735d2d0a3e14b4a7dddcbe74ef156740365e93eefe853a03ecae392af6875add41307b889e59d62516f7efe292b12c0a9a29916e8b4ce144b817eed2c39
@@ -27,11 +28,13 @@ DIST NVIDIA-Linux-x86_64-390.116.run 82282245 BLAKE2B 4dc5a1455eca985be5831e8670
 DIST NVIDIA-Linux-x86_64-410.104.run 106042115 BLAKE2B 2f977d6afd5484fb630e2eeeca3c7394f9e4c65e471ad426ee450cfb61eeed149938735107f166e10acae320fd71c020fcb74662fb350fa6f9dc384fe68744dc SHA512 fe21a4d89f4ed74fb597c529d45964b9b5aca6ac58729a0a5bb8d6a3a00eb8f44a20807d12ad778989a7cb120943c8ee537dcfaa63881d121d96df110cc3b419
 DIST NVIDIA-Linux-x86_64-415.27.run 108399659 BLAKE2B 05fb81a4ab8626d0170a30b70ed114c639ba7f0e5ac260d2f38cb5042a4d6052e40ada51cf2feff6bae0f394781d77cb70014f390873a715b7d9495b86918bf1 SHA512 5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6
 DIST NVIDIA-Linux-x86_64-418.43.run 106650554 BLAKE2B 296516f37857dbb13490dfa14b94a2dfe7b1becadb9668422879f0d271ecf5d755716dc79f0e647d2ea860436a5bac6e520ffa93a9d8c57aec2307667a1b029e SHA512 bfd43bec59de7523e879354224f2a678b6bcce53136f10d139882d9ea5d100c034fce2a15100607cb4622a3d158dbbfb41aacc528b04307c989c915b78298045
+DIST NVIDIA-Linux-x86_64-418.56.run 107195640 BLAKE2B 9455b06709999870dc9765022927d3e8cf7e3d0fe95c5978940c24764c6f89b581df2a15e49dba286ff5d9ce4ea1d66a7e3c2ab183aa75f9ff60fbd383322cb9 SHA512 859b9a27b75416f269037f4ae2af16b4807c704edc63d70be4b2ea96661ef29efde8e4793c015a25ce56a55ee55a707273e9ec55c9d6e3a0caaf8442ccb43910
 DIST nvidia-settings-340.107.tar.bz2 1549413 BLAKE2B 127442ee2c35ceec47ab4f103bdd2d0278c621fcb9be47051111f6f8728ef5699bdc95fe33a3812a807c38c4868b04c2176e2ed218a422171d2a88ac0c00de96 SHA512 593e7e83aa350a3a7beaaa32aca8660d7e203f6f2e460a6e6eabcdc092087f9917ee4e6d141e37ad4e3b0a1b9908c085e4a71d2f579e481a03bbd1c6f75ca776
 DIST nvidia-settings-390.116.tar.bz2 1109033 BLAKE2B ddcb74c9ecd2134ae39b6d08a81f0d6e454e00274a28d85cc7946961ab361a97cb1e7f94c1771cdab4b2d1b20f0da070ab4ae6acb906d407aa6fb22e9e5de1db SHA512 7ae0d326b4704986b17a53c5278219e3496c11ad0ee38a50bffbb56c70412f68c135354fc13d390737131a9df4c0fbeeb3bea7effcceac1f3b71016c60d760c5
 DIST nvidia-settings-410.104.tar.bz2 1120639 BLAKE2B 75554b0cca7c022a0f1cc02091f81ccd930e30e1dd5f674cf35b0cfed83c5e235c360b0f28701d39d42017b35b816f975ff177398eb9f59280851c0b8bfd57d3 SHA512 08d938117fca4d471bdff451219e6772fdd1e9c37c0ed623be8506c1cb5ce7ccde4d073848ade9f5bfca14b1a3cf9eb90b4b4bf44375bff43d023815b622b424
 DIST nvidia-settings-415.27.tar.bz2 1128013 BLAKE2B 36513252ff3d5f2036c80250e012d79bebfc14daff56fdaabb032856f5f78ce77cf4ce32d6eaee5fe4c1a18db63d5c69d6848517f025c711f133e28b3e509396 SHA512 5ac3b673c41194a1952ec10cd3c961aefd281bb044ecae5c9d11cb55d4555fed44e6056b5a2e97b5b87687743cd7f702f33ce7e0f841f04c8175d63693a24594
 DIST nvidia-settings-418.43.tar.bz2 1127336 BLAKE2B 622507f841da051a14bbbbb44b1364310d4224d54b5b00f09a9a2706fdf5900b0a2ccd9be4c94d8d4793158f3ed9cff40706795f29c314312470f0b420dc5104 SHA512 f2750684ad261b820414b78b20f9bcfe2a68f95283a646c75bf488c2dc4b78f3e3732df2839c8bdb45619a53df3712bc6dc575a22fbdcb8edff3c8aacf570a3f
+DIST nvidia-settings-418.56.tar.bz2 1127327 BLAKE2B 51a646346c2e1362900ec88b94878e938a01b72364539c2268c492b876231ef515a1fcae198240f4f4332f315c61b5b3f3917bea6043f614a745e0a60319c6cc SHA512 8ad0803fecf7dabda8e3bcb86dd95fed92e30dd244321ac6309d17626374d681c3860a8adbd68d236427d803838047f2fdaba4010f4f5ac38015078691516250
 EBUILD nvidia-drivers-340.107-r1.ebuild 14338 BLAKE2B 2c47991dc68e8e9a4709dde9596dc4ca3024484a327030d9e6fbdb27ba0f8a461fdb3937a76439191cec3eb09367a2941e0fdfbec6a288fc0de8c2700c2c2c59 SHA512 860f184f400f4f63dcf5152b5daab3d99c07920779413558cd1f5a6f624ff744ee529577151f0b667cbb87a8a6852e8ffdb0777562f67b440e098735ab548886
 EBUILD nvidia-drivers-340.107.ebuild 14336 BLAKE2B 9643ffca2bc0701291c4f652f130f45f78bbbe77006836de6ba0475174c8792f27046da39cc26b1b46fa46856c4b34cd9b8b0fc523b24e63cf13222d16176aac SHA512 595b0f9f702638ad458d20ab9e1d9515b24845d8c527463fc79dcdb3f910edea2a4fa3a0110d219c2b64e7782f55cf8e7c0701a3e3d5107c3f46f8f4630ad691
 EBUILD nvidia-drivers-390.116-r2.ebuild 16280 BLAKE2B 43fe015e30e5839d194c90d8a4a60fcd63aa6e1b6e68b6e32adf9bfdba11e2310d4cacf01bb7a3b3a94466b3537825ca862a520c80ed7e69def3c90a29afeaef SHA512 63fa021a0137605ead24268a96279f50e32d2c8b1039a1b943ffe4d680094bd21eb03a216fe9944e49dbae2aba5b5df3dfad29932f7736ffa974af114dff5dac
@@ -42,4 +45,5 @@ EBUILD nvidia-drivers-415.27-r2.ebuild 16179 BLAKE2B 8e5b2502956f18d5e5c2253507c
 EBUILD nvidia-drivers-415.27.ebuild 15939 BLAKE2B 5f3836bb7ccb8d63e2f8d01b5867463f30b9c3f775233ea20a004cac7aeea02cab323779322435ea53070e5290c55f255f9e6c005cb3e7428e0f608a63c7b6d5 SHA512 edb51b164c85a209d9ffb073c2a7ed5504a3fc054c46101164435000e539302f11619c114650069694f1cea074311feb1d2c301aca159e52029c3440695924e6
 EBUILD nvidia-drivers-418.43-r2.ebuild 16026 BLAKE2B f3ae0e7d798f79ef161c1fe813fe80f799058a6d6da154aa0496cb75228d627f5950a27e6014bb93761931fd33c7a5181856ae964306a41bee78f464dd1af3ca SHA512 62957078e1e8f8e0723c27f579a308a90795bcb1ce910535269daae35235ec5025e16cd4e21344106b0a75add7d1cc60f5142260d50c55be0e9a18eec4a98e77
 EBUILD nvidia-drivers-418.43.ebuild 15786 BLAKE2B e06459dc2d4f157371d3cb13137e12ee0ffdb8faab315210033b094fd80f7921ad0b36dd026331d96a808040365e0c6a5d3cbf9fc4949933c32d5477348cf7a1 SHA512 17196c5f09166acbea0de37d5663385fafa29086084bd5ad2261e30bdab37e61da1d3e0f06e7952b9a95ac2b9d7fd926cbd23c58526d3d0fc3fc0e69c486f89b
+EBUILD nvidia-drivers-418.56.ebuild 16026 BLAKE2B f3ae0e7d798f79ef161c1fe813fe80f799058a6d6da154aa0496cb75228d627f5950a27e6014bb93761931fd33c7a5181856ae964306a41bee78f464dd1af3ca SHA512 62957078e1e8f8e0723c27f579a308a90795bcb1ce910535269daae35235ec5025e16cd4e21344106b0a75add7d1cc60f5142260d50c55be0e9a18eec4a98e77
 MISC metadata.xml 1207 BLAKE2B 6fd00cf82a2940c84a3802484c9c752e5bd9786158f6f6e983cf5fe56f5018b7f1f90108525234bf8c98b0f63abba54a468509609f34b9e7647f7bfa7491bea1 SHA512 2a3274c9c81c05f1d722974a5f73dfec9ae778745092c4441e441d87f2554cb0c4822e8ce63c89a90e11d7237e6dc5a3a11ca12cdfd9813054e3abf75e7f9ba1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-418.56.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-418.56.ebuild
new file mode 100644
index 000000000000..069ac0fbe702
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-418.56.ebuild
@@ -0,0 +1,585 @@
+# Copyright 1999-2019 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/"
+
+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="https://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 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 5 1; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn "<sys-kernel/gentoo-sources-5.1"
+		ewarn "<sys-kernel/vanilla-sources-5.1"
+		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="!DEBUG_MUTEXES !I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+
+	# 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() {
+	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
+		BUILD_TARGETS=module linux-mod_src_compile \
+			KERNELRELEASE="${KV_FULL}" \
+			src="${KERNEL_DIR}"
+	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
+		if use uvm; then
+			doins "${FILESDIR}"/nvidia-rmmod.conf
+			udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+		else
+			sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+				> "${T}"/nvidia-rmmod.conf || die
+			doins "${T}"/nvidia-rmmod.conf
+		fi
+
+		# 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
+
+	# 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"
+
+	# 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
+
+	readme.gentoo_create_doc
+
+	docinto html
+	dodoc -r ${NV_DOC}/html/*
+}
+
+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.2"
+			)
+		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}"
+				"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-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
index 207ca253abe7..d452831a5df4 100644
--- a/x11-drivers/xf86-input-synaptics/Manifest
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-input-synaptics-1.9.0.tar.bz2 501814 BLAKE2B 7720136dba4e3cb76d21a9624e7e684bc09e22ebd0bc3b53fb170bbfebc29133dcfb471df326ac7b2eec1e4d3e2a3eeef56e57f649ddcc8f4d5e66eba9bd28e8 SHA512 71171ce59136b1c85764d412f9039d6252c94bb2ba44c8c6348aef6509d12219ea17a026440b0e18d26f4d7853d4ca5713eb2404d39deebb8be82886ad57bad4
 DIST xf86-input-synaptics-1.9.1.tar.bz2 503722 BLAKE2B 5ff2f792d187ff0f3fabb1ee194f4eae1397d993627ef3a74b1c838cd611fc2834c6453b57d0dc27d7a6e0bc69b717eb1cb76c87833dd1c66b1af5ac824e1d55 SHA512 978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f
-EBUILD xf86-input-synaptics-1.9.0.ebuild 895 BLAKE2B 08a1e1ade11ff6d0cfaf10210627fbec65d82980c27c6997d26749588beea21b20d29af017077b26d8c53123694b1e7d68710fca96d9fbbcc66fc1cca9866482 SHA512 859c4152cb4cee9707918aafd3ad9d0b3faad6bfbfcc5b64a32e637696c730988aaddbd5b6953885c4aa9c566346f3291bbb395ef8c15b9046c0af81ea002915
-EBUILD xf86-input-synaptics-1.9.1.ebuild 899 BLAKE2B a378c169d6155672d675040edc4e290c92a4b0dc25bb827fdf81f13c5759706adecc52a9e2c28f8199fb82ea3fa070426f46634c1e66c96415ba22e2d44272c6 SHA512 61dfe566d83531e7b83fa7df71a3655b030e911821b13c8ecae8841b942b6dc47b85d1c71930dc0a85d21ae672903ec021e36192e51eccba34c574d38df32b67
+EBUILD xf86-input-synaptics-1.9.0.ebuild 818 BLAKE2B ddc270a8d1c4a813705dfefeaa5dfa65c1948667e780eef6589cd91b41334da39e360fae375610c6f0618b3c64e4c96b6b747b20098745518d62b6c215062622 SHA512 0f9da16f9ec81fe0902250884ebba5653054bc60c7f41d867d71797adc0af1fccecc02afa87e58d8761e56e271ff81df402f5d618d79cd3a551be3a47d8c4be5
+EBUILD xf86-input-synaptics-1.9.1.ebuild 825 BLAKE2B cc83f952fb1c021cdccda9bf53d4796656242d02782188ed72c31eb8349c7ead9f119141bd399ce560619e4eb72ba77890a09af25fe86c353bddaaeb6e611b42 SHA512 1ffdf73d9392cb59c5583908b9ed4e6f9e252385897772665ac1025017d452464f118cda75b55c74a92010c5e3b38b9665db2ea24368a6f597b9861802575438
 MISC metadata.xml 567 BLAKE2B 9681ddc834f81beea16bac80ee70737882f3daa8bb0081df819fdb8ebd335d760a036bc4913d5f8fb38c8b014f397d13fc96edce46118f8424b972f1c5bb22ef SHA512 87c2ca0134811881a7e13385d1f435dca2af70c63e833e23647085327e790a2a6a66e0257cdf4f2a30a5c1c268efdcd3b00b2bf4be6d69a35cd25486d73170cc
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
index f9182bd3397a..dd5bfaf3697d 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,6 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
 KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 IUSE="kernel_linux"
diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
index 251c1f4e0719..4662dc300a54 100644
--- a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.9.1.ebuild
@@ -6,7 +6,6 @@ EAPI=5
 inherit linux-info xorg-2
 
 DESCRIPTION="Driver for Synaptics touchpads"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
 
 KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="kernel_linux"
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index fdeb40a6481b..1cd3d1a21dac 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-video-amdgpu-18.1.0.tar.bz2 430542 BLAKE2B c582c6d5357949833b5b9408e638e3037e38530f9a1d5e85936d1ee866effc4da1c56d7da2e8aa48cde73c09107968840262941e7b0063aa7d2aacfecc5bf120 SHA512 371f1a9f6cd2ce3b7117361222d196950c5efa01d957783c79a37c19a2273ce33d133fa51bb68432b8535aad61cb14fbb61d173a167d318b2533eb2507b7a903
-DIST xf86-video-amdgpu-19.0.0.tar.bz2 439773 BLAKE2B 899d8a13b2d4dc4a3fc604bacf9f2f9798f717fa6f7b602c7ee0308b2ef6ad41d49945eefdbb682b1ebe96d63e9789ad0e420180452e37f68ab7e8e35d80c434 SHA512 6a30fc03185816307f16693cd6b07f13694ca1b6b1327c58a951bccc8082f112bb768ab610229dc1040617eef860fc1ab17a7e6bf635c5a4e454e252f3addca8
+DIST xf86-video-amdgpu-19.0.1.tar.bz2 440534 BLAKE2B d0baadc195ba22d443ed0b07d0d3bab6d1a954606b0a6c66f23bfc0bd814afc4227d48be4a4b2fa9c80713ffd300aa3f6be0254fca6de78fa496bbb68d037c44 SHA512 dda04e3ccee140354f59e04895cf50cd7dc06a105c40ce35069613c5b5fbe083cab6833fd293d96334f64dde1a0c4af6154d473594a144f37404188ae7f37dd5
 EBUILD xf86-video-amdgpu-18.1.0.ebuild 543 BLAKE2B a0904e1b4c2dde86b3351392d458f6e09af39e81c6acefabb93a6a649578513be89320b99fe5f9246274c9deffe4fdd0522c8c6a4bf36ecba73e92f35a95aef9 SHA512 51633297c6dbad33da0a85a4162c5d6d5b65a94a14771a3f6a7776fccd13fc681abe263b5b8db46d48cd68ebeba6be361259563c77d967455f9a25c243392573
-EBUILD xf86-video-amdgpu-19.0.0.ebuild 519 BLAKE2B cdc81a08032965ed66038a0ad6386192dda0fd82150461081bd669352ba6cfb2abf36e94c8e43b46e16f3000582e1570d4e95c04eff3d75b194cc8143b6c0282 SHA512 92969acde37127488c1efe3dd8ed6bb7ab384be1f8e14df9e2b70f87b97d5197a24ea2485660b82089218bc26228f6f9f1eab5f5727f726a88c73fe0ed651987
+EBUILD xf86-video-amdgpu-19.0.1.ebuild 519 BLAKE2B cdc81a08032965ed66038a0ad6386192dda0fd82150461081bd669352ba6cfb2abf36e94c8e43b46e16f3000582e1570d4e95c04eff3d75b194cc8143b6c0282 SHA512 92969acde37127488c1efe3dd8ed6bb7ab384be1f8e14df9e2b70f87b97d5197a24ea2485660b82089218bc26228f6f9f1eab5f5727f726a88c73fe0ed651987
 EBUILD xf86-video-amdgpu-9999.ebuild 519 BLAKE2B cdc81a08032965ed66038a0ad6386192dda0fd82150461081bd669352ba6cfb2abf36e94c8e43b46e16f3000582e1570d4e95c04eff3d75b194cc8143b6c0282 SHA512 92969acde37127488c1efe3dd8ed6bb7ab384be1f8e14df9e2b70f87b97d5197a24ea2485660b82089218bc26228f6f9f1eab5f5727f726a88c73fe0ed651987
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild
index 4040501730a7..4040501730a7 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-19.0.1.ebuild
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 1f11c047ba23..23fa756461d7 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,6 +1,6 @@
 DIST xf86-video-ati-18.1.0.tar.bz2 891953 BLAKE2B 9092554c708b583f9b99a6788104a1e9420537fbbeaaaa6ae7e82be2a2299ad834365d00f8b146ce845afb5e2a08d3de3da591143eff63d4fb34c7040251f443 SHA512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53
-DIST xf86-video-ati-19.0.0.tar.bz2 901467 BLAKE2B 727581b205dd02995a9da2114d5a300e06172b1ee0fb02ea273d2fcf97dbc8cffea6ea6f12d8c6ed5a4a185a972ee4f007309e7331ca17ec0d2658df76aa349c SHA512 0674c8befa926fd3b431ce80d90f2cd0de17314efe7fd3a5ed0d78018d6cd32625b514bf68436a47eb15e5ad4b50317f3c09fd687b77e69a067d1210ee459827
+DIST xf86-video-ati-19.0.1.tar.bz2 902825 BLAKE2B 8f66ee5e465c9997d356593c58e4861ad749ba1d2a7f2520e8aea871ed71d2295ac1fba75f97ca30a7dd4cfe63f775838c5a925251331e1cd1e58b9186b3ca03 SHA512 e04c5395e3a49d81b8f7a4b0e11fe8c9ebd17af056a4eab4541873796dce05b103c93fb185f3a00873010df0655cd7311e6d27e177aeb7345c4c8017bbd1eb17
 EBUILD xf86-video-ati-18.1.0.ebuild 879 BLAKE2B 71c0bf60d4faaf01cb2cc14d8a148ef9874f01a6100cfd0e6bad53011a76740b69b6da3090534d2f2103f2cfa6f06a10164a5131034fb7c4de733424397d633f SHA512 fd8b17c4601cde0b50762c72d123ab41d7021779e9aeb34df4b866cdaca0fdb4d8708f727833c2a2b0594fc306f24d0a4923dedecf6502e9e66e4422fee5df4a
-EBUILD xf86-video-ati-19.0.0.ebuild 860 BLAKE2B 7cfc2e6c0865b774e6a8ad4ea320e77d92d8ab2d35a0f0631e065ac8086b90ad40e34eaf6aad12d65ad87f1af8033f6ec2380d485032d422d42c6c86a2e9a798 SHA512 4850f59267108c29c2846b1b465c08e15a2d7717bb8b71267a67c236baa7e7a0d9941ceef442f9d419fcee99a60af2d64c70723a9a61d65818a02982736aae7d
+EBUILD xf86-video-ati-19.0.1.ebuild 860 BLAKE2B 7cfc2e6c0865b774e6a8ad4ea320e77d92d8ab2d35a0f0631e065ac8086b90ad40e34eaf6aad12d65ad87f1af8033f6ec2380d485032d422d42c6c86a2e9a798 SHA512 4850f59267108c29c2846b1b465c08e15a2d7717bb8b71267a67c236baa7e7a0d9941ceef442f9d419fcee99a60af2d64c70723a9a61d65818a02982736aae7d
 EBUILD xf86-video-ati-9999.ebuild 860 BLAKE2B 7cfc2e6c0865b774e6a8ad4ea320e77d92d8ab2d35a0f0631e065ac8086b90ad40e34eaf6aad12d65ad87f1af8033f6ec2380d485032d422d42c6c86a2e9a798 SHA512 4850f59267108c29c2846b1b465c08e15a2d7717bb8b71267a67c236baa7e7a0d9941ceef442f9d419fcee99a60af2d64c70723a9a61d65818a02982736aae7d
 MISC metadata.xml 308 BLAKE2B b9e4150ed35f39b333f5ba4de65f52d82c50e5a5d1b3ca46f14b8a9a5d0ae12ad461f0f376a93d7312a7e4b2ec7a7529e137b0eada1b85f1db643739083cf20c SHA512 2f2c9a682e7aa5c413561df59a02c5dc7f77da6eae4513e93196b7c76d0ca9d76dffc5c644e77396afaa86f922947ed1cccdd133d161f1c441a28554eec68708
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
index bcca1714ec2f..bcca1714ec2f 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-19.0.1.ebuild
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 1c7cf09b2149..bb5cf84adf17 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -2,5 +2,5 @@ AUX xf86-video-intel-2.99.917_p20180214-Fix-build-on-i686.patch 2118 BLAKE2B da1
 DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650ddf6ca27bbc799a8a9d183c9a6a4d2e232288124b57bfff7bb36a8fcc55e2845c4ece2653d39c0830c4ea2ecef4f1968a3ee7413506bae3 SHA512 afc8a4db550aa5567fa6f5eb9b480fac7c3e496eb62ae62a6a7b7e317515e24d21bf78bf1b03ba90cfd909dd37a5f65247c7aa2314234aec3d575e53db825912
 EBUILD xf86-video-intel-2.99.917_p20180214-r1.ebuild 2026 BLAKE2B 61cb8f491ad304dd6b3ba64d15de7f7ef4abc6a5e54a6764fc053767fd41db7588f004aafde7b552ed93b370a2e5075139fc269162a96ecdca79dd295e28bedf SHA512 e2ab7cb810c25d4f48b911f69f6da3b7b6243355d717f876f1cfbe5775a525eeed483f8cb901224cbc62dc563d08ac23128bd4c4c20641e5565748659598e3e3
 EBUILD xf86-video-intel-2.99.917_p20180214-r2.ebuild 2080 BLAKE2B 8fdd40b499e5768d23b301320d5fab26e54a61e7aab9f49328834750978492006d6d77bbee25331eb5d9eb2f96b9e91645a05bb6166013b599a0025d8daad08e SHA512 040041cd9aad80d1a01224ff5d76bd83e0292b4d38210755736d020e8b94e483d3467dd2295d0ede7154c517da48ab21fa8d2ae69b2d0f2ec339a03a4c139a58
-EBUILD xf86-video-intel-9999.ebuild 1988 BLAKE2B 9238b061e865cc77baaaaa7c702c242792e5a54cbbcb5dc6ba3889d7af182844f158d5c8bf8d1912361a4515304c4293a41263c69a3ed16f5aed93019ba4a164 SHA512 de3cde168cb903ef28baccae085c9d05b67cc91cf388f2a125c24344b3ba296e594ad58c7d04a9c2b018c4ed64f02f5cc95408a97be8d8dd654516323672f8d2
+EBUILD xf86-video-intel-9999.ebuild 1987 BLAKE2B ce39a415b579cb439f26d5e3ad3b96a5dc5e51fcb34e248b4b193a9fe2749a564e13ecaaca96c99ca706316212cf266479138c6b60649b10d6af4e1eeb754be9 SHA512 a89624aba7cd9fe0ed9467cb35fd7230a99bc14eb96fd7aef71597f3b067b0021da194a1fbb73361191813751e8002da0a821bdcc85c32c185a779baa9181e9e
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
index 57a5241bcdd5..c2b892bbc428 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,8 +12,8 @@ if [[ ${PV} == 9999* ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 	COMMIT_ID=""
-	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-	S=${WORKDIR}/${COMMIT_ID}
+	SRC_URI="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/-/archive/${COMMIT_ID}/${P}.tar.bz2"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 fi
 
 DESCRIPTION="X.Org driver for Intel cards"
diff --git a/x11-drivers/xf86-video-newport/Manifest b/x11-drivers/xf86-video-newport/Manifest
deleted file mode 100644
index b8db7cf0a243..000000000000
--- a/x11-drivers/xf86-video-newport/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-newport-0.2.4.tar.bz2 308541 BLAKE2B 3d5d1725b41f2a1128b804a904a31c684ce00bdc967940fbc01023d2960656ab41673cf265ea8dcd639dfedcb6cefa2f0e2fd2fc439cc8012c3fe3857796b1a7 SHA512 22f48068ac988c4dcf4a85b63704be86631258c145afe6df985fe4f60ac1848f14126d6d58f7d247b3d6e6169d2c3ef8dfbcdd4028ddd8366f06889854a0474f
-EBUILD xf86-video-newport-0.2.4.ebuild 227 BLAKE2B 78bffa3d3f8c1030d93bb3c1a27bf3fe36f5c9af24de132258ca9250c13d1a3d89726ea3856a4e46edc96053908f6b2e8541d29b6ea9e073ffe68653f387271e SHA512 65c1f30cb7bbc10512bed599633b0e843bd0fa35c7c7ad208a3b51b189d53c044dfb355b16438dae7d392655408bd85a73ba70e7d47fc0f8cf2f5ab24261e641
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-newport/metadata.xml b/x11-drivers/xf86-video-newport/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-newport/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild
deleted file mode 100644
index f197b607488c..000000000000
--- a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Newport video driver"
-KEYWORDS="-* ~mips"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index f2187d5d9d03..364daa1a6c25 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,5 +1,5 @@
 DIST xf86-video-nouveau-1.0.15.tar.bz2 584998 BLAKE2B 474eb27d00351fff9b24438c317e2f18810fde76d866ace047beda6c6cc58276e9f6ce25b4690c1de321dbdcd2dd238dc6f473a273cd3b54123d2f8383d5e586 SHA512 69a8f8e7920d893f17d14fd9f05e35de246d980a243f3b3b00c05deae7f6bd97e0f51e6ddfa322b4d0815233fe5f656d4e55f54461249f3f24c3bc025a682285
 DIST xf86-video-nouveau-1.0.16.tar.bz2 629404 BLAKE2B 519ae2ddc6f895648274e10fc3b5052896734e40251dcaf35a948be051711c14054573a08192ccf15002f3a8d1e6079c982c32cf8c58e2a288c0f146155020e8 SHA512 41b7839c37372660968ab7da2bc3d9feef3cab4e994d05d4ba6e59071f0d1b1f8d7dcdbcb15a42a375a556d28dc067f9ffe45d73c1d121ad307d199107ade3e0
-EBUILD xf86-video-nouveau-1.0.15-r1.ebuild 563 BLAKE2B 959c018f721d1be2830d277c9baf299fe32f8a9a865f4e21eb7d986e43f551366c991a01b8e5d7cbd0edc55d79f5a72205ff0b7f4503f1dfa026474be45bc9f9 SHA512 7e2801b3f493db56492888077633046492f27bcc3aac7bb786cc91aefac09881eb1a4217f8834f963f6dd95b563ece50ba5090e244ad154effc6d8e978d30717
-EBUILD xf86-video-nouveau-1.0.16.ebuild 564 BLAKE2B 97aa0b7e6b828a1249136777ddd8538aef06b561615f026a566b82540f717d7f0d6fe165faaa69b433360526aff161031b9c230ac3004060a796e3512bbfa2b3 SHA512 372f10e0e17dd41be8f26378d34219d4052c3972fbf03b01dee730cf871189837dee9123d934731f9cde81f8b8031f1f53e3fe66d4fe30f7019881a23d638839
+EBUILD xf86-video-nouveau-1.0.15-r1.ebuild 616 BLAKE2B 3123d1d141ed0287b812f170c2a8e02e167b6f25a23c145870054e4bf4a3e35e1a0004ed66bf1c31d0a626cf5fe21a3000cd2c75cabcc417d3c6a92446303b86 SHA512 cf22557c666182ae9e8d954007b5f5eb23a7eb24deedf16fbfae1c89d98cbb4f66367fd6c2d3e8d7d6f26fce13a446ce8f6107fe2bb7f7541af184b28c282547
+EBUILD xf86-video-nouveau-1.0.16.ebuild 620 BLAKE2B 4277a95ef77d9225b4df952a1848dbeea75fa15f6d172b6482085578fa5d35e806624bf2cfde6df8529a9181e0f032f7c9db7a47bac2d11cff366baeb5b89adc SHA512 f35a8532457f415be1fb41f39fe5ddbb8ab71210821c802e43ea1cf9bad8ad29decdeeb81223853c20f492e92ca088b1b3264b96584574b05fcc21490b4cdd4e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild
index 4015df63ed84..b74d76a47bf3 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/"
+HOMEPAGE="https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
 KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE=""
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild
index 199676766bf9..eec86bc056e4 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.16.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 fi
 
 DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="https://nouveau.freedesktop.org/wiki/"
+HOMEPAGE="https://nouveau.freedesktop.org/wiki/ https://cgit.freedesktop.org/nouveau/xf86-video-nouveau"
 
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
diff --git a/x11-drivers/xf86-video-tdfx/Manifest b/x11-drivers/xf86-video-tdfx/Manifest
deleted file mode 100644
index 4c0dd8f7a830..000000000000
--- a/x11-drivers/xf86-video-tdfx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xf86-video-tdfx-1.4.7.tar.bz2 372249 BLAKE2B 0200d55deb75ef28906ed27d142736dba69a83ac5db7995caf13d022711d8d537182953a1fb78645137eb974af393c5c33c79ecabca3cb12178eb3fa39edcf58 SHA512 573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405
-EBUILD xf86-video-tdfx-1.4.7.ebuild 367 BLAKE2B 66bbdbc2043f1a3230e69801c05d237d281cf800eab87bac3733a1ce9c8db6301c36b1386c3955676889af9f78230ba1e2b01f1a1e27e1e59205ce2bc87ca20c SHA512 75dcb3ff0a48c360ec068e9bebbfd6931fe58145c38a5562d87320afd3d6a01e34aa7cced767d20a8a0900358891ae774115936bed1d649ebfc8a41a8c4c0235
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-tdfx/metadata.xml b/x11-drivers/xf86-video-tdfx/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-tdfx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.7.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.7.ebuild
deleted file mode 100644
index dfbf6c760009..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_DRI=dri
-
-inherit xorg-2
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-	)
-}
diff --git a/x11-drivers/xf86-video-vboxvideo/Manifest b/x11-drivers/xf86-video-vboxvideo/Manifest
index 54f4b6c4a835..a2a9c9acda5a 100644
--- a/x11-drivers/xf86-video-vboxvideo/Manifest
+++ b/x11-drivers/xf86-video-vboxvideo/Manifest
@@ -1,3 +1,3 @@
 DIST xf86-video-vboxvideo-1.0.0.tar.bz2 353342 BLAKE2B 8088e150c8e91dd4872218773c2d57a052935926fe08c18d9f5165b112d6213bf79c80d85fd4d10c1b12bd2ac222983b3dbf241cb97c1cb087f4137314a95ead SHA512 1a9856a966495a3a291592ee3113ed5ee83e3ef530bf37d91605206a62f641726511ad48ca79b8a3e94f601f8cf15341255b0c7d14f5c8acf985b84f965d8dfc
-EBUILD xf86-video-vboxvideo-1.0.0.ebuild 452 BLAKE2B d6ba25c1a6e49b5b6e843493ee8258dc9237283cc0272bd1f2da254cd5e05cfc53e76cf3317838629d76664863db73467c3beed084b17e20abff4da4de61d099 SHA512 4bbb0b3abdebfbf59be4774d1cae1a1cc395845791e93e2bd44281c4c8a880a7bfc9c54edc8b465406ea6521e647458ce76c86a3b4c93c2c9463e1442fe95b21
+EBUILD xf86-video-vboxvideo-1.0.0.ebuild 417 BLAKE2B 4fadd4142eec7b2aedf457f85fdd68e8093aede1c1cdf881418f9e03f28ec8362bd9d77803b29cf206d493f4bda28ffc46870333ca8f06fc26a4726037196cbf SHA512 822b7ddab3eadb610d897a8bc6aabaf0701ded5a5e6ff5ab4812f520966afe5635829eb86898ca25d5be4d4966d9f9b5523f8048c6308fce1d751d6dd7229655
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
index 8409576b357f..53894630f774 100644
--- a/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
+++ b/x11-drivers/xf86-video-vboxvideo/xf86-video-vboxvideo-1.0.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+XORG_PACKAGE_NAME=xf86-video-vbox
 
 inherit xorg-2
 
 DESCRIPTION="VirtualBox guest video driver"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/driver/xf86-video-vbox/"
 
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/x11-drivers/xf86-video-voodoo/Manifest b/x11-drivers/xf86-video-voodoo/Manifest
deleted file mode 100644
index 5f4a9df5bf7b..000000000000
--- a/x11-drivers/xf86-video-voodoo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xf86-video-voodoo-1.2.5-no-PCITAG.patch 647 BLAKE2B 385af1dfab9fc17d5a0010b467b62695fe9da1f22cdebfca364cda5d72bbb098fd35a9768acd97f65c50470357e87d8b9e78c5624d3e5cd59ce2a92a1fd218af SHA512 b63a5e7240ed0829843e2087fe40ed1658329f33ecdcdcf377005a44bba81d487a2a8875aebbead31a0b67f473869adea5b591b2bf1e644fa9818b6f9adf67bd
-DIST xf86-video-voodoo-1.2.5.tar.bz2 305489 BLAKE2B 8557ae35b70f8a7b257e5dc6d8be1efed6780bd237af3a6c404c1e34a3098688aede689fc722a4bc87f08e1d8d1fd7232fdc5776822489e14ac8f358e590e878 SHA512 371d606abf3d682aa1e42bfce89dabd70bcb0bba3709d63bf34ffb4a364e16422fcd56104ffc4f85cd9a8795f31b7884ff5edac5e7d3f609b4c948180e0e8e10
-EBUILD xf86-video-voodoo-1.2.5.ebuild 356 BLAKE2B 5d1d8729a2e6d2cf81444916a9f609245b9d027e3861049d391595a3c09f9c5680e8bd80bb19aadb7fc542eab5abff4e3365582578157de044762b67b238664d SHA512 5107c42e3f1a777ab962bd2a49093acc1193b349c83962dadcf0248193c81bcfd40d36d71ba6102f08db75db31dad9829387a287ffc20de73b1914d42f67b6d9
-MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch b/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch
deleted file mode 100644
index 31e7079fa0fe..000000000000
--- a/x11-drivers/xf86-video-voodoo/files/xf86-video-voodoo-1.2.5-no-PCITAG.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9172ae566a0e85313fc80ab62b4455393eefe593 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Mon, 22 Sep 2014 10:56:02 +1000
-Subject: [PATCH] don't use PCITAG in struct anymore
-
----
- src/voodoo.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/voodoo.h b/src/voodoo.h
-index bfed497..c3eb64e 100644
---- a/src/voodoo.h
-+++ b/src/voodoo.h
-@@ -23,7 +23,9 @@ typedef struct {
-   
-   Bool		      Voodoo2;		/* Set if Voodoo2 */
-   pciVideoPtr	      PciInfo;		/* PCI data */
-+#ifndef XSERVER_LIBPCIACCESS
-   PCITAG	      PciTag;
-+#endif
-   CARD32	      PhysBase;
-   
-   CARD32	      Width;		/* Current width */
--- 
-2.4.6
-
diff --git a/x11-drivers/xf86-video-voodoo/metadata.xml b/x11-drivers/xf86-video-voodoo/metadata.xml
deleted file mode 100644
index e943b72b8a48..000000000000
--- a/x11-drivers/xf86-video-voodoo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>x11@gentoo.org</email>
-	<name>X11</name>
-</maintainer>
-</pkgmetadata>
diff --git a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild b/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
deleted file mode 100644
index c2a9397a9007..000000000000
--- a/x11-drivers/xf86-video-voodoo/xf86-video-voodoo-1.2.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Voodoo video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-PCITAG.patch
-)