Removing versions which don't work with modular X. Marking 8178 stable on amd64.

(Portage version: 2.1_pre6-r6)

10 files changed, 14 insertions, 1410 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 962b0953dc2a..ffae72b44251 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,627 +1,11 @@
 # ChangeLog for media-video/nvidia-glx
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.110 2006/01/14 21:34:36 blubb Exp $
+# 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 $
 
-  14 Jan 2006; Simon Stelling <blubb@gentoo.org>
-  nvidia-glx-1.0.6111-r2.ebuild, nvidia-glx-1.0.6111-r3.ebuild,
-  nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.6629-r7.ebuild,
-  nvidia-glx-1.0.7167-r2.ebuild, nvidia-glx-1.0.7167-r3.ebuild,
-  nvidia-glx-1.0.7174-r5.ebuild, nvidia-glx-1.0.7667-r1.ebuild,
-  nvidia-glx-1.0.7676-r1.ebuild, nvidia-glx-1.0.7676-r2.ebuild,
-  nvidia-glx-1.0.8174.ebuild, nvidia-glx-1.0.8174-r1.ebuild,
-  nvidia-glx-1.0.8178.ebuild:
-  fix typo in pkg_setup
+  24 Mar 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  -nvidia-glx-1.0.6111-r2.ebuild, nvidia-glx-1.0.6111-r3.ebuild,
+  -nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.6629-r7.ebuild,
+  -nvidia-glx-1.0.7167-r2.ebuild, nvidia-glx-1.0.8178.ebuild:
+  Removing versions which don't work with modular X. Marking 8178 stable on
+  amd64.
 
-  23 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  nvidia-glx-1.0.8178.ebuild:
-  Fixed borked clean up.
-
-*nvidia-glx-1.0.8178 (23 Dec 2005)
-
-  23 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-glx-1.0.8178.ebuild:
-  Version bump to 8178.  A few cleanups.  Bug 116400.
-
-*nvidia-glx-1.0.8174-r1 (07 Dec 2005)
-
-  07 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-glx-1.0.8174-r1.ebuild:
-  Added docs as requested in bug #114659.
-
-*nvidia-glx-1.0.8174 (05 Dec 2005)
-
-  05 Dec 2005; Kristopher Kersey <augustus@gentoo.org>
-  +nvidia-glx-1.0.8174.ebuild:
-  Added version 1.0-8174 of the NVIDIA drivers.
-
-*nvidia-glx-1.0.7676-r2 (11 Nov 2005)
-
-  11 Nov 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-glx-1.0.7676-r2.ebuild:
-  Use $IMAGE in pkg_preinst() if $D not set.  Possible fix for bug #82595.
-
-  28 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
-  nvidia-glx-1.0.7676-r1.ebuild:
-  Added support for FreeBSD drivers as per bug #102274.
-
-  05 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6111-r3.ebuild, nvidia-glx-1.0.6629-r7.ebuild,
-  nvidia-glx-1.0.7167-r3.ebuild, nvidia-glx-1.0.7174-r5.ebuild,
-  nvidia-glx-1.0.7667-r1.ebuild, nvidia-glx-1.0.7676-r1.ebuild:
-  Cleaned up for modular X. Pushed the install directory choice from
-  src_install to pkg_preinst since it will depend on the system being
-  installed on rather than the system building the package.
-
-*nvidia-glx-1.0.7676-r1 (23 Aug 2005)
-*nvidia-glx-1.0.7667-r1 (23 Aug 2005)
-*nvidia-glx-1.0.7174-r5 (23 Aug 2005)
-*nvidia-glx-1.0.7167-r3 (23 Aug 2005)
-*nvidia-glx-1.0.6629-r7 (23 Aug 2005)
-*nvidia-glx-1.0.6111-r3 (23 Aug 2005)
-
-  23 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-glx-1.0.6111-r3.ebuild, +nvidia-glx-1.0.6629-r7.ebuild,
-  +nvidia-glx-1.0.7167-r3.ebuild, -nvidia-glx-1.0.7174-r4.ebuild,
-  +nvidia-glx-1.0.7174-r5.ebuild, -nvidia-glx-1.0.7667.ebuild,
-  +nvidia-glx-1.0.7667-r1.ebuild, -nvidia-glx-1.0.7676.ebuild,
-  +nvidia-glx-1.0.7676-r1.ebuild:
-  Revbumps to use the new opengl eselect module instead of opengl-update.
-
-*nvidia-glx-1.0.7676 (15 Aug 2005)
-
-  15 Aug 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7676.ebuild:
-  NVIDIA version bump.
-
-  20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la,
-  -nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6111-r2.ebuild,
-  -nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629-r5.ebuild,
-  nvidia-glx-1.0.6629-r6.ebuild, nvidia-glx-1.0.7167-r2.ebuild,
-  nvidia-glx-1.0.7174-r4.ebuild, -nvidia-glx-1.0.7664.ebuild,
-  nvidia-glx-1.0.7667.ebuild:
-  Removing old versions. Fixing want_tls to work with 2.3.5 on CHOST=i486 and
-  i586.
-
-*nvidia-glx-1.0.7667 (07 Jul 2005)
-
-  07 Jul 2005; <augustus@gentoo.org> nvidia-glx-1.0.7664.ebuild,
-  +nvidia-glx-1.0.7667.ebuild:
-  Fixes for the following bugs: bug #91101, bug #96514, bug #96885, bug #97768.
-  The fixes to these have been added to version 1.0.7664 and 1.0.7667 of the
-  driver.
-
-*nvidia-glx-1.0.7664 (03 Jun 2005)
-
-  03 Jun 2005; <augustus@gentoo.org> +nvidia-glx-1.0.7664.ebuild:
-  Initial checkin of NVIDIA 7664 release.  Not complete but this should work for
-  those on the bleeding edge.
-
-  16 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6629-r6.ebuild:
-  Stable amd64, x86.
-
-*nvidia-glx-1.0.6111-r2 (05 May 2005)
-
-  05 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-glx-1.0.6111-r2.ebuild:
-  Added an opengl-update-2.2 version of nvidia-glx-1.0.6111 by request.
-
-*nvidia-glx-1.0.7167-r2 (04 May 2005)
-*nvidia-glx-1.0.6629-r6 (04 May 2005)
-
-  04 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6111-r1.ebuild, nvidia-glx-1.0.6629-r1.ebuild,
-  nvidia-glx-1.0.6629-r5.ebuild, +nvidia-glx-1.0.6629-r6.ebuild,
-  -nvidia-glx-1.0.7167-r1.ebuild, +nvidia-glx-1.0.7167-r2.ebuild,
-  -nvidia-glx-1.0.7174-r1.ebuild:
-  Added opengl-update-2.2 versions of 6629 and 7167. Fixed opengl-update
-  dependencies for older ebuilds to close bug #90922.
-
-*nvidia-glx-1.0.7174-r4 (02 May 2005)
-
-  02 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-glx-1.0.7174-r3.ebuild, +nvidia-glx-1.0.7174-r4.ebuild:
-  Don't use tls enabled lib when the user has CHOST=i386 USE=nptl since they
-  really DON'T have nptl. Bug #91137.
-
-*nvidia-glx-1.0.7174-r3 (27 Apr 2005)
-
-  27 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-glx-1.0.7174-r2.ebuild, +nvidia-glx-1.0.7174-r3.ebuild:
-  Fix for bug #90047. We check if glibc was built with --with-tls and install
-  the correct libnvidia-tls.so.
-
-  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.7174-r2.ebuild:
-  Make sure we have a valid opengl implementation when uninstalling. Closes
-  bug #55142.
-
-*nvidia-glx-1.0.7174-r2 (26 Apr 2005)
-
-  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-glx-1.0.7174-r2.ebuild:
-  Hopefully solve bug #90047 which causes havoc with different
-  nptl/linuxthreads/tls configurations.
-
-  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Update maintainer to x11-drivers.
-
-  02 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.7174-r1.ebuild:
-  Revert x86 to pkg0 to not use two packages for x86, and the smaller one at
-  that, to stop getting bug reports on that.
-
-*nvidia-glx-1.0.7174-r1 (02 Apr 2005)
-
-  02 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-glx-1.0.7174.ebuild, +nvidia-glx-1.0.7174-r1.ebuild:
-  Go back to the proper packages so we get the 32bit libs on amd64.
-
-  01 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6629-r5.ebuild:
-  Stable amd64 for multilib fixups in 2005.0.
-
-*nvidia-glx-1.0.7174 (01 Apr 2005)
-
-  01 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-glx-1.0.7174.ebuild:
-  Update version.
-
-*nvidia-glx-1.0.7167-r1 (11 Mar 2005)
-
-  11 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-glx-1.0.7167-r1.ebuild, nvidia-glx-1.0.7167.ebuild:
-  Fix installation on amd64 2005.0.
-
-*nvidia-glx-1.0.7167 (11 Mar 2005)
-
-  11 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-glx-1.0.7167.ebuild:
-  Update version.  Add new dlloader module for supported Xorg.
-
-  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> -files/libGL.la-r1,
-  files/libGL.la-r2, nvidia-glx-1.0.6629-r5.ebuild:
-  Remove X11R6 in .la so dependency_libs just uses /usr/lib.
-
-*nvidia-glx-1.0.6629-r5 (09 Feb 2005)
-
-  09 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/libGL.la-r2,
-  +nvidia-glx-1.0.6629-r5.ebuild:
-  Fix libGL.la borkage (wrong paths in dependency_libs).
-
-*nvidia-glx-1.0.6111-r1 (29 Jan 2005)
-
-  29 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
-  +nvidia-glx-1.0.6111-r1.ebuild, -nvidia-glx-1.0.6111.ebuild:
-  Updating 6111 to work with >=xorg-x11-6.8.0-r4
-
-  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6629-r4.ebuild:
-  Add some testing so error messages (which were safe to ignore) don't display
-  and confuse the user.
-
-*nvidia-glx-1.0.6629-r4 (24 Jan 2005)
-
-  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> files/libGL.la-r1,
-  -nvidia-glx-1.0.6629-r3.ebuild, +nvidia-glx-1.0.6629-r4.ebuild:
-  Fix the proper libdir in the .la.  Cleaning out older versions.
-
-  21 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/libGL.la-r1,
-  nvidia-glx-1.0.6629-r3.ebuild:
-  Install .la file for each ABI.
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6629-r3.ebuild:
-  Added a keepdir /usr/<libdir>/tls since some opengl-updates don't make it.
-
-*nvidia-glx-1.0.6629-r3 (20 Jan 2005)
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  -nvidia-glx-1.0.6629-r2.ebuild, +nvidia-glx-1.0.6629-r3.ebuild:
-  Make new revision install both 32bit and 64bit versions on 2004.3 to make 
-  games herd QA hapy.  Forcing revbump to make sure 2004.3 users get updated
-  correctly.
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.6629-r2.ebuild:
-  Stable amd64 for 2005.0.
-
-*nvidia-glx-1.0.6629-r2 (17 Jan 2005)
-
-  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  +nvidia-glx-1.0.6629-r2.ebuild:
-  Revision bumping to support amd64's 2005.0. Now installs both 32bit and
-  64bit libs on that profile.
-
-  17 Jan 2005; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-glx-1.0.6629-r1.ebuild, -nvidia-glx-1.0.6629.ebuild:
-  Marking 6629 stable across archs
-
-  10 Jan 2005; Jason Huebel <jhuebel@gentoo.org>
-  nvidia-glx-1.0.6629-r1.ebuild:
-  stable on amd64
-
-*nvidia-glx-1.0.6629-r1 (31 Dec 2004)
-
-  31 Dec 2004; Andrew Bevitt <cyfred@gentoo.org>
-  +nvidia-glx-1.0.6629-r1.ebuild:
-  Changing driver and lib install location to be detected depending on
-  xorg-x11 version.
-
-  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> -files/README.gentoo,
-  +files/libGL.la, -files/libGL.la.2,
-  -files/nvidia-glx-1.0.4363-defines.patch,
-  -files/nvidia-glx-1.0.4496-defines.patch,
-  -files/nvidia-glx-1.0.4499-defines.patch,
-  -files/nvidia-glx-1.0.5328-defines.patch,
-  -files/nvidia-glx-1.0.5328-glheader.patch,
-  -files/nvidia-glx-1.0.5332-glheader.patch,
-  -files/nvidia-glx-1.0.5336-glheader.patch,
-  -files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
-  -files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch,
-  -files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
-  -nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4496-r2.ebuild,
-  -nvidia-glx-1.0.4499-r1.ebuild, -nvidia-glx-1.0.5328-r2.ebuild,
-  -nvidia-glx-1.0.5332-r2.ebuild, -nvidia-glx-1.0.5336-r2.ebuild,
-  -nvidia-glx-1.0.6106-r3.ebuild, nvidia-glx-1.0.6111.ebuild,
-  nvidia-glx-1.0.6629.ebuild:
-  Removing all masked (deprecated) versions to match the nvidia-kernel removal.
-
-  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  +files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch,
-  +files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch,
-  +files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch,
-  nvidia-glx-1.0.6629.ebuild:
-  Porting across GL patches for consistency, it was necessary in the end.
-
-  10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6629.ebuild:
-  Changing to error on xfree install, as opposed to dieing
-
-  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
-  nvidia-glx-1.0.4363-r1.ebuild, nvidia-glx-1.0.4496-r2.ebuild,
-  nvidia-glx-1.0.4499-r1.ebuild, nvidia-glx-1.0.5328-r2.ebuild,
-  nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild,
-  nvidia-glx-1.0.6106-r3.ebuild:
-  Keywords masking as driver/glx being deprecated.
-
-*nvidia-glx-1.0.6629 (07 Nov 2004)
-
-  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> nvidia-glx-1.0.6111.ebuild,
-  +nvidia-glx-1.0.6629.ebuild:
-  New version 1.0.6629! Also marking 1.0.6111-r3 stable to bring things up to
-  speed with nvidia-kernel.
-
-  05 Sep 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6111.ebuild:
-  stable on amd64
-
-  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
-  Fixed ChangeLog header.
-
-  30 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch:
-  Update for proper glext.h inclusion
-
-  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-glx-1.0.5328-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild:
-  Marking up to and including 5336 stable to support newer nvidia cards, eg
-  FX5700.
-
-*nvidia-glx-1.0.6111 (06 Aug 2004)
-
-  06 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch,
-  +files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch,
-  +files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch,
-  +nvidia-glx-1.0.6111.ebuild:
-  Version bump for 6111; nVidia haven't changed their GL headers in this release
-  so still applying the patches
-
-*nvidia-glx-1.0.4499-r1 (19 Jul 2004)
-
-  19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/libGL.la.1,
-  +nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4363.ebuild,
-  -nvidia-glx-1.0.4496-r1.ebuild, +nvidia-glx-1.0.4496-r2.ebuild,
-  -nvidia-glx-1.0.4496.ebuild, +nvidia-glx-1.0.4499-r1.ebuild,
-  -nvidia-glx-1.0.4499.ebuild, -nvidia-glx-1.0.5328-r1.ebuild,
-  +nvidia-glx-1.0.5328-r2.ebuild:
-  Moving all versions over to use proper libGL.la file, removing all versions
-  that do not use the correct file, and removing the incorrect file; this should
-  fix pygtk et al bugs.
-
-  18 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106-r3.ebuild:
-  marking stable since our last stable nvidia-glx was just deleted
-
-*nvidia-glx-1.0.6106-r3 (18 Jul 2004)
-
-  18 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  -nvidia-glx-1.0.6106-r1.ebuild, -nvidia-glx-1.0.6106-r2.ebuild,
-  +nvidia-glx-1.0.6106-r3.ebuild, -nvidia-glx-1.0.6106.ebuild:
-  Taking Azarahs' advice, making /usr/lib/tls into a directory and creating
-  symlinks under it.. Changing opengl-update-1.8.1 to account for this thank
-  fully links are easier to remove than directories, this will be a transparent
-  update
-
-*nvidia-glx-1.0.6106-r2 (18 Jul 2004)
-
-  18 Jul 2004; Martin Schlemmer <azarah@gentoo.org>
-  +nvidia-glx-1.0.6106-r2.ebuild:
-  The /usr/lib/tls dir changed to a symlink - handle it carefully. Personally I
-  think it would have been better to leave it a dir, and manage the specific
-  opengl libs as symlinks, as you never know what future may bring ...
-
-*nvidia-glx-1.0.6106-r1 (17 Jul 2004)
-
-  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch,
-  +nvidia-glx-1.0.6106-r1.ebuild:
-  See bug #54984 -- Changing TLS, glext.h, patching gl.h
-
-  13 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106.ebuild:
-  the previous amd64 nvidia drivers arent exactly what i would call stable, but
-  this release seems to be rock solid. marking stable on amd64
-
-*nvidia-glx-1.0.6106 (02 Jul 2004)
-
-  02 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; metadata.xml,
-  +files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
-  +files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
-  +nvidia-glx-1.0.6106.ebuild:
-  Version bumping to 6106. Thanks to everyone on bug #55714 for testing and
-  suggesting improvements. Please note the new
-  app-emulation/emul-linux-x86-nvidia package for 32 bit compatibility on amd64.
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  nvidia-glx-1.0.4363.ebuild, nvidia-glx-1.0.4496-r1.ebuild,
-  nvidia-glx-1.0.4496.ebuild, nvidia-glx-1.0.4499.ebuild,
-  nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
-  nvidia-glx-1.0.5336-r2.ebuild:
-  virtual/glibc -> virtual/libc
-
-  10 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  -nvidia-glx-1.0.5332-r1.ebuild:
-  Removing a duplicate build version
-
-  06 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  +files/nvidia-glx-1.0.4363-defines.patch, nvidia-glx-1.0.4363.ebuild:
-  Reintroducing patchset for 4363 which was removed a while ago because of
-  version name conflicts.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nvidia-glx-1.0.4363.ebuild,
-  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild,
-  nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild,
-  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
-  nvidia-glx-1.0.5336-r2.ebuild:
-  Add inherit eutils
-
-  19 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild:
-  marking stable on amd64 to close bug #48409
-
-  15 Apr 2004; <spider@gentoo.org> nvidia-glx-1.0.4363.ebuild,
-  nvidia-glx-1.0.4496-r1.ebuild, nvidia-glx-1.0.4496.ebuild,
-  nvidia-glx-1.0.4499.ebuild, nvidia-glx-1.0.5328-r1.ebuild,
-  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
-  nvidia-glx-1.0.5336-r2.ebuild:
-  added export _POSIX2_VERSION="199209" to all ebuilds to work around broken
-  chown syntax in upstream release. This is a workaround until nvidia fixes
-  things.
-
-*nvidia-glx-1.0.4496-r1 (15 Apr 2004)
-
-  15 Apr 2004; <spider@gentoo.org> +nvidia-glx-1.0.4496-r1.ebuild:
-  adding the changes necessary to make 4496 versions interact with xorg-x11
-  implementation.
-
-  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-glx-1.0.5328-r1.ebuild, nvidia-glx-1.0.5332-r2.ebuild,
-  nvidia-glx-1.0.5336-r2.ebuild, files/nvidia-glx-1.0.4180-defines.patch,
-  files/nvidia-glx-1.0.4191-defines.patch,
-  files/nvidia-glx-1.0.5328-glheader.patch,
-  files/nvidia-glx-1.0.5332-glheader.patch,
-  files/nvidia-glx-1.0.5336-glheader.patch:
-  Adding patchset that fixes api breakage as mentioned in bug #37517
-
-  13 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild:
-  We are letting virtual/x11 provide glext.h, removing its install, see bug
-  #37517
-
-  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)
-
-  08 Apr 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.5332-r2.ebuild:
-  added amd64-specific ebuild with Donnie Berkholz's xorg-x11 compatibility
-  update
-
-*nvidia-glx-1.0.5336-r2 (08 Apr 2004)
-
-  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-glx-1.0.5336-r2.ebuild:
-  Update for xorg-x11 compatibility.
-
-*nvidia-glx-1.0.5336-r1 (14 Feb 2004)
-*nvidia-glx-1.0.5332-r1 (14 Feb 2004)
-
-  14 Feb 2004; Andrew Bevitt <cyfred@gentoo.org>;
-  nvidia-glx-1.0.5332-r1.ebuild, nvidia-glx-1.0.5336-r1.ebuild,
-  files/libGL.la.2:
-  Updating libGL.la to correctly link the location of the opengl libraries, for
-  nvidia problems on bug
-
-  07 Feb 2004; Brad House <brad_mssw@gentoo.org> nvidia-glx-1.0.5332.ebuild:
-  stable on amd64
-
-*nvidia-glx-1.0.5336 (01 Feb 2004)
-
-  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5336.ebuild:
-  Update version
-
-  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.5332.ebuild,
-  files/nvidia-glx-1.0.5332-defines.patch:
-  Remove dup patch.
-
-  25 Jan 2004; Caleb Tennis <caleb@gentoo.org> nvidia-glx-1.0.5332.ebuild:
-  Add a warning for Qt users that GL linkage may be broken after emerging this.
-
-*nvidia-glx-1.0.5332 (23 Jan 2004)
-
-  23 Jan 2004; <augustus@gentoo.org> nvidia-glx-1.0.5332.ebuild,
-  files/nvidia-glx-1.0.5332-defines.patch:
-  New NVIDIA driver 5332 released to public. See NVIDIA's page for full details:
-  http://www.nvidia.com/object/linux_display_amd64_1.0-5332.html
-
-*nvidia-glx-1.0.5328-r1 (05 Jan 2004)
-
-  05 Jan 2004; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-glx-1.0.5328-r1.ebuild:
-  Fixing TLS test for bug #36551. Thanks to Ronald Hummelink
-  <gentoo-bugzilla@hummelink.xs4all.nl> for the patch.
-
-  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
-  Adding metadata.xml.
-
-*nvidia-glx-1.0.5328 (26 Dec 2003)
-
-  26 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>;
-  nvidia-glx-1.0.5328.ebuild, files/nvidia-glx-1.0.5328-defines.patch:
-  Version bump.
-
-  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.4496-r1.ebuild:
-  Add PKG_V to make sure updating the package used will not break things again.
-
-*nvidia-glx-1.0.4496-r1 (02 Nov 2003)
-
-  02 Nov 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.4496-r1.ebuild:
-  Update nVidia package to latest (pkg2), bug #32430.
-
-*nvidia-glx-1.0.4499 (15 Oct 2003)
-
-  15 Oct 2003; Daniel Robbins <drobbins@gentoo.org>:
-  nvidia-glx-1.0.4499.ebuild: New version of the ebuild for AMD64 systems.
-  Thanks to Kris Kersey, James Jones and others for working on this. See bug
-  #30799. This ebuild does need some testing; adding it so that it can be
-  tested.
-
-  20 Sep 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.4496.ebuild:
-  Mark stable (bug #28330).
-
-*nvidia-glx-1.0.4496 (29 Jul 2003)
-
-  29 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.4496.ebuild, files/nvidia-glx-1.0.4496-defines.patch:
-  New version.
-
-*nvidia-glx-1.0.4180 (18 Jul 2003)
-
-  18 Jul 2003; Olivier Crete <tester@gentoo.org> nvidia-glx-1.0.4180.ebuild,
-  files/nvidia-glx-1.0.4180-defines.patch:
-  Added amd64 version of the driver
-
-  22 Jun 2003; Martin Schlemmer <azarah@gentoo.org>
-  nvidia-glx-1.0.4363.ebuild:
-  Mark stable for x86.
-
-*nvidia-glx-1.0.4363 (26 Apr 2003)
-
-  26 Apr 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4363.ebuild :
-  Update version.
-
-*nvidia-glx-1.0.4349 (21 Apr 2003)
-
-  21 Apr 2003; Jay Pfeifer <pfeifer@gentoo.org> nvidia-glx-1.0.4349.ebuild :
-  Moved from ~x86 to stable.
-
-  30 Mar 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4349.ebuild :
-  New version, closing bug #18541.
-
-*nvidia-glx-1.0.4191-r1 (13 Feb 2003)
- 
-  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
-  Added missing changelog entry.
-
-*nvidia-glx-1.0.4191 (31 Jan 2003)
-
-  31 Jan 2003; foser <foser@gentoo.org> nvidia-glx-1.0.4191.ebuild :
-  Added 2 header file patches
-
-  11 Dec 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.4191.ebuild :
-  Add '-alpha' to KEYWORDS.
-
-*nvidia-glx-1.0.4191 (11 Dec 2002)
-
-  11 Dec 2002; Brandon Low <lostlogic@gentoo.org>:
-  New version thanks Nvidia. :)
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
-  Changed sparc ~sparc keywords
- 
-  14 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Remove ftp from SRC_URI, as it seems to give problems to some people.
-
-*nvidia-glx-1.0.3123 (12 Sep 2002)
-
-  12 Sep 2002; Martin Schlemmer <azarah@gentoo.org>:
-  Update version.
-
-  8 Sep 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild :
-  
-  Add opengl-update to DEPEND.
-
-*nvidia-glx-1.0.2960-r1 (26 May 2002)
-
-  26 May 2002; Martin Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2960-r1.ebuild :
-
-  Install the new dynamic XvMC library "libXvMCNVIDIA_dynamic.so" as well.
-
-*nvidia-glx-1.0.2960 (26 May 2002)
-
-*nvidia-glx-1.0.2313-r2 (12 Apr 2002) 
-
-  12 Apr 2002; Daniel Robbins <drobbins@gentoo.org>: New rev of an older
-  ebuild to fix stripping problems.
-
-  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild :
-
-  Nuke /etc/env.d/09nvidia if it exists, else we get problems.
-
-*nvidia-glx-1.0.2880 (7 Apr 2002)
-
-  7 Apr 2002; M.Schlemmer <azarah@gentoo.org> nvidia-glx-1.0.2880.ebuild :
-
-  Moved back to /usr to fix various problems we had.  Update for dinamic
-  OpenGL switching.
-
-*nvidia-glx-1.0.2802-r2 (07 Mar 2002)
-
-  14 Mar 2002; Grant Goodyear  <g2boojum@gentoo.org>:
-  
-  Make sure symbols aren't stripped.
-
-*nvidia-glx-1.0.2802 (07 Mar 2002)
-
-  07 Mar 2002; Arcady Genkin  <agenkin@thpoon.com>:
-  Adds libXvMCNVIDIA.a, plus a minor rewrite.
-
-  07 Mar 2002; Daniel Robbins <drobbins@gentoo.org>: new release and a new NV_V
-  variable to hold the NVIDIA-style version number (simplifies rolling new
-  releases.)
-
-*nvidia-glx-1.0.2313-r1 (10 Feb 2002)
-
-  10 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Now provides
-  "virtual/opengl" functionality.
-
-*nvidia-glx-1.0.2313 (05 Feb 2002)
-
-  05 Feb 2002; Arcady Genkin <agenkin@thpoon.com>: Full redesign of Gentoo
-  Linux NVIDIA driver/GLX implementation.  Thanks Arcady!
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111-r2
deleted file mode 100644
index 891f45379b0a..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6111-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51e83be46f83c52102ccb8995b54f4e2 NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r6 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r6
deleted file mode 100644
index 9324510b4ef9..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f7737c1e95371f37a4fd30da2f11e72c NVIDIA-Linux-x86-1.0-6629-pkg1.run 8725221
-MD5 652e69f549c81a7a3f2806daa74b9c36 NVIDIA-Linux-x86_64-1.0-6629-pkg2.run 7777882
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r2
deleted file mode 100644
index 691dc4a42ce3..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d88d606873be255e8c4926961a1f09bf NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
-MD5 a0433d841c41862af266300b589c12a7 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild
deleted file mode 100644
index 4e7950c3c08e..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r2.ebuild
+++ /dev/null
@@ -1,256 +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.6111-r2.ebuild,v 1.5 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}"
-
-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 )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="nostrip multilib-pkg-force"
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=x11-base/opengl-update-2.1.0
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-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}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-
-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() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Patchs go below here, add breif description
-	cd ${S}
-	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
-	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-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
-
-	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-	rm -f usr/share/doc/nvidia-settings*
-	dodoc usr/share/doc/*
-
-	# nVidia want bug reports using this script
-	exeinto /usr/bin
-	doexe usr/bin/nvidia-bug-report.sh
-}
-
-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 NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV}
-	doexe usr/${pkglibdir}/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
-
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
-	dodir ${NO_TLS_ROOT}
-	exeinto ${NO_TLS_ROOT}
-	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
-
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
-	dodir ${TLS_ROOT}
-	exeinto ${TLS_ROOT}
-	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
-
-	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.${PV} ${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.${PV} ${NV_ROOT}/lib
-	fi
-
-	# 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
-
-	# 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" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-
-	insinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-}
-
-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
-
-	echo
-	einfo "To use the Nvidia GLX, run \"opengl-update 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() {
-	opengl-update --use-old xorg-x11
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild
index 560cdce4c65a..f16e98761985 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.6111-r3.ebuild,v 1.5 2006/03/03 23:52:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild,v 1.6 2006/03/24 20:26:28 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="nostrip multilib-pkg-force"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
deleted file mode 100644
index 73710ca880eb..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
+++ /dev/null
@@ -1,256 +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.6629-r6.ebuild,v 1.6 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}"
-
-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 )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="nostrip multilib-pkg-force"
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=x11-base/opengl-update-2.1.0
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-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}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-
-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() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Patchs go below here, add breif description
-	cd ${S}
-	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
-	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-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
-
-	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-	rm -f usr/share/doc/nvidia-settings*
-	dodoc usr/share/doc/*
-
-	# nVidia want bug reports using this script
-	exeinto /usr/bin
-	doexe usr/bin/nvidia-bug-report.sh
-}
-
-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 NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV}
-	doexe usr/${pkglibdir}/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
-
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
-	dodir ${NO_TLS_ROOT}
-	exeinto ${NO_TLS_ROOT}
-	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
-
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
-	dodir ${TLS_ROOT}
-	exeinto ${TLS_ROOT}
-	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
-
-	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.${PV} ${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.${PV} ${NV_ROOT}/lib
-	fi
-
-	# 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
-
-	# 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" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ] && doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-
-	insinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ] && doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ] && doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ] && newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-}
-
-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
-
-	echo
-	einfo "To use the Nvidia GLX, run \"opengl-update 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() {
-	opengl-update --use-old xorg-x11
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild
index 0c56f3bd6f55..6d5828ae573e 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.6629-r7.ebuild,v 1.5 2006/03/03 23:52:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild,v 1.6 2006/03/24 20:26:28 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 RESTRICT="nostrip multilib-pkg-force"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild
deleted file mode 100644
index e5754d711deb..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild
+++ /dev/null
@@ -1,262 +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.7167-r2.ebuild,v 1.5 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}"
-
-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 )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="nostrip multilib-pkg-force"
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=x11-base/opengl-update-2.2.0
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-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}"
-fi
-
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-
-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}"
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Patchs go below here, add breif description
-	cd ${S}
-	# nVidia wants us to use nvidia-installer, removing warning.
-	epatch ${NV_PATCH_PREFIX//7167/6629}-makefile.patch
-	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//7167/6629}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//7167/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
-
-	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-	rm -f usr/share/doc/nvidia-settings*
-	dodoc usr/share/doc/*
-
-	# nVidia want bug reports using this script
-	exeinto /usr/bin
-	doexe usr/bin/nvidia-bug-report.sh
-}
-
-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 NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV}
-	doexe usr/${pkglibdir}/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
-
-	local NO_TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/no-tls"
-	dodir ${NO_TLS_ROOT}
-	exeinto ${NO_TLS_ROOT}
-	doexe usr/${pkglibdir}/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NO_TLS_ROOT}/libnvidia-tls.so.1
-
-	local TLS_ROOT="/usr/${inslibdir}/opengl/nvidia/tls"
-	dodir ${TLS_ROOT}
-	exeinto ${TLS_ROOT}
-	doexe usr/${pkglibdir}/tls/libnvidia-tls.so.${PV}
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
-
-	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.${PV} ${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.${PV} ${NV_ROOT}/lib
-	fi
-
-	# 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
-
-	# 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" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
-
-	insinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
-		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
-		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-}
-
-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
-
-	echo
-	einfo "To use the Nvidia GLX, run \"opengl-update 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() {
-	opengl-update --use-old xorg-x11
-}
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.8178.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.8178.ebuild
index 7bcc7fa27d2c..b372f31a199f 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.8178.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.8178.ebuild
@@ -1,6 +1,6 @@
 # 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.8178.ebuild,v 1.4 2006/03/03 23:52:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.8178.ebuild,v 1.5 2006/03/24 20:26:28 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -19,7 +19,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="dlloader"
 RESTRICT="nostrip multilib-pkg-force"