Removee versions that rely on xorg-server-1.4 or older (which is no longer in the tree).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 7 insertions, 477 deletions

diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index cfb6880da5be..2f2006da8b8e 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.245 2010/08/30 01:50:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.246 2010/08/30 01:57:45 cardoe Exp $
+
+  30 Aug 2010; Doug Goldstein <cardoe@gentoo.org>
+  -nvidia-drivers-71.86.11.ebuild:
+  Removee versions that rely on xorg-server-1.4 or older (which is no longer
+  in the tree).
 
 *nvidia-drivers-256.52 (30 Aug 2010)
 *nvidia-drivers-256.44-r1 (30 Aug 2010)
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 529c7c492ad0..cd56fe59b804 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -36,7 +36,6 @@ DIST NVIDIA-Linux-x86-195.36.31-pkg0.run 24647695 RMD160 b048a70174f88ba2869a8c8
 DIST NVIDIA-Linux-x86-256.35.run 25084817 RMD160 0c1325a03fd98317b2285dc9f9b511991191d450 SHA1 7a72704c0fd70bf75126aa962b560bae893b5538 SHA256 8af6b6d6fc7244d87397e99be3e41de9f22032ac369e34af531facf1434cf662
 DIST NVIDIA-Linux-x86-256.44.run 25394009 RMD160 67406878dc8f38c0eb05edc2d17f34586d9b78b5 SHA1 177f62d251094cd6d6012f4251190c64b23c573e SHA256 b1de58b4bc9546aa010c078444a358ee7b398cf89d86b95867314fa357c839ce
 DIST NVIDIA-Linux-x86-256.52.run 25385807 RMD160 d5340935e2105ade231ee9316f6adddfbe4ea9bd SHA1 52d6dc3be1bd3e7fa387ef9aea36005a8da87413 SHA256 029bb2ade8da87f477bfc06122f91ad265db5ba4d5d198c29f625e70d3780d60
-DIST NVIDIA-Linux-x86-71.86.11-pkg0.run 5275754 RMD160 efe88c673bc3ba665419fd63404aba7858a54993 SHA1 a7d67c9f054fe3fb5072d49ca799e21b030ebe85 SHA256 75a1471eee07c5ec5cec894bf5d331b4d578adb52b6ba7bbec5fe141f061134b
 DIST NVIDIA-Linux-x86-96.43.14-pkg0.run 8440560 RMD160 7c8769bbaddbab31d24c852a8ee832639fc6545a SHA1 5764bb2d88a529f4478f867e4c5a67ab4c2bf5c6 SHA256 7906f34371f06ca8deb977e1e9c321b1687e0db3fecf98e1ba7bc0779b8c236d
 DIST NVIDIA-Linux-x86-96.43.16-pkg0.run 8441195 RMD160 3d1b09b87013d765e0fc602b9fe77aa96e650e70 SHA1 f17ff6c4862ba06b2208eb18e46c323927db65eb SHA256 243e458ccaf898c49794030cbbc59a0d740a4cefb2891ecc5721f6db79088ced
 DIST NVIDIA-Linux-x86-96.43.18-pkg0.run 8443640 RMD160 b59b60709c74f466fb33ac0f260d3bd1772c66ae SHA1 392632fa8c6414e28a138caf1bb130eb28b486bc SHA256 dcab1421fbfb3d9557e457a0e02feb44b971530206b5ff7516543e5977c9542a
@@ -51,7 +50,6 @@ DIST NVIDIA-Linux-x86_64-195.36.31-pkg2.run 42115060 RMD160 41c0fa6730afd9d45897
 DIST NVIDIA-Linux-x86_64-256.35.run 42572777 RMD160 e9d56f4709a4135a28179f5dea761ea90307ceb1 SHA1 6ab9eeed3f56daadcc59df88e0549cdc3911191a SHA256 ef10ecddd8db11f0fa3c6e4727dc275eb0ca9d23a7b7d37a038d17d2a42acb2a
 DIST NVIDIA-Linux-x86_64-256.44.run 42904565 RMD160 d19900e34e3b2246f83226e153d3af40dfb1682d SHA1 2774723bb0d236991725b81b1392aaeeb6f6910e SHA256 528aaed18b6b4ba79dbf4ae5c5ecda8350007d610d2c7c608eb646739cfeb500
 DIST NVIDIA-Linux-x86_64-256.52.run 42907596 RMD160 9e74edb784d029d09019e658ed855325735ca767 SHA1 d45357db86029244fe8283357d50ad0710572765 SHA256 3ab713f969fe7cf0d7ccfdfee2863c92ea96d1eb5bf3f734b3a1e5b37c2611c8
-DIST NVIDIA-Linux-x86_64-71.86.11-pkg2.run 8390675 RMD160 5ce5f01f70901e9fa711d1ef5d0e20bd471d9af5 SHA1 92364b06bf9aad89b6be351ed23ed316a6cd2515 SHA256 fccfd8f017820599e7a29443d65d990a2d083479c7ed980249cc0d37ca5cfba7
 DIST NVIDIA-Linux-x86_64-96.43.14-pkg2.run 12335444 RMD160 acb51a655176459067d0e21abe56817bc312a593 SHA1 48e63fa012e9e6240319bc2713af3b1e900375dc SHA256 39095e16edc8db19b2c5c38a97f383445a0930e76b74185bc9e3527dbb2cccfd
 DIST NVIDIA-Linux-x86_64-96.43.16-pkg2.run 12337604 RMD160 fd7c586b53ff0b19034f8ef24dd24bec41940136 SHA1 b06a13d23565966821061c8d7cd1a636079ed1d8 SHA256 476538ffc3f7a5e964c7449d5242b0a684c95013d6fb1f5baa2324ef34aa5a73
 DIST NVIDIA-Linux-x86_64-96.43.18-pkg2.run 12338886 RMD160 38cf91827e3011a35b00c064747bf98e965097a1 SHA1 b7811f14d86d4ed00c780351765580ec3d353968 SHA256 4644b1b3a78e651af079f85c8cf55b3666cca9ae466a43135d5857be31fa1ac8
@@ -67,9 +65,8 @@ EBUILD nvidia-drivers-256.35.ebuild 14974 RMD160 6c57b73ac722fb1d8a7dce51c216643
 EBUILD nvidia-drivers-256.44-r1.ebuild 15049 RMD160 f724ce8e68b02369c88a8e8b3f392f1cc5113864 SHA1 acd601d950001b647fc7daf8a4814fd476528a3c SHA256 f14ce47474edd2782a5e20faa861ee63a2241291a03481cbc41f7d8b6f596573
 EBUILD nvidia-drivers-256.44.ebuild 14978 RMD160 7f399e5c3a48665db6a91691f0bd646678965461 SHA1 dec52a8e1c4f4b90103a41d84fe4902042e278e6 SHA256 25a38f763cf2873c2cdcc0af83bb2a2b952a959124d4d880be10067dc477c42c
 EBUILD nvidia-drivers-256.52.ebuild 15046 RMD160 53fb95b3da6b8fba2fd012c4c17edd9dd3be3a9d SHA1 00bac3f157741a340af34948031d8bc2e6d99f5c SHA256 cd28052f8a2977215c842ba198554dc0f6f0f90aeb7c7813f1cbf1ced85712ed
-EBUILD nvidia-drivers-71.86.11.ebuild 14145 RMD160 5e9e15878887260f913394366c23a757c1753158 SHA1 fd9dd2e9a722f9d433495b4c984499632f34d80d SHA256 38198faa3c4199850fa7ede7d0db0e8848557b795d0058fccbf91dbd8b62ae2a
 EBUILD nvidia-drivers-96.43.14.ebuild 15375 RMD160 6c2b2a669cea9e56661cffca5a1a81efb297a9ab SHA1 787733c9815b5a7ab0bc69db52f42e9eaaf76b0d SHA256 8582f40b5977e8e415e57fcc1dde7b9ba88bde5252871ccfb01c54ca373cd445
 EBUILD nvidia-drivers-96.43.16.ebuild 15375 RMD160 7f5c11269019caa7a32416a1762404487a17b76a SHA1 a78162fc120650cde3fe7078a481c24bad50df4f SHA256 9260a5e3421b9b9f7a704531bb965d7bd317e552fc3a35140faf3838ae78621e
 EBUILD nvidia-drivers-96.43.18.ebuild 15377 RMD160 451d351f40a33cf0de85e8339e95e806d8a9645c SHA1 e2b8918681024c3968c46f6fdb81ef88f0417908 SHA256 f5a9bb7000cf859e58d6655d29f8a2c9b710c366b3445e71eee65b12b51837a3
-MISC ChangeLog 53772 RMD160 46b1c5579b7b1511a8680dffda3e773236ed9df7 SHA1 93b8d3276351b393849d042b22e438ce35f48575 SHA256 d75fcaf2ff1044c370f31524589b001730423d34b4703cfb79518300bed20b30
+MISC ChangeLog 53951 RMD160 680e578d63b6246a12d1339e2bc8e87684c38646 SHA1 8e317272f4cdfcb898b9444c92559eaf2be07e8f SHA256 3fea6df9006bdca30933911bbf5e75a2208e861a418c37aeb9b923cd4765f35e
 MISC metadata.xml 546 RMD160 91ee180beb1b4acd8742b4ede2a528413c27d904 SHA1 6cb54af78a52760767088a1817a6f6bff19f2e08 SHA256 2e76e319e9b7db64d581d065d396c0b3ee942253d7470a9ac75d8e9131edb4eb
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild
deleted file mode 100644
index 87e652e47850..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild
+++ /dev/null
@@ -1,472 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-71.86.11.ebuild,v 1.7 2010/07/30 22:14:19 scarabeus Exp $
-
-EAPI="2"
-
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver
-
-X86_NV="Linux-x86"
-AMD64_NV="Linux-x86_64"
-X86_FBSD_NV="FreeBSD-x86"
-X86_NV_PACKAGE="NVIDIA-${X86_NV}-${PV}-pkg0"
-AMD64_NV_PACKAGE="NVIDIA-${AMD64_NV}-${PV}-pkg2"
-X86_FBSD_NV_PACKAGE="NVIDIA-${X86_FBSD_NV}-${PV}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/${X86_NV}/${PV}/${X86_NV_PACKAGE}.run )
-	 amd64? ( ftp://download.nvidia.com/XFree86/${AMD64_NV}/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="acpi custom-cflags gtk multilib kernel_FreeBSD kernel_linux userland_BSD"
-RESTRICT="strip"
-EMULTILIB_PKG="true"
-
-COMMON="<x11-base/xorg-server-1.4.99
-	multilib? ( app-emulation/emul-linux-x86-opengl )
-	kernel_FreeBSD? ( !media-video/nvidia-freebsd )
-	!app-emulation/emul-linux-x86-nvidia
-	!x11-drivers/nvidia-legacy-drivers"
-DEPEND="${COMMON}
-	kernel_linux? ( virtual/linux-sources )
-	app-admin/eselect-opengl"
-RDEPEND="${COMMON}
-	kernel_linux? ( virtual/modutils )
-	!>=media-libs/mesa-7.6
-	acpi? ( sys-power/acpid )"
-PDEPEND="gtk? ( media-video/nvidia-settings )"
-
-QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/opengl/nvidia/extensions/libglx.so"
-
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko
-	usr/lib/opengl/nvidia/lib/libGL.so.1
-	usr/lib/opengl/nvidia/lib/libGLcore.so.1
-	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.1
-	usr/lib/opengl/nvidia/extensions/libglx.so
-	usr/lib/xorg/modules/drivers/nvidia_drv.so"
-
-QA_WX_LOAD_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so"
-
-QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib32/xorg/libXvMCNVIDIA.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV}
-	usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV}
-	usr/lib32/libXvMCNVIDIA.so.${PV}
-	usr/lib32/xorg/modules/drivers/nvidia_drv.so
-	usr/lib32/opengl/nvidia/extensions/libglx.so"
-
-QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib32/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV}
-	usr/lib32/opengl/nvidia/extensions/libglx.so"
-
-QA_EXECSTACK_amd64="usr/lib64/xorg/modules/drivers/nvidia_drv.so
-	usr/lib64/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib64/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib64/opengl/nvidia/extensions/libglx.so
-	usr/lib64/libXvMCNVIDIA.so.${PV}
-	usr/bin/nvidia-xconfig"
-
-QA_EXECSTACK_x86="usr/lib/xorg/modules/drivers/nvidia_drv.so
-	usr/lib/opengl/nvidia/lib/libGL.so.${PV}
-	usr/lib/opengl/nvidia/lib/libnvidia-cfg.so.${PV}
-	usr/lib/opengl/nvidia/extensions/libglx.so
-	usr/lib/libXvMCNVIDIA.so.${PV}
-	usr/bin/nvidia-xconfig"
-
-mtrr_check() {
-	ebegin "Checking for MTRR support"
-	linux_chkconfig_present MTRR
-	eend $?
-
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features"
-		eerror "    [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-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
-
-	# use the right package
-	if use x86; then
-		NV_PACKAGE="${X86_NV_PACKAGE}"
-	elif use amd64; then
-		NV_PACKAGE="${AMD64_NV_PACKAGE}"
-	elif use x86-fbsd; then
-		NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-	else
-		die "Could not determine proper NVIDIA package"
-	fi
-
-	# set variables to where files are in the package structure
-	if use kernel_FreeBSD; then
-		NV_DOC="${WORKDIR}/${NV_PACKAGE}/doc"
-		NV_EXEC="${WORKDIR}/${NV_PACKAGE}/obj"
-		NV_SRC="${WORKDIR}/${NV_PACKAGE}/src"
-	elif use kernel_linux; then
-		NV_DOC="${WORKDIR}/${NV_PACKAGE}/usr/share/doc"
-		NV_EXEC="${WORKDIR}/${NV_PACKAGE}/usr/bin"
-		NV_SRC="${WORKDIR}/${NV_PACKAGE}/usr/src/nv"
-	fi
-
-	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; then
-		linux-mod_pkg_setup
-		MODULE_NAMES="nvidia(video:${NV_SRC})"
-		BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
-		SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)"
-		mtrr_check
-	fi
-
-	# On BSD userland it wants real make command
-	use userland_BSD && MAKE="$(get_bmake)"
-
-	# Unknown why this needs to be set
-	export _POSIX2_VERSION="199209"
-
-	# Since Nvidia ships 3 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
-}
-
-src_unpack() {
-	if use kernel_linux && kernel_is lt 2 6 7; then
-		echo
-		ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}"
-		ewarn "This is not officially supported for ${P}. It is likely you"
-		ewarn "will not be able to compile or use the kernel module."
-		ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7"
-		echo
-		ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored."
-	fi
-
-	if ! use x86-fbsd; then
-		mkdir "${WORKDIR}/${NV_PACKAGE}"
-		cd "${WORKDIR}/${NV_PACKAGE}"
-		unpack_makeself
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Please add a brief description for every added patch
-	use x86-fbsd \
-		&& cd "${NV_DOC}" \
-		|| cd "${WORKDIR}/${NV_PACKAGE}"
-	# Use the correct defines to make gtkglext build work
-	epatch "${FILESDIR}"/NVIDIA_glx-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch "${FILESDIR}"/NVIDIA_glx-glheader.patch
-
-	if use kernel_linux; then
-		# Quiet down warnings the user does not need to see
-		sed -i \
-			-e 's:-Wpointer-arith::g' \
-			-e 's:-Wsign-compare::g' \
-			"${WORKDIR}/${NV_PACKAGE}"/Makefile.kbuild
-
-		# If you set this then it's your own fault when stuff breaks :)
-		[[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.*
-
-		# If greater than 2.6.5 use M= instead of SUBDIR=
-		convert_to_m "${NV_SRC}"/Makefile.kbuild
-	fi
-}
-
-src_compile() {
-	# This is already the default on Linux, as there's no toplevel Makefile, but
-	# on FreeBSD there's one and triggers the kernel module build, as we install
-	# it by itself, pass this.
-
-	cd "${NV_SRC}"
-	if use x86-fbsd; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" \
-			CFLAGS="-Wno-sign-compare" || die "Failed to compile"
-	else
-		linux-mod_src_compile
-	fi
-}
-
-src_install() {
-	cd "${WORKDIR}"/${NV_PACKAGE}
-
-	if ! use x86-fbsd; then
-		linux-mod_src_install
-
-		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" ] || die "nvidia missing in FILESDIR"
-		sed -e 's:PACKAGE:'${PF}':g' \
-			-e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia > \
-			"${WORKDIR}"/nvidia
-		insinto /etc/modprobe.d
-		newins "${WORKDIR}"/nvidia nvidia.conf || die
-	else
-		insinto /boot/modules
-		doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die
-
-		exeinto /boot/modules
-		doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || 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
-	elif use amd64 ; then
-		src_install-libs lib32 $(get_multilibdir)
-		src_install-libs lib $(get_libdir)
-
-		rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/include
-		rm -rf "${D}"/usr/$(get_multilibdir)/opengl/nvidia/extensions
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || return 0
-
-	# Documentation
-	dodoc "${NV_DOC}"/{XF86Config.sample,README}
-	dohtml "${NV_DOC}"/html/*
-	if ! use x86-fbsd; then
-		dodoc "${NV_DOC}"/NVIDIA_Changelog
-	fi
-
-	# Helper Apps
-	dobin "${NV_EXEC}"/nvidia-bug-report.sh || die
-}
-
-# 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
-	dosym ${libname}.$3 $1/${libname}
-
-	[[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local usrpkglibdir=usr/${pkglibdir}
-	local libdir=usr/X11R6/${pkglibdir}
-	local drvdir=${libdir}/modules/drivers
-	local extdir=${libdir}/modules/extensions
-	local incdir=usr/include/GL
-	local sover=${PV}
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
-	local TLS_ROOT="${NV_ROOT}/tls"
-	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
-
-	if ! has_version x11-base/xorg-server ; then
-		X11_LIB_DIR="/usr/${inslibdir}"
-	fi
-
-	if use x86-fbsd; then
-		# on FreeBSD everything is on obj/
-		pkglibdir=obj
-		usrpkglibdir=obj
-		x11pkglibdir=obj
-		drvdir=obj
-		extdir=obj
-
-		# don't ask me why the headers are there.. glxext.h is missing
-		incdir=doc
-
-		# on FreeBSD it has just .1 suffix
-		sover=1
-	fi
-
-	# The GLX libraries
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover}
-	donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover}
-
-	dodir ${NO_TLS_ROOT}
-	donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover}
-
-	if ! use x86-fbsd; then
-		donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover}
-	fi
-
-	if want_tls ; then
-		dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	else
-		dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib
-		dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib
-	fi
-
-	if ! use x86-fbsd; then
-		# Install the .la file for libtool, to prevent e.g. bug #176423
-		[ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR"
-		local ver1=$(get_version_component_range 1)
-		local ver2=$(get_version_component_range 2)
-		local ver3=$(get_version_component_range 3)
-		sed -e "s:\${PV}:${PV}:"     \
-			-e "s:\${ver1}:${ver1}:" \
-			-e "s:\${ver2}:${ver2}:" \
-			-e "s:\${ver3}:${ver3}:" \
-			-e "s:\${libdir}:${inslibdir}:" \
-			"${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-
-	[[ -f ${drvdir}/nvidia_drv.so ]] && \
-		doexe ${drvdir}/nvidia_drv.so
-
-	insinto /usr/${inslibdir}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto /usr/${inslibdir}
-	# fix Bug 131315
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \
-		dosym libXvMCNVIDIA.so.${PV} \
-			/usr/${inslibdir}/libXvMCNVIDIA.so
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \
-		newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-}
-
-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() {
-	if use kernel_linux; then
-		linux-mod_pkg_postinst
-	fi
-
-	# Switch to the nvidia implementation
-	eselect opengl set --use-old nvidia
-
-	echo
-	elog "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
-	elog
-	elog "nVidia has requested that any bug reports submitted have the"
-	elog "output of /usr/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."
-	echo
-}
-
-want_tls() {
-	# For uclibc or anything non glibc, return false
-	has_version sys-libs/glibc || return 1
-
-	# Old versions of glibc were lt/no-tls only
-	has_version '<sys-libs/glibc-2.3.2' && return 1
-
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) return 1 ;;
-		esac
-	fi
-
-	# 2.3.5 turned off tls for linuxthreads glibc on i486 and i586
-	if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then
-		case ${CHOST/-*} in
-			i486|i586) return 1 ;;
-		esac
-	fi
-
-	# These versions built linuxthreads version to support tls, too
-	has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0
-
-	return 1
-}
-
-pkg_postrm() {
-	if use kernel_linux; then
-		linux-mod_pkg_postrm
-	fi
-	eselect opengl set --use-old xorg-x11
-}