From 725e0de57ebc6aaadb941e0abdfc4e67e97f68f3 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Mon, 5 Sep 2005 23:11:43 +0000
Subject: [PATCH] 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.
 Package-Manager: portage-2.0.51.22-r2

---
 media-video/nvidia-glx/ChangeLog              | 10 ++-
 media-video/nvidia-glx/Manifest               | 46 +++++-----
 .../nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild  | 89 ++++++++++++-------
 .../nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild  | 89 ++++++++++++-------
 .../nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild  | 56 +++++++-----
 .../nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild  | 54 ++++++-----
 .../nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild  | 70 ++++++++-------
 .../nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild  | 54 ++++++-----
 8 files changed, 280 insertions(+), 188 deletions(-)

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index aa1af73f25b8..f684745a38fd 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.101 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.102 2005/09/05 23:11:43 eradicator Exp $
+
+  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)
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 6480b2648bb2..016b925be261 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,38 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 932751069932b3a7396a6a463daf5405 ChangeLog 21751
+MD5 f35ff90c7171b6f4e36d91d9e97059f3 ChangeLog 22200
+MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
+MD5 2c0a9addf1e81b6625bbdcfd6465f475 nvidia-glx-1.0.7676-r1.ebuild 8434
+MD5 490a11c5825998230d35b68d50fd08af nvidia-glx-1.0.7667-r1.ebuild 8484
+MD5 b1542b57257e6d32b3629fc3e943a61a nvidia-glx-1.0.7174-r5.ebuild 8484
+MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643
+MD5 c1cc2c5af05579cb13a90ac9b024e684 nvidia-glx-1.0.6111-r3.ebuild 8322
+MD5 d146a360883f212b328c4f0f0922d310 nvidia-glx-1.0.6629-r6.ebuild 7643
+MD5 761c9a34dfbc2320feb30ad7147d15c9 nvidia-glx-1.0.6629-r7.ebuild 8322
+MD5 6ca7c051a89c2afafcef2bf3befa6b44 nvidia-glx-1.0.7167-r2.ebuild 7863
+MD5 2695887779fee33b450246fe0496068b nvidia-glx-1.0.7167-r3.ebuild 8322
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
-MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
-MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
-MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
-MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
-MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r2 163
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r3 163
-MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r7 163
+MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
 MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r2 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163
+MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r2 163
 MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r3 163
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r5 163
 MD5 ef2c4ecedb45b67d79b43ffe58c660cf files/digest-nvidia-glx-1.0.7667-r1 163
 MD5 4ea42a34abde5c81fe828b09afab7651 files/digest-nvidia-glx-1.0.7676-r1 163
-MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
-MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
-MD5 84d76e7e47009583e937b217a139924a nvidia-glx-1.0.6111-r2.ebuild 7643
-MD5 8eed79a011e809dfcd3210db021fb46d nvidia-glx-1.0.6111-r3.ebuild 7627
-MD5 d146a360883f212b328c4f0f0922d310 nvidia-glx-1.0.6629-r6.ebuild 7643
-MD5 781128924b40f1a23d2aedcc948f8ac6 nvidia-glx-1.0.6629-r7.ebuild 7627
-MD5 6ca7c051a89c2afafcef2bf3befa6b44 nvidia-glx-1.0.7167-r2.ebuild 7863
-MD5 9eb44d1c1829b1473bca4e0c73065b74 nvidia-glx-1.0.7167-r3.ebuild 7841
-MD5 1df1478b2600131ef156b45a55a576f6 nvidia-glx-1.0.7174-r5.ebuild 8239
-MD5 84e7a222a334f8b082cec9b8cd314060 nvidia-glx-1.0.7667-r1.ebuild 8189
-MD5 631767fd9620be51a62fcd6d5442c392 nvidia-glx-1.0.7676-r1.ebuild 8189
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
+MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
+MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
+MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
+MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDC8C+I1lqEGTUzyQRAu1jAJ9sMeqav8oweK5vUfiyq4a3/YLqrgCffmL6
-PuTrxQMWdssVl/X2jU81RRk=
-=2jnO
+iD8DBQFDHNC8ArHZZzCEUG0RAjxZAJ9quU04I6811/pP6hhPVUICct9UsgCeILg9
+Hbyn35lbfFocsIyxwkRrz34=
+=9j6K
 -----END PGP SIGNATURE-----
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 df3a89fdd964..4defbfae15e0 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-2005 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.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r3.ebuild,v 1.2 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,12 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -59,17 +60,19 @@ pkg_setup() {
 }
 
 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 ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -80,14 +83,15 @@ src_unpack() {
 
 src_install() {
 	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
 		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
+		for ABI in $(get_install_abis) ; do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif use amd64; then
+	elif use amd64 ; then
 		src_install-libs lib32 $(get_multilibdir)
 		src_install-libs lib $(get_libdir)
 
@@ -112,14 +116,17 @@ src_install-libs() {
 	local pkglibdir=lib
 	local inslibdir=$(get_libdir)
 
-	if [ ${#} -eq 2 ]; then
+	if [[ ${#} -eq 2 ]] ; then
 		pkglibdir=${1}
 		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "x86" ]; then
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
 		pkglibdir=lib32
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -130,14 +137,12 @@ src_install-libs() {
 	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}
@@ -166,24 +171,22 @@ src_install-libs() {
 	    -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.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
+	[[ -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}
+	[[ -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
+	[[ -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
@@ -191,22 +194,40 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
+	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
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
 		rm -f ${ROOT}/etc/env.d/09nvidia
 	fi
 }
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -251,5 +272,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --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 2abe2697a7a6..3a3f7cc96cae 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-2005 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.1 2005/08/23 23:32:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r7.ebuild,v 1.2 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,12 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -59,17 +60,19 @@ pkg_setup() {
 }
 
 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 ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -80,14 +83,15 @@ src_unpack() {
 
 src_install() {
 	local MLTEST=$(type dyn_unpack)
-	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+
+	if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then
 		local OABI=${ABI}
-		for ABI in $(get_install_abis); do
+		for ABI in $(get_install_abis) ; do
 			src_install-libs
 		done
 		ABI=${OABI}
 		unset OABI
-	elif use amd64; then
+	elif use amd64 ; then
 		src_install-libs lib32 $(get_multilibdir)
 		src_install-libs lib $(get_libdir)
 
@@ -112,14 +116,17 @@ src_install-libs() {
 	local pkglibdir=lib
 	local inslibdir=$(get_libdir)
 
-	if [ ${#} -eq 2 ]; then
+	if [[ ${#} -eq 2 ]] ; then
 		pkglibdir=${1}
 		inslibdir=${2}
-	elif has_multilib_profile && [ "${ABI}" == "x86" ]; then
+	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
 		pkglibdir=lib32
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -130,14 +137,12 @@ src_install-libs() {
 	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}
@@ -166,24 +171,22 @@ src_install-libs() {
 	    -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.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
+	[[ -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}
+	[[ -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
+	[[ -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
@@ -191,22 +194,40 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-	then
+	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
+	if [[ -e ${ROOT}/etc/env.d/09nvidia ]] ; then
 		rm -f ${ROOT}/etc/env.d/09nvidia
 	fi
 }
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -251,5 +272,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild
index a51576082138..87ae3b164b7d 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r3.ebuild,v 1.2 2005/08/24 00:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r3.ebuild,v 1.3 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -23,11 +23,12 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -67,11 +68,11 @@ src_unpack() {
 	# 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
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//7167/6629}-defines.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//7167/6629}-glheader.patch
+	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
 
 	# Closing bug #37517 by letting virtual/x11 provide system wide glext.h
 	# 16 July 2004, opengl-update is now supplying glext.h for system wide
@@ -123,6 +124,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -133,14 +137,12 @@ src_install-libs() {
 	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}
@@ -169,14 +171,6 @@ src_install-libs() {
 	    -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
@@ -200,6 +194,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -213,7 +227,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -258,5 +272,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild
index 061be510183a..7d3379d7dbc8 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7174-r5.ebuild,v 1.2 2005/08/24 00:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7174-r5.ebuild,v 1.3 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -25,15 +25,12 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
-RDEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -129,6 +126,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -139,14 +139,12 @@ src_install-libs() {
 	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}
@@ -175,14 +173,6 @@ src_install-libs() {
 	    -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
@@ -206,6 +196,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -219,7 +229,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -264,5 +274,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
index 1e81d431b326..e556a88e914b 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7667-r1.ebuild,v 1.2 2005/08/24 00:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7667-r1.ebuild,v 1.3 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -18,20 +18,19 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 LICENSE="NVIDIA"
 SLOT="0"
 
+# Support for some older cards was removed from newer versions, so don't delete
+# this package unless a "legacy" update has been released by nVidia -- eradicator
 KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
-IUSE="dlloader"
+IUSE=""
 
-RDEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -127,6 +126,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -137,14 +139,12 @@ src_install-libs() {
 	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}
@@ -173,23 +173,11 @@ src_install-libs() {
 	    -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
-	# The below section was changed to fix bug #96514 and bug #91101.
-	if use dlloader; then
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
-	else
-		[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-			doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-	fi
+	[[ -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 ]] && \
@@ -208,6 +196,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -221,7 +229,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -266,5 +274,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
index f01735591f81..2c9a99dc157a 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.2 2005/08/24 00:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7676-r1.ebuild,v 1.3 2005/09/05 23:11:43 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -23,15 +23,12 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="nostrip multilib-pkg-force"
 IUSE="dlloader"
 
-RDEPEND="virtual/libc
-	virtual/x11
-	app-admin/eselect-opengl
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-#	!<sys-libs/glibc-2.3.4.20040619-r2"
-# The !<sys-libs/glibc-2.3.4.20040619-r2 is to ensure our glibc has tls
-# support if we are atleast CHOST=i486.
+RDEPEND="|| ( virtual/x11 >=x11-base/xorg-server-0.99.1-r7 )
+	 || ( virtual/x11 x11-proto/xproto )
+	 || ( virtual/x11 media-libs/mesa )
+	 app-admin/eselect-opengl
+	 ~media-video/nvidia-kernel-${PV}
+	 !app-emulation/emul-linux-x86-nvidia"
 
 PROVIDE="virtual/opengl"
 export _POSIX2_VERSION="199209"
@@ -127,6 +124,9 @@ src_install-libs() {
 	fi
 
 	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
+	local NO_TLS_ROOT="${NV_ROOT}/no-tls"
+	local TLS_ROOT="${NV_ROOT}/tls"
+	local X11_LIB_DIR="/usr/${inslibdir}/xorg"
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
@@ -137,14 +137,12 @@ src_install-libs() {
 	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}
@@ -173,14 +171,6 @@ src_install-libs() {
 	    -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
 	# The below section was changed to fix bug #96514 and bug #91101.
 	if use dlloader; then
@@ -208,6 +198,26 @@ src_install-libs() {
 }
 
 pkg_preinst() {
+	if ! has_version x11-base/xorg-server ; then
+		for dir in lib lib32 lib64 ; do
+			if [[ -d ${D}/usr/${dir}/xorg ]] ; then
+				mv ${D}/usr/${dir}/xorg/* ${D}/usr/${dir}
+				rmdir ${D}/usr/${dir}/xorg
+			fi
+		done
+	fi
+
+	# The X module
+	# Since we moved away from libs in /usr/X11R6 need to check this
+	if has_version "<x11-base/xorg-x11-6.8.0-r4" || \
+	   has_version "x11-base/xfree86" ; then
+		mkdir -p ${D}/usr/X11R6
+		for dir in lib lib32 lib64 ; do
+			[[ -d ${D}/usr/${dir} ]] && mv ${D}/usr/${dir} ${D}/usr/X11R6
+		done
+	fi
+
+
 	# Clean the dinamic libGL stuff's home to ensure
 	# we dont have stale libs floating around
 	if [[ -d ${ROOT}/usr/lib/opengl/nvidia ]] ; then
@@ -221,7 +231,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#switch to the nvidia implementation
-	/usr/bin/eselect opengl set nvidia
+	eselect opengl set --use-old nvidia
 
 	echo
 	einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\""
@@ -266,5 +276,5 @@ want_tls() {
 }
 
 pkg_postrm() {
-	/usr/bin/eselect opengl set --use-old xorg-x11
+	eselect opengl set --use-old xorg-x11
 }
-- 
2.26.2