upgrade to newest nvidia drivers. drop old ones

1 files changed, 0 insertions, 453 deletions

diff --git a/x11-drivers/nvidia-userspace/nvidia-userspace-295.53.ebuild b/x11-drivers/nvidia-userspace/nvidia-userspace-295.53.ebuild
deleted file mode 100644
index 301d8462..00000000
--- a/x11-drivers/nvidia-userspace/nvidia-userspace-295.53.ebuild
+++ /dev/null
@@ -1,453 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils unpacker multilib portability versionator flag-o-matic
-
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
-
-DESCRIPTION="NVIDIA X11 userspace libraries and applications"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
-	 amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
-	 x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
-IUSE="acpi multilib kernel_linux"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="<x11-base/xorg-server-1.12.99
-	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
-	multilib? ( app-emulation/emul-linux-x86-xlibs )
-	>=app-admin/eselect-opengl-1.0.9
-	app-admin/eselect-opencl
-	!<media-video/nvidia-settings-256.52"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}
-	x11-libs/libXvMC
-        !<x11-drivers/nvidia-userspace-${PV}
-        !>x11-drivers/nvidia-userspace-${PV}
-	acpi? ( sys-power/acpid )"
-PDEPEND=">=x11-libs/libvdpau-0.3-r1"
-
-QA_TEXTRELS_x86="
-	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libcuda.so.${PV}
-	usr/lib/libnvcuvid.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libnvidia-compiler.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/libnvidia-ml.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/libnvidia-glcore.so.1
-	usr/lib/libvdpau_nvidia.so.1
-	usr/lib/libnvidia-cfg.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so.1
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}"
-
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/libnvidia-compiler.so.${PV}
-	usr/lib/libcuda.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0"
-
-QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/libcuda.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.a:NVXVMC.o
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/libnvidia-ml.so.${PV}
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig
-	opt/bin/nvidia-debugdump
-	opt/bin/nvidia-settings"
-
-QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/libXvMCNVIDIA.a
-	usr/lib64/libXvMCNVIDIA.so.${PV}"
-
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}"
-
-QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}"
-
-QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib32/libnvidia-compiler.so.${PV}"
-
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/libnvidia-glcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib32/libvdpau_nvidia.so.${PV}
-	usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib32/libnvidia-compiler.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/libcuda.so.${PV}
-	usr/lib64/libnvidia-cfg.so.${PV}
-	usr/lib64/libnvidia-glcore.so.${PV}
-	usr/lib64/libnvidia-ml.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/libvdpau_nvidia.so.${PV}
-	usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib64/libnvidia-compiler.so.${PV}
-	usr/lib64/libnvcuvid.so.${PV}
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig
-	opt/bin/nvidia-debugdump
-	opt/bin/nvidia-settings"
-
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV}
-	usr/lib/libnvidia-cfg.so.${PV}
-	usr/lib/libnvidia-glcore.so.${PV}
-	usr/lib/libnvidia-ml.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/libvdpau_nvidia.so.${PV}
-	usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0
-	usr/lib/libnvidia-compiler.so.${PV}
-	usr/lib/libnvcuvid.so.${PV}
-	opt/bin/nvidia-smi
-	opt/bin/nvidia-xconfig
-	opt/bin/nvidia-debugdump
-	opt/bin/nvidia-settings"
-
-
-S="${WORKDIR}/"
-
-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 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
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	export _POSIX2_VERSION="199209"
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${S}/doc"
-		NV_EXEC="${S}/obj"
-		NV_LIB="${S}/obj"
-		NV_SRC="${S}/src"
-		NV_MAN="${S}/x11/man"
-		NV_X11="${S}/obj"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=1
-	elif use kernel_linux; then
-		NV_DOC="${S}"
-		NV_EXEC="${S}"
-		NV_LIB="${S}"
-		NV_SRC="${S}/kernel"
-		NV_MAN="${S}"
-		NV_X11="${S}"
-		NV_X11_DRV="${NV_X11}"
-		NV_X11_EXT="${NV_X11}"
-		NV_SOVER=${PV}
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-}
-
-src_unpack() {
-	if ! use x86-fbsd; then
-		cd "${S}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd && cd doc
-	cat <<- EOF > "${S}"/nvidia.icd
-		/usr/$(get_libdir)/libcuda.so
-	EOF
-}
-
-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 x86-fbsd; then
-		MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
-			LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
-	fi
-}
-
-src_install() {
-	if use kernel_linux; then
-		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."
-		fi
-
-		# Add the aliases
-		[ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
-
-		# Ensures that our device nodes are created when not using X
-		exeinto /lib/udev
-		doexe "${FILESDIR}"/nvidia-udev.sh
-
-		insinto /lib/udev/rules.d
-		newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
-	fi
-
-	# NVIDIA kernel <-> userspace driver config lib
-	dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \
-		die "failed to install libnvidia-cfg"
-	dosym libnvidia-cfg.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvidia-cfg.so.1 || \
-		die "failed to create libnvidia-cfg.so symlink"
-	dosym libnvidia-cfg.so.1 \
-		/usr/$(get_libdir)/libnvidia-cfg.so || \
-		die "failed to create libnvidia-cfg.so symlink"
-
-	# NVIDIA monitoring library
-	dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \
-		die "failed to install libnvidia-ml"
-	dosym libnvidia-ml.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvidia-ml.so.1 || \
-		die "failed to create libnvidia-ml.so symlink"
-	dosym libnvidia-ml.so.1 \
-		/usr/$(get_libdir)/libnvidia-ml.so || \
-		die "failed to create libnvidia-ml.so symlink"
-
-	# NVIDIA video decode <-> CUDA
-	dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \
-		die "failed to install libnvcuvid.so"
-	dosym libnvcuvid.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libnvcuvid.so.1 || \
-		die "failed to create libnvcuvid.so symlink"
-	dosym libnvcuvid.so.1 \
-		/usr/$(get_libdir)/libnvcuvid.so || \
-		die "failed to create libnvcuvid.so symlink"
-
-	# Xorg DDX driver
-	insinto /usr/$(get_libdir)/xorg/modules/drivers
-	doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so"
-
-	# Xorg GLX driver
-	insinto /usr/$(get_libdir)/opengl/nvidia/extensions
-	doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \
-		die "failed to install libglx.so"
-	dosym libglx.so.${NV_SOVER} \
-		/usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \
-		die "failed to create libglx.so symlink"
-
-	# XvMC driver
-	dolib.a ${NV_X11}/libXvMCNVIDIA.a || \
-		die "failed to install libXvMCNVIDIA.so"
-	dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \
-		die "failed to install libXvMCNVIDIA.so"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-	dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \
-		die "failed to create libXvMCNVIDIA.so symlink"
-	dosym libXvMCNVIDIA.so.${NV_SOVER} \
-		/usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \
-		die "failed to create libXvMCNVIDIA_dynamic.so symlink"
-
-	# OpenCL ICD for NVIDIA
-	if use kernel_linux; then
-		insinto /etc/OpenCL/vendors
-		doins nvidia.icd
-	fi
-
-	# Documentation
-	dohtml ${NV_DOC}/html/*
-	if use x86-fbsd; then
-		dodoc "${NV_DOC}/README"
-		doman "${NV_MAN}/nvidia-xconfig.1"
-	else
-		# Docs
-		newdoc "${NV_DOC}/README.txt" README
-		dodoc "${NV_DOC}/NVIDIA_Changelog"
-		doman "${NV_MAN}/nvidia-smi.1.gz"
-		doman "${NV_MAN}/nvidia-xconfig.1.gz"
-	fi
-
-	# Helper Apps
-	exeinto /opt/bin/
-	doexe ${NV_EXEC}/nvidia-xconfig || die
-	doexe ${NV_EXEC}/nvidia-debugdump || die
-	doexe ${NV_EXEC}/nvidia-bug-report.sh || die
-	if use kernel_linux; then
-		doexe ${NV_EXEC}/nvidia-smi || die
-	fi
-
-	if has_multilib_profile ; 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"
-
-	# GNOME3 gnome-terminal redraw bug workaround,
-	# see: https://bugzilla.gnome.org/show_bug.cgi?id=664858
-	doenvd "${FILESDIR}/90mutter-disable-culling"
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second parameter is the base name of the library
-# the third parameter is the provided soversion
-donvidia() {
-	dodir $1
-	exeinto $1
-
-	libname=$(basename $2)
-
-	doexe $2.$3 || die "failed to install $2"
-	dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2"
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local inslibdir=$(get_libdir)
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local CL_ROOT=/usr/${inslibdir}/OpenCL/vendors/nvidia
-	local libdir= sover=
-
-	if use kernel_linux; then
-		if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-			libdir=32
-		else
-			libdir=.
-		fi
-		sover=${PV}
-	else
-		libdir=obj
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover}
-	donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover}
-	if use x86-fbsd; then
-		donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover}
-	else
-		donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	# VDPAU
-	donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover}
-
-	# CUDA & OpenCL
-	if use kernel_linux; then
-		donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover}
-		donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover}
-		donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0
-		#dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so
-	fi
-}
-
-pkg_preinst() {
-	# 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() {
-	# Switch to the nvidia implementation
-	"${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
-	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
-
-	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
-	elog
-	elog "NVIDIA has requested that any bug reports submitted have the"
-	elog "output of /opt/bin/nvidia-bug-report.sh included."
-	elog
-	elog "To work with compiz, you must enable the AddARGBGLXVisuals option."
-	elog
-	elog "If you are having resolution problems, try disabling DynamicTwinView."
-	elog
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
-}