Removing old revisions.

Package-Manager: portage-2.1_pre6-r6

5 files changed, 5 insertions, 667 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index ffae72b44251..f3a66483046d 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.111 2006/03/24 20:26:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.112 2006/03/24 20:28:58 eradicator Exp $
+
+  24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.7676-r1.ebuild, -nvidia-glx-1.0.8174.ebuild:
+  Removing old revisions.
 
   24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
   -nvidia-glx-1.0.6111-r2.ebuild, nvidia-glx-1.0.6111-r3.ebuild,
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1
deleted file mode 100644
index 42e8231cd30c..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7676-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a5b99cfb2cca7b424cefc27fb6a30ce NVIDIA-FreeBSD-x86-1.0-7676.tar.gz 8455397
-MD5 2474c5513006668b0fba401e042dc009 NVIDIA-Linux-x86-1.0-7676-pkg0.run 5631274
-MD5 df2081504b609aaa95ccc8e95aebfb97 NVIDIA-Linux-x86_64-1.0-7676-pkg2.run 8824402
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8174 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8174
deleted file mode 100644
index 5d6a6bdffd91..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.8174
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3f21b6928ab38960113bf257062576c7 NVIDIA-Linux-x86-1.0-8174-pkg1.run 11998227
-MD5 d1f9786dfda74005832ac005e276462a NVIDIA-Linux-x86_64-1.0-8174-pkg2.run 9559334
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
deleted file mode 100644
index 2d442e408a51..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.7 2006/03/03 23:52:47 vapier Exp $
-
-inherit eutils multilib versionator
-
-X86_PKG_V="pkg0"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )
-	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dlloader"
-RESTRICT="nostrip multilib-pkg-force"
-
-RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
-	 || ( virtual/x11 media-libs/mesa )
-	 app-admin/eselect-opengl
-	 kernel_linux? ( ~media-video/nvidia-kernel-${PV} )
-	 !app-emulation/emul-linux-x86-nvidia"
-# This should be added to have full dependencies for Gentoo FreeBSD
-# but can't be added until the profiles are in main portage (for repoman)
-# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )
-
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-if use x86; then
-	PKG_V="-${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-elif use x86-fbsd; then
-	PKG_V=""
-	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-# On BSD userland it wants real make command
-MAKE="make"
-
-check_xfree() {
-	# This isn't necessary, true. But its about time people got the idea.
-	if has_version "x11-base/xfree"; then
-		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
-	fi
-}
-
-pkg_setup() {
-	check_xfree
-
-	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
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
-
-	if ! use x86-fbsd; then
-		cd ${WORKDIR}
-		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
-	else
-		unpack ${A}
-	fi
-
-	# Patchs go below here, add breif description
-	cd ${S}
-	if ! use x86-fbsd; then
-		# nVidia wants us to use nvidia-installer, removing warning.
-		epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
-	else
-		cd ${S}/doc
-	fi
-	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
-
-	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
-	# 16 July 2004, opengl-update is now supplying glext.h for system wide
-	# compatibility, so we still need to remove this.
-	# 7 November 2004, Keeping this around for 6629 to see what happens.
-	#rm -f usr/include/GL/glext.h
-}
-
-src_install() {
-	local MLTEST=$(type dyn_unpack)
-
-	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && 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
-
-	if ! use x86-fbsd; then
-		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-		rm -f usr/share/doc/nvidia-settings*
-		dodoc usr/share/doc/*
-	else
-		dodoc doc/README doc/README.Linux doc/XF86Config.sample
-	fi
-
-	# nVidia want bug reports using this script
-	exeinto /usr/bin
-	doexe usr/bin/nvidia-bug-report.sh
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second paramis 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 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
-		# Not sure whether installing the .la file is neccessary;
-		# this is adopted from the `nvidia' ebuild
-		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
-
-	if use dlloader; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
-
-	insinto ${X11_LIB_DIR}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-}
-
-pkg_preinst() {
-	if ! has_version x11-base/xorg-server ; then
-		for dir in lib lib32 lib64 ; do
-			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
-				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
-				rmdir ${D}/usr/${dir}/xorg
-			fi
-		done
-	fi
-
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
-	   has_version "x11-base/xfree86" ; then
-		mkdir -p ${D}/usr/X11R6
-		for dir in lib lib32 lib64 ; do
-			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
-		done
-	fi
-
-
-	# Clean the dinamic 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
-	eselect opengl set --use-old nvidia
-
-	echo
-	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
-	echo
-	einfo "You may also be interested in media-video/nvidia-settings"
-	echo
-	einfo "nVidia has requested that any bug reports submitted have the"
-	einfo "output of /usr/bin/nvidia-bug-report.sh included."
-}
-
-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
-
-	local valid_chost="true"
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) valid_chost="false"
-		esac
-	fi
-
-	[[ ${valid_chost} == "false" ]] && return 1
-
-	# If we've got nptl, we've got tls
-	built_with_use sys-libs/glibc nptl && return 0
-
-	# 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() {
-	eselect opengl set --use-old xorg-x11
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.8174.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.8174.ebuild
deleted file mode 100644
index c093a108319a..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.8174.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8174.ebuild,v 1.3 2006/03/03 23:52:47 vapier Exp $
-
-inherit eutils multilib versionator
-
-X86_PKG_V="pkg1"
-AMD64_PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-#X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}"
-
-DESCRIPTION="NVIDIA X11 driver and GLX libraries"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run )
-	 amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run )"
-#	 x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dlloader"
-RESTRICT="nostrip multilib-pkg-force"
-
-RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
-	 || ( virtual/x11 media-libs/mesa )
-	 app-admin/eselect-opengl
-	 kernel_linux? ( ~media-video/nvidia-kernel-${PV} )
-	 !app-emulation/emul-linux-x86-nvidia"
-# This should be added to have full dependencies for Gentoo FreeBSD
-# but can't be added until the profiles are in main portage (for repoman)
-# kernel_FreeBSD? ( ~media-video/nvidia-freebsd-${PV} )
-
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-if use x86; then
-	PKG_V="-${X86_PKG_V}"
-	NV_PACKAGE="${X86_NV_PACKAGE}"
-elif use amd64; then
-	PKG_V="-${AMD64_PKG_V}"
-	NV_PACKAGE="${AMD64_NV_PACKAGE}"
-#elif use x86-fbsd; then
-#	PKG_V=""
-#	NV_PACKAGE="${X86_FBSD_NV_PACKAGE}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}${PKG_V}"
-
-# On BSD userland it wants real make command
-MAKE="make"
-
-check_xfree() {
-	# This isn't necessary, true. But its about time people got the idea.
-	if has_version "x11-base/xfree"; then
-		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
-	fi
-}
-
-pkg_setup() {
-	check_xfree
-
-	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
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
-
-	if ! use x86-fbsd; then
-		cd ${WORKDIR}
-		bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only
-	else
-		unpack ${A}
-	fi
-
-	# Patchs go below here, add breif description
-	cd ${S}
-	if ! use x86-fbsd; then
-		# nVidia wants us to use nvidia-installer, removing warning.
-		epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
-	else
-		cd ${S}/doc
-	fi
-	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
-
-	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
-	# 16 July 2004, opengl-update is now supplying glext.h for system wide
-	# compatibility, so we still need to remove this.
-	# 7 November 2004, Keeping this around for 6629 to see what happens.
-	#rm -f usr/include/GL/glext.h
-}
-
-src_install() {
-	local MLTEST=$(type dyn_unpack)
-
-	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && 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
-
-	if ! use x86-fbsd; then
-		# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-		rm -f usr/share/doc/nvidia-settings*
-		dodoc usr/share/doc/*
-	else
-		dodoc doc/README doc/README.Linux doc/XF86Config.sample
-	fi
-
-	# nVidia want bug reports using this script
-	exeinto /usr/bin
-	doexe usr/bin/nvidia-bug-report.sh
-}
-
-# Install nvidia library:
-# the first parameter is the place where to install it
-# the second paramis 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 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
-		# Not sure whether installing the .la file is neccessary;
-		# this is adopted from the `nvidia' ebuild
-		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
-
-	if use dlloader; then
-		[[ -f ${drvdir}/nvidia_drv.so ]] && \
-			doexe ${drvdir}/nvidia_drv.so
-	else
-		[[ -f ${drvdir}/nvidia_drv.o ]] && \
-			doexe ${drvdir}/nvidia_drv.o
-	fi
-
-	insinto ${X11_LIB_DIR}
-	[[ -f ${libdir}/libXvMCNVIDIA.a ]] && \
-		doins ${libdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe ${libdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f ${extdir}/libglx.so.${sover} ]] && \
-		newexe ${extdir}/libglx.so.${sover} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins ${incdir}/*.h
-}
-
-pkg_preinst() {
-	# Can we make up our minds ?!?!?
-	local NV_D=${IMAGE:-${D}}
-
-	if ! has_version x11-base/xorg-server ; then
-		for dir in lib lib32 lib64 ; do
-			if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then
-				mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir}
-				rmdir ${NV_D}/usr/${dir}/xorg
-			fi
-		done
-	fi
-
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
-	   has_version "x11-base/xfree86" ; then
-		mkdir -p ${NV_D}/usr/X11R6
-		for dir in lib lib32 lib64 ; do
-			[[ -d ${NV_D}/usr/${dir} ]] && mv ${NV_D}/usr/${dir} ${NV_D}/usr/X11R6
-		done
-	fi
-
-
-	# Clean the dinamic 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
-	eselect opengl set --use-old nvidia
-
-	echo
-	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
-	echo
-	einfo "You may also be interested in media-video/nvidia-settings"
-	echo
-	einfo "nVidia has requested that any bug reports submitted have the"
-	einfo "output of /usr/bin/nvidia-bug-report.sh included."
-}
-
-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
-
-	local valid_chost="true"
-	if use x86 ; then
-		case ${CHOST/-*} in
-			i486|i586|i686) ;;
-			*) valid_chost="false"
-		esac
-	fi
-
-	[[ ${valid_chost} == "false" ]] && return 1
-
-	# If we've got nptl, we've got tls
-	built_with_use sys-libs/glibc nptl && return 0
-
-	# 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() {
-	eselect opengl set --use-old xorg-x11
-}