commit:     9cf1e6d48e2a17392ff4d2c3c913985f95f4aa19
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 13:53:02 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 13:53:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf1e6d4

x11-drivers/nvidia-drivers: Old.

Package-Manager: portage-2.2.27

 .../nvidia-drivers-304.131-r3.ebuild               | 488 -------------------
 .../nvidia-drivers/nvidia-drivers-340.96-r4.ebuild | 517 --------------------
 .../nvidia-drivers/nvidia-drivers-346.96-r5.ebuild | 528 --------------------
 .../nvidia-drivers/nvidia-drivers-352.79-r3.ebuild | 527 --------------------
 .../nvidia-drivers/nvidia-drivers-355.11-r3.ebuild | 500 -------------------
 .../nvidia-drivers/nvidia-drivers-358.16-r4.ebuild | 539 ---------------------
 .../nvidia-drivers/nvidia-drivers-361.28-r1.ebuild | 529 --------------------
 7 files changed, 3628 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild
deleted file mode 100644
index e50b6a6..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-304.131-r3.ebuild
+++ /dev/null
@@ -1,488 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user versionator udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r1"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools 
+X"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-       app-eselect/eselect-opencl
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               x11-libs/gdk-pixbuf
-               x11-libs/gtk+:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/pango[X]
-               x11-libs/pangox-compat
-       )
-       X? (
-               >=app-eselect/eselect-opengl-1.0.9
-       )
-"
-DEPEND="${COMMON}
-       kernel_linux? (
-               virtual/linux-sources
-               virtual/pkgconfig
-       )"
-RDEPEND="${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               x11-libs/libXvMC
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-PDEPEND="X? ( >=x11-libs/libvdpau-0.3-r1 )"
-
-REQUIRED_USE="
-       tools? ( X )
-       static-libs? ( tools )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-
-       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 4; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.4"
-               ewarn "<sys-kernel/vanilla-sources-4.4"
-               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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 kernel_linux; then
-               linux-mod_pkg_setup
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)"
-               # 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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9 ; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-               convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-pax-const.patch
-               epatch "${FILESDIR}"/${PN}-pax-usercopy.patch
-       fi
-
-       cat <<- EOF > "${S}"/nvidia.icd
-               /usr/$(get_libdir)/libnvidia-opencl.so
-       EOF
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 kernel_linux; then
-               MAKEOPTS=-j1 linux-mod_src_compile
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       AR="$(tc-getAR)" \
-                       CC="$(tc-getCC)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       libXNVCtrl.a
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       AR="$(tc-getAR)" \
-                       CC="$(tc-getCC)" \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       RANLIB="$(tc-getRANLIB)" \
-                       STRIP_CMD=true
-       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 its not /usr/lib
-donvidia() {
-       # Full path to library minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-
-               # 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}
-
-       if use kernel_linux; then
-               # NVIDIA video decode <-> CUDA
-               donvidia ${NV_OBJ}/libnvcuvid.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
-
-               # XvMC driver
-               dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-                       die "failed to install libXvMCNVIDIA.so"
-               donvidia ${NV_X11}/libXvMCNVIDIA.so ${NV_SOVER}
-               dosym libXvMCNVIDIA.so.${NV_SOVER} \
-                       /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-                       die "failed to create libXvMCNVIDIA_dynamic.so symlink"
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins nvidia.icd
-               donvidia ${NV_OBJ}/libnvidia-opencl.so ${NV_SOVER}
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-proxy-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       fi
-
-       if use kernel_linux ; then
-               doexe ${NV_OBJ}/nvidia-debugdump
-               doexe ${NV_OBJ}/nvidia-cuda-proxy-control
-               doexe ${NV_OBJ}/nvidia-cuda-proxy-server
-               doexe ${NV_OBJ}/nvidia-smi
-               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       # Desktop entries for nvidia-settings
-       if use tools ; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/ \
-                       DESTDIR="${D}" \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       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
-
-               # 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
-
-       #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && \
-                       [[ ${ABI} == "x86" ]] ; then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               # The GLX libraries
-               donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-               if use kernel_FreeBSD; then
-                       donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER} 
${GL_ROOT}
-               else
-                       donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER} 
${GL_ROOT}
-               fi
-
-               # VDPAU
-               donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-       fi
-
-       # NVIDIA monitoring library
-       if use kernel_linux ; then
-               donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-       fi
-
-       # CUDA & OpenCL
-       if use kernel_linux; then
-               donvidia ${libdir}/libcuda.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-               donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-       fi
-}
-
-pkg_preinst() {
-       if 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 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, XvMC, 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild
deleted file mode 100644
index 97fb2f4..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96-r4.ebuild
+++ /dev/null
@@ -1,517 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel static-libs +tools 
+X uvm"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-COMMON="
-       app-eselect/eselect-opencl
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               dev-libs/jansson
-               x11-libs/gdk-pixbuf
-               >=x11-libs/gtk+-2.4:2
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/pango[X]
-       )
-       X? (
-               >=app-eselect/eselect-opengl-1.0.9
-       )
-"
-DEPEND="
-       ${COMMON}
-       app-arch/xz-utils
-       kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-REQUIRED_USE="tools? ( X )"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 4; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.4"
-               ewarn "<sys-kernel/vanilla-sources-4.4"
-               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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-               # 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)"
-
-               # 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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9 ; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-#              convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-331.13-pax-usercopy.patch
-               epatch "${FILESDIR}"/${PN}-337.12-pax-constify.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 kernel_linux; then
-               use uvm && MAKEOPTS=-j1
-               linux-mod_src_compile
-       fi
-
-       if use tools; then
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl clean
-               emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
-                       AR="$(tc-getAR)" \
-                       CC="$(tc-getCC)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       libXNVCtrl.a
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       AR="$(tc-getAR)" \
-                       CC="$(tc-getCC)" \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       RANLIB="$(tc-getRANLIB)" \
-                       STRIP_CMD=true
-       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 its not /usr/lib
-donvidia() {
-       # Full path to library minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-               use uvm && doins "${FILESDIR}"/nvidia-uvm.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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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}" \
-                       LIBDIR="${D}/usr/$(get_libdir)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       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
-
-       #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && \
-                       [[ ${ABI} == "x86" ]] ; then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               # The GLX libraries
-               donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-               if use kernel_FreeBSD; then
-                       donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-               else
-                       donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-               fi
-
-               # VDPAU
-               donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-               # GLES v2 libraries
-               insinto ${GL_ROOT}
-               doexe ${libdir}/libGLESv2.so.${PV}
-               dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-               dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-       fi
-
-       # NVIDIA monitoring library
-       if use kernel_linux ; then
-               donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-       fi
-
-       # CUDA & OpenCL
-       if use kernel_linux; then
-               donvidia ${libdir}/libcuda.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-               donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-               donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-       fi
-}
-
-pkg_preinst() {
-       if 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 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild
deleted file mode 100644
index e560383..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-346.96-r5.ebuild
+++ /dev/null
@@ -1,528 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi gtk3 kernel_FreeBSD kernel_linux multilib pax_kernel static-libs 
+tools uvm +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
-       )
-"
-DEPEND="
-       ${COMMON}
-       app-arch/xz-utils
-       kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 3; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.3"
-               ewarn "<sys-kernel/vanilla-sources-4.3"
-               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."
-       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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-               # 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)"
-
-               # 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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9 ; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-#              convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-               epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 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)" \
-                       LIBDIR="$(get_libdir)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       build-xnvctrl
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       CC="$(tc-getCC)" \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       STRIP_CMD=true
-       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 its not /usr/lib
-donvidia() {
-       # Full path to library minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-               use uvm && doins "${FILESDIR}"/nvidia-uvm.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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && \
-                       [[ ${ABI} == "x86" ]] ; then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               # The GLX libraries
-               donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-               if use kernel_FreeBSD; then
-                       donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-               else
-                       donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-               fi
-
-               # VDPAU
-               donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-               # GLES v2 libraries
-               insinto ${GL_ROOT}
-               doexe ${libdir}/libGLESv2.so.${PV}
-               dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-               dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-       fi
-
-       # NVIDIA monitoring library
-       if use kernel_linux ; then
-               donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-       fi
-
-       # CUDA & OpenCL
-       if use kernel_linux; then
-               donvidia ${libdir}/libcuda.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-               donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-               donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-       fi
-}
-
-pkg_preinst() {
-       if 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 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild
deleted file mode 100644
index ffd67c9..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.79-r3.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi gtk3 multilib kernel_FreeBSD kernel_linux pax_kernel static-libs 
+tools +X uvm"
-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
-       )
-"
-DEPEND="
-       ${COMMON}
-       kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 4; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.4"
-               ewarn "<sys-kernel/vanilla-sources-4.4"
-               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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel/uvm)"
-
-               # 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)"
-
-               # 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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9 ; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-#              convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-346.16-pax-usercopy.patch
-               epatch "${FILESDIR}"/${PN}-346.16-pax-constify.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 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)" \
-                       LIBDIR="$(get_libdir)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       build-xnvctrl
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       CC="$(tc-getCC)" \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       STRIP_CMD=true
-       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 its not /usr/lib
-donvidia() {
-       # Full path to library minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-               use uvm && doins "${FILESDIR}"/nvidia-uvm.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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       install
-
-               if use static-libs; then
-                       dolib.a 
"${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
-                       insinto /usr/share/nvidia/
-                       doins 
nvidia-application-profiles-${PV}-key-documentation
-               fi
-
-               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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && \
-                       [[ ${ABI} == "x86" ]] ; then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               # The GLX libraries
-               donvidia ${libdir}/libEGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libGLESv1_CM.so ${NV_SOVER} ${GL_ROOT}
-               donvidia ${libdir}/libnvidia-eglcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-glsi.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-ifr.so ${NV_SOVER}
-               if use kernel_FreeBSD; then
-                       donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
-               else
-                       donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
-               fi
-
-               # VDPAU
-               donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
-
-               # GLES v2 libraries
-               insinto ${GL_ROOT}
-               doexe ${libdir}/libGLESv2.so.${PV}
-               dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-               dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-       fi
-
-       # NVIDIA monitoring library
-       if use kernel_linux ; then
-               donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
-       fi
-
-       # CUDA & OpenCL
-       if use kernel_linux; then
-               donvidia ${libdir}/libcuda.so ${NV_SOVER}
-               donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
-               donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
-               donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
-       fi
-}
-
-pkg_preinst() {
-       if 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 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r3.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r3.ebuild
deleted file mode 100644
index 1061bc7..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-355.11-r3.ebuild
+++ /dev/null
@@ -1,500 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X 
uvm"
-REQUIRED_USE="
-       tools? ( X || ( gtk2 gtk3 ) )
-"
-
-COMMON="
-       app-eselect/eselect-opencl
-       gtk3? ( x11-libs/cairo )
-       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-       X? (
-               >=app-eselect/eselect-opengl-1.0.9
-       )
-"
-DEPEND="
-       ${COMMON}
-       app-arch/xz-utils
-       kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? (
-               dev-libs/atk
-               dev-libs/glib:2
-               x11-libs/gdk-pixbuf
-               gtk2? ( >=x11-libs/gtk+-2.4:2 )
-               gtk3? ( x11-libs/gtk+:3 )
-               x11-libs/libX11
-               x11-libs/libXext
-               x11-libs/pango[X]
-       )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 3; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.3"
-               ewarn "<sys-kernel/vanilla-sources-4.3"
-               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."
-       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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 kernel_linux; then
-               MODULE_NAMES="nvidia(video:${S}/kernel)"
-               use uvm && MODULE_NAMES+=" nvidia-uvm(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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-#              convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-355.06-pax.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 kernel_linux; then
-               MAKEOPTS=-j1
-               linux-mod_src_compile
-       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 minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-               use uvm && doins "${FILESDIR}"/nvidia-uvm.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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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
-               doexe ${NV_OBJ}/nvidia-settings
-               use gtk2 && donvidia libnvidia-gtk2.so ${PV}
-               use gtk3 && donvidia libnvidia-gtk3.so ${PV}
-               insinto /usr/share/nvidia/
-               doins nvidia-application-profiles-${PV}-key-documentation
-               insinto /etc/nvidia
-               newins nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
-       fi
-
-       dobin ${NV_OBJ}/nvidia-bug-report.sh
-
-       # Desktop entries for nvidia-settings
-       if use tools; then
-               # There is no icon in the FreeBSD tarball.
-               use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png 
${PN}-settings.png
-               domenu "${FILESDIR}"/${PN}-settings.desktop
-               exeinto /etc/X11/xinit/xinitrc.d
-               doexe "${FILESDIR}"/95-nvidia-settings
-       fi
-
-       #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
-
-       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; 
then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               NV_GLX_LIBRARIES=(
-                       "libEGL.so 1 ${GL_ROOT}"
-                       "libEGL_nvidia.so 0 ${GL_ROOT}"
-                       "libGL.so ${NV_SOVER} ${GL_ROOT}"
-                       "libGLESv1_CM.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-fbc.so ${NV_SOVER}"
-                       "libnvidia-glcore.so ${NV_SOVER}"
-                       "libnvidia-glsi.so ${NV_SOVER}"
-                       "libnvidia-ifr.so ${NV_SOVER}"
-                       "libnvidia-opencl.so ${NV_SOVER}"
-                       "libvdpau.so ${NV_SOVER} ${GL_ROOT}"
-                       "libvdpau_nvidia.so ${NV_SOVER}"
-                       "libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
-               )
-               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 ${libdir}/${NV_LIB}
-               done
-
-               # GLES v2 library is special
-               insinto ${GL_ROOT}
-               doexe ${libdir}/libGLESv2.so.${PV}
-               dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-               dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-       fi
-}
-
-pkg_preinst() {
-       if 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 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild
deleted file mode 100644
index 3ffffa2..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r4.ebuild
+++ /dev/null
@@ -1,539 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi multilib kernel_FreeBSD kernel_linux +kms pax_kernel static-libs 
+tools gtk3 +X uvm"
-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
-       )
-"
-DEPEND="
-       ${COMMON}
-       kernel_linux? ( virtual/linux-sources )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 4; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.4"
-               ewarn "<sys-kernel/vanilla-sources-4.4"
-               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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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 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)"
-
-               # 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
-
-       # set variables to where files are in the package structure
-       if use kernel_FreeBSD; then
-               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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() {
-       # Please add a brief description for every added patch
-
-       if use kernel_linux; then
-               if kernel_is lt 2 6 9; then
-                       eerror "You must build this against 2.6.9 or higher 
kernels."
-               fi
-
-               # If greater than 2.6.5 use M= instead of SUBDIR=
-#              convert_to_m "${NV_SRC}"/Makefile.kbuild
-       fi
-
-       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."
-               epatch "${FILESDIR}"/${PN}-355.06-pax.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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 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)" \
-                       LIBDIR="$(get_libdir)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       build-xnvctrl
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       CC="$(tc-getCC)" \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       STRIP_CMD=true
-       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 minus SOVER
-       MY_LIB="$1"
-
-       # SOVER to use
-       MY_SOVER="$2"
-
-       # Where to install
-       MY_DEST="$3"
-
-       if [[ -z "${MY_DEST}" ]]; then
-               MY_DEST="/usr/$(get_libdir)"
-               action="dolib.so"
-       else
-               exeinto ${MY_DEST}
-               action="doexe"
-       fi
-
-       # Get just the library name
-       libname=$(basename $1)
-
-       # Install the library with the correct SOVER
-       ${action} ${MY_LIB}.${MY_SOVER} || \
-               die "failed to install ${libname}"
-
-       # If SOVER wasn't 1, then we need to create a .1 symlink
-       if [[ "${MY_SOVER}" != "1" ]]; then
-               dosym ${libname}.${MY_SOVER} \
-                       ${MY_DEST}/${libname}.1 || \
-                       die "failed to create ${libname} symlink"
-       fi
-
-       # Always create the symlink from the raw lib to the .1
-       dosym ${libname}.1 \
-               ${MY_DEST}/${libname} || \
-               die "failed to create ${libname} symlink"
-}
-
-src_install() {
-       if 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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; 
then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               NV_GLX_LIBRARIES=(
-                       "libEGL.so 1 ${GL_ROOT}"
-                       "libEGL_nvidia.so 0 ${GL_ROOT}"
-                       "libGL.so ${NV_SOVER} ${GL_ROOT}"
-                       "libGLESv1_CM.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-fbc.so ${NV_SOVER}"
-                       "libnvidia-glcore.so ${NV_SOVER}"
-                       "libnvidia-glsi.so ${NV_SOVER}"
-                       "libnvidia-ifr.so ${NV_SOVER}"
-                       "libnvidia-opencl.so ${NV_SOVER}"
-                       "libvdpau.so ${NV_SOVER} ${GL_ROOT}"
-                       "libvdpau_nvidia.so ${NV_SOVER}"
-                       "libvdpau_trace.so ${NV_SOVER} ${GL_ROOT}"
-               )
-               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 ${libdir}/${NV_LIB}
-               done
-
-               # GLES v2 library is special
-               insinto ${GL_ROOT}
-               doexe ${libdir}/libGLESv2.so.${PV}
-               dosym libGLESv2.so.${PV} ${GL_ROOT}/libGLESv2.so.2
-               dosym libGLESv2.so.2 ${GL_ROOT}/libGLESv2.so
-       fi
-}
-
-pkg_preinst() {
-       if 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 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 kernel_linux && linux-mod_pkg_postrm
-       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.28-r1.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-361.28-r1.ebuild
deleted file mode 100644
index 1b625e9..0000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-361.28-r1.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
-       portability toolchain-funcs unpacker user udev
-
-NV_URI="http://us.download.nvidia.com/XFree86/";
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA Accelerated Graphics Driver"
-HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx";
-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 )
-       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
-       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-       tools? ( 
ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2 
)
-"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
-RESTRICT="bindist mirror strip"
-EMULTILIB_PKG="true"
-
-IUSE="acpi compat +driver gtk3 kernel_FreeBSD kernel_linux +kms multilib 
pax_kernel static-libs +tools uvm +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 )
-"
-RDEPEND="
-       ${COMMON}
-       acpi? ( sys-power/acpid )
-       tools? ( !media-video/nvidia-settings )
-       X? (
-               <x11-base/xorg-server-1.18.99:=
-               >=x11-libs/libvdpau-0.3-r1
-               multilib? (
-                       >=x11-libs/libX11-1.6.2[abi_x86_32]
-                       >=x11-libs/libXext-1.3.2[abi_x86_32]
-               )
-       )
-"
-
-QA_PREBUILT="opt/* usr/lib*"
-
-S=${WORKDIR}/
-
-pkg_pretend() {
-       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 5; then
-               ewarn "Gentoo supports kernels which are supported by NVIDIA"
-               ewarn "which are limited to the following kernels:"
-               ewarn "<sys-kernel/gentoo-sources-4.5"
-               ewarn "<sys-kernel/vanilla-sources-4.5"
-               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"
-       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
-
-       # Now do the above checks
-       use kernel_linux && check_extra_config
-}
-
-pkg_setup() {
-       # 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)"
-
-               # 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 x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
-               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."
-               epatch "${FILESDIR}"/${PN}-355.06-pax.patch
-       fi
-
-       # Allow user patches so they can support RC kernels and whatever else
-       epatch_user
-}
-
-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)" \
-                       LIBDIR="$(get_libdir)" \
-                       RANLIB="$(tc-getRANLIB)" \
-                       build-xnvctrl
-
-               emake -C "${S}"/nvidia-settings-${PV}/src \
-                       CC="$(tc-getCC)" \
-                       GTK3_AVAILABLE=$(usex gtk3 1 0) \
-                       LD="$(tc-getCC)" \
-                       LIBDIR="$(get_libdir)" \
-                       NVML_ENABLED=0 \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       NV_VERBOSE=1 \
-                       STRIP_CMD=true
-       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
-       fi
-
-       # OpenCL ICD for NVIDIA
-       if use kernel_linux; then
-               insinto /etc/OpenCL/vendors
-               doins ${NV_OBJ}/nvidia.icd
-       fi
-
-       # Documentation
-       dohtml ${NV_DOC}/html/*
-       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.gz"
-               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
-               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
-               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
-       fi
-
-       # Helper Apps
-       exeinto /opt/bin/
-
-       if use X; then
-               doexe ${NV_OBJ}/nvidia-xconfig
-       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.gz
-               doman nvidia-modprobe.1.gz
-               doman nvidia-persistenced.1.gz
-               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)" \
-                       PREFIX=/usr \
-                       NV_USE_BUNDLED_LIBJANSSON=0 \
-                       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 libdir=${NV_OBJ}
-
-       if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; 
then
-               libdir=${NV_OBJ}/32
-       fi
-
-       if use X; then
-               NV_GLX_LIBRARIES=(
-                       "libEGL.so.1 ${GL_ROOT}"
-                       "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGL.so.$(usex compat ${NV_SOVER} 1.0.0) ${GL_ROOT}"
-                       "libGLESv1_CM.so.1 ${GL_ROOT}"
-                       "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
-                       "libGLESv2.so.2 ${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-ifr.so.${NV_SOVER}"
-                       "libnvidia-opencl.so.${NV_SOVER}"
-                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
-                       "libvdpau_nvidia.so.${NV_SOVER}"
-               )
-
-               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 ${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
-}

Reply via email to