Removing several of the old nvidia glx ebuilds, leaving corresponding versions for nvidia kernel and up to two for each profile.

27 files changed, 27 insertions, 1328 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 4a34c8ecd23b..3b4cb66c20c7 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/nvidia-glx 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.39 2004/04/08 10:25:34 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.40 2004/04/13 16:15:08 cyfred Exp $
+
+  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>; nvidia-glx-1.0.2880.ebuild,
+  nvidia-glx-1.0.2960-r1.ebuild, nvidia-glx-1.0.3123.ebuild,
+  nvidia-glx-1.0.4180.ebuild, nvidia-glx-1.0.4191-r1.ebuild,
+  nvidia-glx-1.0.4191.ebuild, nvidia-glx-1.0.4349.ebuild,
+  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.5328.ebuild,
+  nvidia-glx-1.0.5332.ebuild, nvidia-glx-1.0.5336-r1.ebuild,
+  nvidia-glx-1.0.5336.ebuild, files/libGL.la:
+  Removing several of the old nvidia glx ebuilds, leaving nvidia kernel
+  corresponding versions and up to two for each profile.
 
 *nvidia-glx-1.0.5332-r2 (08 Apr 2004)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 30adcb4cc071..e9852cd90a6b 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,50 +1,25 @@
-MD5 c8368ac34754c6cba439159280188070 ChangeLog 6298
-MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
-MD5 0191a83e40ea1310e7feb19ef6261fb7 nvidia-glx-1.0.2880.ebuild 2569
-MD5 218d60d52500ff0dab705766cdcbfab2 nvidia-glx-1.0.2960-r1.ebuild 2613
-MD5 6b1fb591f57a7363c199e29911f1d782 nvidia-glx-1.0.3123.ebuild 2548
-MD5 322b89e42d8ebd523130cec232912574 nvidia-glx-1.0.4180.ebuild 2669
-MD5 c03e64a5834a617bf0bc176cbcc831ec nvidia-glx-1.0.4191-r1.ebuild 2669
-MD5 ce80be748a63b9e71aae96a9b85952e2 nvidia-glx-1.0.4191.ebuild 2548
-MD5 7b1a1785b9d24fe67f230601a4ba6bb5 nvidia-glx-1.0.4349.ebuild 3009
-MD5 2d52a6d652e7b3df9ba1b83fde9c443a nvidia-glx-1.0.4363.ebuild 2946
-MD5 342683e396a2f3a19bb03240946f2b14 nvidia-glx-1.0.4496-r1.ebuild 3037
-MD5 3ddaaf5939e64ff9eb5e5e00060767d9 nvidia-glx-1.0.4496.ebuild 3008
-MD5 3df4c8fd0ec98502ade783f2d9567485 nvidia-glx-1.0.4499.ebuild 2679
-MD5 90bf90f7f4b0eef05810db5216ba2a8f nvidia-glx-1.0.5328-r1.ebuild 3066
-MD5 bb24a68c07f4b9c27f9d115a3aaf72dd nvidia-glx-1.0.5328.ebuild 3034
-MD5 cc7765cbbc24ec65578455f83e69b77c nvidia-glx-1.0.5332-r1.ebuild 3327
-MD5 788abca9476f13a2fdbae77cdee11dab nvidia-glx-1.0.5332.ebuild 3327
-MD5 3d890ba89122ea4c48816cfab255a293 nvidia-glx-1.0.5336-r1.ebuild 3076
 MD5 b4564e382e88152183bfb6381e8973f4 nvidia-glx-1.0.5336-r2.ebuild 3229
-MD5 82612c8316b5a04ad33ff58d93bc5c22 nvidia-glx-1.0.5336.ebuild 3073
 MD5 cfc6ed56d1a00c1cb947481394000c0e nvidia-glx-1.0.5332-r2.ebuild 3474
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 3df4c8fd0ec98502ade783f2d9567485 nvidia-glx-1.0.4499.ebuild 2679
+MD5 3ddaaf5939e64ff9eb5e5e00060767d9 nvidia-glx-1.0.4496.ebuild 3008
+MD5 cc7765cbbc24ec65578455f83e69b77c nvidia-glx-1.0.5332-r1.ebuild 3327
+MD5 2d52a6d652e7b3df9ba1b83fde9c443a nvidia-glx-1.0.4363.ebuild 2946
+MD5 90bf90f7f4b0eef05810db5216ba2a8f nvidia-glx-1.0.5328-r1.ebuild 3066
+MD5 f8f9a67d7d8e0a94419f7b557641ab50 ChangeLog 6858
+MD5 fe2f0a492565eb0ae0831e308df50664 metadata.xml 158
+MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 db715a5b58ba38f9d757cf6be06778e7 files/digest-nvidia-glx-1.0.2880 72
-MD5 d95d0e66acb41538e6faace158d2ac21 files/digest-nvidia-glx-1.0.2960-r1 72
-MD5 fe071363bf9a87e17f14273a23a2192d files/digest-nvidia-glx-1.0.3123 72
-MD5 55f859a1c99a7fb8329f83ca27c02d27 files/digest-nvidia-glx-1.0.4180 72
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191 72
-MD5 feb67e9281b725c30e7a45327532267f files/digest-nvidia-glx-1.0.4191-r1 72
-MD5 8b34536317191f4059bebe95beabe1a4 files/digest-nvidia-glx-1.0.4349 72
+MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
+MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
 MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
 MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
-MD5 a31ceab3377afe2286673e74ddf89468 files/digest-nvidia-glx-1.0.4496-r1 80
 MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328 80
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
-MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332 83
-MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r1 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336 80
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r1 80
-MD5 cac348587b9f365512957ab034c2eed2 files/libGL.la 740
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
-MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
-MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r1 80
+MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r1 83
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
+MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
+MD5 8bbb4aceec8380bff8456f2e7a824580 files/nvidia-glx-1.0.4191-defines.patch 906
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 edc0aa96126ecf2502823be39bdd38b3 files/nvidia-glx-1.0.4180-defines.patch 906
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
deleted file mode 100644
index d03c50ec7e54..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2880
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60cb303e5bb2ac424b865f6fa163b989 NVIDIA_GLX-1.0-2880.tar.gz 1527134
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960-r1
deleted file mode 100644
index 45e2d3241d75..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.2960-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38947e44a19a576c2ab8e648e1f3cf18 NVIDIA_GLX-1.0-2960.tar.gz 1730225
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123
deleted file mode 100644
index 7c5a88369ba7..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.3123
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e1ea7847838f49360cf358b2c8fb15b NVIDIA_GLX-1.0-3123.tar.gz 1765011
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4180 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4180
deleted file mode 100644
index c3015dc8b3ae..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4180
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8fce69148978c023794c7c645a63859b NVIDIA_GLX-1.0-4180.tar.gz 2321950
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191
deleted file mode 100644
index 8d0a04eacf54..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4bb548a6cf5e485e672f2c6ee1de6605 NVIDIA_GLX-1.0-4191.tar.gz 2185167
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191-r1
deleted file mode 100644
index 8d0a04eacf54..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4191-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4bb548a6cf5e485e672f2c6ee1de6605 NVIDIA_GLX-1.0-4191.tar.gz 2185167
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4349 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4349
deleted file mode 100644
index 1378c811e6ed..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4349
+++ /dev/null
@@ -1 +0,0 @@
-MD5 686901f2c331553b431de11777e221a3 NVIDIA_GLX-1.0-4349.tar.gz 4195670
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
deleted file mode 100644
index 8c3545c240d1..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34543e7bf271ff90e1a536aacd32efbd NVIDIA-Linux-x86-1.0-4496-pkg2.run 8196793
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328
deleted file mode 100644
index 32ab3b45d935..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2ae3a449837430d5f10a2ebf3d9f7d4 NVIDIA-Linux-x86-1.0-5328-pkg1.run 6855080
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332
deleted file mode 100644
index 943071e25292..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eede761ab428ff0d27e5f67e8c555972 NVIDIA-Linux-x86_64-1.0-5332-pkg0.run 5597826
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336
deleted file mode 100644
index 56ddf0d273b7..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r1
deleted file mode 100644
index 56ddf0d273b7..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-glx/files/libGL.la b/media-video/nvidia-glx/files/libGL.la
deleted file mode 100644
index f79c05c0853e..000000000000
--- a/media-video/nvidia-glx/files/libGL.la
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/lib -lm -lX11 -lXext -ldl     '
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/opt/nvidia/lib'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
deleted file mode 100644
index c02547f9fbb7..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2880.ebuild,v 1.12 2004/02/01 02:51:10 azarah Exp $
-
-NV_V=${PV/1.0./1.0-}
-NV_PACKAGE=NVIDIA_GLX-${NV_V}
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
-	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "Make sure to read documentation in /doc/share/${P}"
-	einfo "before you attempt to tweak your XF86Config file!"
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild
deleted file mode 100644
index 9ebfcf671405..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.2960-r1.ebuild,v 1.10 2004/02/01 02:51:10 azarah Exp $
-
-NV_V=${PV/1.0./1.0-}
-NV_PACKAGE=NVIDIA_GLX-${NV_V}
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz
-	http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild
deleted file mode 100644
index 3e88b3ea8528..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.3123.ebuild,v 1.7 2004/02/01 02:51:10 azarah Exp $
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4180.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4180.ebuild
deleted file mode 100644
index 7cff70172d90..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4180.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4180.ebuild,v 1.3 2004/02/01 02:51:10 azarah Exp $
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	# correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
-
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4191-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4191-r1.ebuild
deleted file mode 100644
index d572dd2c4f37..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4191-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4191-r1.ebuild,v 1.5 2004/02/01 02:51:10 azarah Exp $
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	# correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4191.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4191.ebuild
deleted file mode 100644
index a2aabf3dde35..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4191.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4191.ebuild,v 1.6 2004/02/01 02:51:10 azarah Exp $
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86_40/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/libGL.so.${PV} \
-	      usr/lib/libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4349.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4349.ebuild
deleted file mode 100644
index dff507ccd702..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4349.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4349.ebuild,v 1.4 2004/02/01 02:51:10 azarah Exp $
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	# correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.4191-defines.patch
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		touch ${WORKDIR}/.tls
-	fi
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	if [ -f "${WORKDIR}/.tls" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild
deleted file mode 100644
index 5596ca38187c..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild,v 1.3 2004/02/01 02:51:10 azarah Exp $
-
-PKG_V="pkg2"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5328.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5328.ebuild
deleted file mode 100644
index 014145733568..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5328.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5328.ebuild,v 1.2 2004/02/01 02:51:10 azarah Exp $
-
-PKG_V="pkg1"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
deleted file mode 100644
index 2b32138b5493..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5332.ebuild,v 1.4 2004/02/07 22:29:17 brad_mssw Exp $
-
-PKG_V="pkg0"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-
-	if [ `has_version x11-libs/qt` ] ; then
-		einfo "You have Qt installed on your system.  Qt is linked against opengl,"
-		einfo "which means you may have problems emerging KDE programs later until"
-		einfo "you run \"opengl-update xfree\""
-	fi
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5336-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5336-r1.ebuild
deleted file mode 100644
index 8e85c31dbc53..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5336-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5336-r1.ebuild,v 1.1 2004/02/14 00:04:46 cyfred Exp $
-
-PKG_V="pkg1"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild
deleted file mode 100644
index 02da5fe8a184..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5336.ebuild,v 1.2 2004/02/01 02:51:10 azarah Exp $
-
-PKG_V="pkg1"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=x11-base/xfree-4.2.0-r9
-	>=x11-base/opengl-update-1.3
-	~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Use the correct defines to make gtkglext build work
-	cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
-}
-
-src_install() {
-	local NV_ROOT="/usr/lib/opengl/nvidia"
-	local TLS=
-
-	# Check if we should install TLS versions of the libraries
-	${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-	# Only trust this if we are merging to /
-	if [ "$?" = "0" -a "${ROOT}" = "/" ]
-	then
-		einfo "Using TLS..."
-		TLS="tls/"
-	fi
-
-	# The X module
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-	# The GLX extension
-	exeinto ${NV_ROOT}/extensions
-	newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/lib/${TLS}libGL.so.${PV} \
-	      usr/lib/${TLS}libGLcore.so.${PV}
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-	dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-	dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-	insinto /usr/X11R6/lib
-	doins usr/X11R6/lib/libXvMCNVIDIA.a
-	exeinto /usr/X11R6/lib
-	doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-
-	# Docs
-	dodoc usr/share/doc/*
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1="`echo ${PV} |cut -d '.' -f 1`"
-	local ver2="`echo ${PV} |cut -d '.' -f 2`"
-	local ver3="`echo ${PV} |cut -d '.' -f 3`"
-	sed -e "s:\${PV}:${PV}:"     \
-		-e "s:\${ver1}:${ver1}:" \
-		-e "s:\${ver2}:${ver2}:" \
-		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-	#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
-	if [ "${ROOT}" = "/" ]
-	then
-		/usr/sbin/opengl-update nvidia
-	fi
-
-	einfo
-	einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-	einfo
-}