Added opengl-update-2.2 versions of 6629 and 7167. Fixed opengl-update dependencies for older ebuilds to close bug #90922.

Package-Manager: portage-2.0.51.21

10 files changed, 151 insertions, 77 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index a923ce146de4..1a9b5669dc36 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,17 @@
 # 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.92 2005/05/02 22:31:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.93 2005/05/04 21:32:06 eradicator Exp $
+
+*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)
 
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 272874c2b953..0b9ac9e98bb8 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a5dc747bb753adb122bbdc02fc73ef9d ChangeLog 19203
+MD5 a5dcf61617560994754612ab7a9d893b ChangeLog 19694
 MD5 e06e73d71a54036f83abf35efc6322e3 metadata.xml 302
-MD5 0b5c0e9847ecde734dbf9e5b38185be2 nvidia-glx-1.0.6629-r1.ebuild 5656
-MD5 602445f790dfcd667782292575f1db40 nvidia-glx-1.0.6111-r1.ebuild 5584
-MD5 3892f841b65ffb03c03b838214fd7a6d nvidia-glx-1.0.6629-r5.ebuild 6624
+MD5 9d27c1c2ca4980f0181d3e732280c809 nvidia-glx-1.0.6629-r1.ebuild 5691
+MD5 349097957580e43d51d2afaedaef6840 nvidia-glx-1.0.6111-r1.ebuild 5619
+MD5 0c38c3c8cae8346fae17aa67becfa359 nvidia-glx-1.0.6629-r5.ebuild 6568
 MD5 68727cdc36d40821b2763cb280e9608e nvidia-glx-1.0.7174-r4.ebuild 7914
-MD5 154f21ff3b663c19f1786d92c3ad9b47 nvidia-glx-1.0.7167-r1.ebuild 6827
-MD5 5fbd1ad33dd262a21e3c792323c15f89 nvidia-glx-1.0.7174-r1.ebuild 6911
+MD5 0c0214352ae05615bb4327c1734dfc64 nvidia-glx-1.0.6629-r6.ebuild 7460
+MD5 5f3b6627e7c2fc86f6aa828054885efb nvidia-glx-1.0.7167-r2.ebuild 7678
 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r1 163
 MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
@@ -16,8 +16,8 @@ MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111-r1 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r5 163
 MD5 6e47667cc38d8ce4ac2f4c7dbb392abe files/libGL.la-r2 751
 MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r4 163
-MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r1 163
-MD5 61c3ebdd8604c971bf969ea03040d170 files/digest-nvidia-glx-1.0.7174-r1 163
+MD5 97b3ec5488fb7f7f6cdde31ee42e45af files/digest-nvidia-glx-1.0.7167-r2 163
+MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629-r6 163
 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
@@ -27,7 +27,7 @@ MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCdqpRArHZZzCEUG0RAqsdAJ9Z1gSU/yohcghtJr2ypm1XnvyodgCfd8+0
-CCg4L8zE1NVUNkdCDQDY1JM=
-=vMup
+iD8DBQFCeT9hArHZZzCEUG0RAvFjAJ9zzg3ZPvxq2k6TmySqq/BgPQRZqgCfRmB0
+fQa+b3ChqyVc1GnPm3GQNxg=
+=qsbw
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9324510b4ef9
--- /dev/null
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6629-r6
@@ -0,0 +1,2 @@
+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-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r2
index 691dc4a42ce3..691dc4a42ce3 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r1
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167-r2
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r1
deleted file mode 100644
index c09b689e40ca..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7174-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 71e56aa82021c5b0c1e34944f88c6432 NVIDIA-Linux-x86-1.0-7174-pkg0.run 5547644
-MD5 125ec3ecc64202c6c27ef762a438d0f0 NVIDIA-Linux-x86_64-1.0-7174-pkg2.run 8729038
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild
index 25ad6899edc0..c9a7b6b2e9ad 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6111-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.6111-r1.ebuild,v 1.1 2005/01/28 23:02:56 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111-r1.ebuild,v 1.2 2005/05/04 21:32:06 eradicator Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ IUSE="multilib"
 DEPEND="virtual/libc
 	virtual/x11
 	>=x11-base/opengl-update-1.8.1
+	<x11-base/opengl-update-2.2.0
 	~media-video/nvidia-kernel-${PV}"
 
 PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV} ) )"
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r1.ebuild
index d9f74eb9d3db..27ff7a1a8378 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-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.6629-r1.ebuild,v 1.3 2005/01/17 08:47:43 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r1.ebuild,v 1.4 2005/05/04 21:32:06 eradicator Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ IUSE="multilib"
 DEPEND="virtual/libc
 	virtual/x11
 	>=x11-base/opengl-update-1.8.1
+	<x11-base/opengl-update-2.2.0
 	~media-video/nvidia-kernel-${PV}"
 
 PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV} ) )"
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
index 5a0a167d3454..554fbbd41de2 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-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.6629-r5.ebuild,v 1.3 2005/04/01 19:53:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r5.ebuild,v 1.4 2005/05/04 21:32:06 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -18,7 +18,6 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 LICENSE="NVIDIA"
 SLOT="0"
 
-# This revision just changes behavior on amd64 2005.0
 KEYWORDS="-* amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
@@ -26,7 +25,7 @@ IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-base/opengl-update-2.1.0
+	=x11-base/opengl-update-2.1*
 	~media-video/nvidia-kernel-${PV}
 	!app-emulation/emul-linux-x86-nvidia"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
index 20d94779e86d..11d2856e7e58 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7174-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild
@@ -1,10 +1,10 @@
 # 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-r1.ebuild,v 1.2 2005/04/02 16:03:44 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629-r6.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $
 
 inherit eutils multilib versionator
 
-X86_PKG_V="pkg0"
+X86_PKG_V="pkg1"
 AMD64_PKG_V="pkg2"
 NV_V="${PV/1.0./1.0-}"
 X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
@@ -18,8 +18,7 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 LICENSE="NVIDIA"
 SLOT="0"
 
-# Just amd64 2005.0 fixes in this revbump
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
@@ -60,19 +59,17 @@ 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 ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-makefile.patch
+	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
 	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-defines.patch
+	epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
 	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//$(get_version_component_range 3)/6629}-glheader.patch
+	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
@@ -83,15 +80,14 @@ 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)
 
@@ -103,12 +99,6 @@ src_install() {
 
 	is_final_abi || return 0
 
-	# Install tls_test
-	dodir /usr/libexec/misc
-	exeinto /usr/libexec/misc
-	doexe usr/bin/tls_test
-	doexe usr/bin/tls_test_dso.so
-
 	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
 	rm -f usr/share/doc/nvidia-settings*
 	dodoc usr/share/doc/*
@@ -122,10 +112,10 @@ 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
 
@@ -133,15 +123,19 @@ src_install-libs() {
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV} \
-	      usr/${pkglibdir}/libGLcore.so.${PV} \
-		  usr/${pkglibdir}/libnvidia-tls.so.${PV}
+	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
-	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.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}
@@ -150,8 +144,15 @@ src_install-libs() {
 	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
 
-	# Old opengl-updates don't always make this
-	keepdir /usr/${inslibdir}/tls
+	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
@@ -174,21 +175,15 @@ src_install-libs() {
 	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
+	[ -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
+	[ -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
@@ -198,18 +193,21 @@ src_install-libs() {
 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
+	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
-	if [[ ${ROOT} == "/" ]] ; then
+	if [ "${ROOT}" = "/" ]
+	then
 		/usr/sbin/opengl-update nvidia
 	fi
 
@@ -221,3 +219,33 @@ pkg_postinst() {
 	einfo "nVidia have 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
+
+	# 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.7167-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild
index 153bc438cac3..d79240c5c6ae 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.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-r1.ebuild,v 1.2 2005/03/12 02:50:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r2.ebuild,v 1.1 2005/05/04 21:32:06 eradicator Exp $
 
 inherit eutils multilib versionator
 
@@ -18,15 +18,14 @@ SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PAC
 LICENSE="NVIDIA"
 SLOT="0"
 
-# Just amd64 2005.0 fixes in this revbump
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
 
 DEPEND="virtual/libc
 	virtual/x11
-	>=x11-base/opengl-update-2.1.0
+	>=x11-base/opengl-update-2.2.0
 	~media-video/nvidia-kernel-${PV}
 	!app-emulation/emul-linux-x86-nvidia"
 
@@ -103,12 +102,6 @@ src_install() {
 
 	is_final_abi || return 0
 
-	# Install tls_test
-	dodir /usr/libexec/misc
-	exeinto /usr/libexec/misc
-	doexe usr/bin/tls_test
-	doexe usr/bin/tls_test_dso.so
-
 	# Docs, remove nvidia-settings as provided by media-video/nvidia-settings
 	rm -f usr/share/doc/nvidia-settings*
 	dodoc usr/share/doc/*
@@ -133,15 +126,19 @@ src_install-libs() {
 
 	# The GLX libraries
 	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV} \
-	      usr/${pkglibdir}/libGLcore.so.${PV} \
-		  usr/${pkglibdir}/libnvidia-tls.so.${PV}
+	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
-	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
-	dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.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}
@@ -150,8 +147,15 @@ src_install-libs() {
 	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
 	dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
 
-	# Old opengl-updates don't always make this
-	keepdir /usr/${inslibdir}/tls
+	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
@@ -221,3 +225,33 @@ pkg_postinst() {
 	einfo "nVidia have 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
+
+	# 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
+}