Version bump to fix bug #81199 where header symlinks might point to nowhere if the profile dir and global dir didn't have them.

(Portage version: 2.0.51-r15)

14 files changed, 19 insertions, 943 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index d24d811a7184..3e4e4fa37246 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.70 2005/02/08 10:44:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.71 2005/02/09 08:46:21 eradicator Exp $
+
+*opengl-update-2.1.0 (09 Feb 2005)
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-1.5, +files/opengl-update-2.1.0,
+  -files/opengl-update-2.1_pre4, -files/opengl-update-2.1_pre6,
+  -files/opengl-update-2.1_pre7, -opengl-update-1.5.ebuild,
+  +opengl-update-2.1.0.ebuild, -opengl-update-2.1_pre4.ebuild,
+  -opengl-update-2.1_pre6.ebuild, -opengl-update-2.1_pre7.ebuild:
+  Version bump to fix bug #81199 where header symlinks might point to nowhere
+  if the profile dir and global dir didn't have them.
 
   08 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   opengl-update-2.1_pre7.ebuild:
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 58d4c65d6d58..c6a04651853a 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,36 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7d8b27a3a7c68eb03e4922f6528da5ae ChangeLog 12834
 MD5 f4a810bc95a74e27b27973e4e948a937 metadata.xml 358
-MD5 5b48e832f6c2794525ab473968ad7071 opengl-update-1.5.ebuild 525
 MD5 4e8eebd835dbf4f24182d7cce7af8ab7 opengl-update-1.7.2.ebuild 541
 MD5 020171f71e450cf568dac04eabd695f4 opengl-update-1.8.2.ebuild 1594
 MD5 1a24f101a73042eef1bc8ded313b9984 opengl-update-2.0_pre4-r1.ebuild 1740
-MD5 763f994c2b49a6c6ba2c418ab334617c opengl-update-2.1_pre4.ebuild 2184
 MD5 c4bd3ca5f011edc8adfaff3f32c0babd opengl-update-2.0_pre5.ebuild 1741
-MD5 7b9e65256ce455a4a4ae0c3933e31e61 opengl-update-2.1_pre6.ebuild 2439
-MD5 7c3d16b60f7e81e87b6ad958f0684054 opengl-update-2.1_pre7.ebuild 2313
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
+MD5 7c3d16b60f7e81e87b6ad958f0684054 opengl-update-2.1.0.ebuild 2313
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-1.8.2 64
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre4-r1 64
-MD5 0ca46fbf32086f062609ee83fc042c87 files/opengl-update-1.5 3774
 MD5 bd56a074f4d53f9ff26e828e0a34cbf3 files/opengl-update-1.7.2 4975
 MD5 17ebb42dcebb9fcf0d717b135586fca3 files/opengl-update-1.8.2 8303
 MD5 976b6bf00cfdfeaa6cdadbfd49cd2e95 files/opengl-update-2.0_pre4 9755
-MD5 b31a661444c7d54a6782b9e075f6744a files/opengl-update-2.1_pre4 7624
-MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.1_pre4 64
 MD5 745fdf145b2e08f0c996a3ca40b1ca16 files/digest-opengl-update-2.0_pre5 64
 MD5 f21996de10b91b58cced8fbcc6c44792 files/opengl-update-2.0_pre5 9738
-MD5 cf5944150fa11c202f013103cd362c9b files/opengl-update-2.1_pre6 7792
-MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1_pre6 116
-MD5 d3bfde1a7b5ba1869ecb07b412e7cc2a files/opengl-update-2.1_pre7 9040
-MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1_pre7 116
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCCJgFArHZZzCEUG0RArRoAJ4xFZXSPINvmlE2/O6vOW1OngUWYgCffSLL
-CGeKSS/+v6Sst7T3RvvQnaA=
-=7C39
------END PGP SIGNATURE-----
+MD5 1ba3b17297096aa1555776241e07ca0e files/opengl-update-2.1.0 8890
+MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.0 116
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.5 b/x11-base/opengl-update/files/digest-opengl-update-1.5
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.5
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre6 b/x11-base/opengl-update/files/digest-opengl-update-2.1.0
index 6a175f487f3b..6a175f487f3b 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre6
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1.0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre4 b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre4
deleted file mode 100644
index 23c2e8979086..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e16a3144742d1a5409fe18477a88f8b6 glext.h-20040830.bz2 30982
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre7 b/x11-base/opengl-update/files/digest-opengl-update-2.1_pre7
deleted file mode 100644
index 6a175f487f3b..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ad3eba2841c01c0a94b6477d11d5ac31 glext.h-26.bz2 32485
-MD5 3260a509b23a3519b8df335a4e8f5e1d glxext.h-10.bz2 5895
diff --git a/x11-base/opengl-update/files/opengl-update-1.5 b/x11-base/opengl-update/files/opengl-update-1.5
deleted file mode 100644
index 6ba394e94b48..000000000000
--- a/x11-base/opengl-update/files/opengl-update-1.5
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.5,v 1.3 2004/07/15 00:27:54 agriffis Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-
-source /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are two supported implementations, namely "xfree" and "nvidia", the
-       implementations for XFree86 and the NVidia drivers respectively.
-
-examples:
-       opengl-update xfree
-       This will setup things to use libGL.so from XFree86
-
-       opengl-update nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 -a "$#" -ne 2 ] || [ "$#" -eq 2 -a "$1" != "--use-old" ]
-then
-	usage
-fi
-
-GL_IMPLEM=""
-
-# Only use specified implementation if it is not already selected.
-if [ "$1" = "--use-old" ]
-then
-	shift
-
-	if [ -f /etc/env.d/09opengl ]
-	then
-		source /etc/env.d/09opengl
-		if [ -n "${LDPATH}" ]
-		then
-			GL_IMPLEM="${LDPATH/\/usr\/lib\/opengl\/}"
-			GL_IMPLEM="${GL_IMPLEM/\/lib}"
-			unset LDPATH
-		fi
-	fi
-	
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		GL_IMPLEM="$1"
-	fi
-else
-	GL_IMPLEM="$1"
-fi
-if [ ! -d /usr/lib/opengl/${GL_IMPLEM} ]
-then
-	usage
-else
-	ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib" >/etc/env.d/09opengl
-	/usr/sbin/env-update &>/dev/null
-
-	#setup the /usr/lib/libGL.so symlink
-	if [ -e /usr/lib/libGL.so ]
-	then
-		rm -f /usr/lib/libGL.so
-	fi
-	if [ -e /usr/lib/libGL.so.1 ]
-	then
-		rm -f /usr/lib/libGL.so.1
-	fi
-	realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/lib/libGL.so.1
-
-	#setup the /usr/X11R6/lib/libMesaGL.so symlink
-	if [ -e /usr/X11R6/lib/libMesaGL.so ]
-	then
-		rm -f /usr/X11R6/lib/libMesaGL.so
-	fi
-	realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/X11R6/lib/libMesaGL.so
-
-	#setup the /usr/lib/libGLcore.so symlink
-	if [ -e /usr/lib/libGLcore.so ]
-	then
-		rm -f /usr/lib/libGLcore.so
-	fi
-	if [ -e /usr/lib/libGLcore.so.1 ]
-	then
-		rm -f /usr/lib/libGLcore.so.1
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.so symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so \
-			/usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.a symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.a ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a \
-			/usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-
-	#setup the includes
-	for x in gl.h glx.h glxtokens.h
-	do
-		if [ -e /usr/X11R6/include/GL/${x} ]
-		then
-			rm -f /usr/X11R6/include/GL/${x}
-		fi
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre7 b/x11-base/opengl-update/files/opengl-update-2.1.0
index 0ecfc0bbaecf..946ae4bea9dc 100644
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre7
+++ b/x11-base/opengl-update/files/opengl-update-2.1.0
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre7,v 1.2 2005/02/08 10:38:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1.0,v 1.1 2005/02/09 08:46:21 eradicator Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
@@ -265,8 +265,6 @@ set-new-implementation() {
 			fi
 
 			# Setup the includes
-			# Hack until /usr/X11R6 is gone...
-			[[ ${DST_PREFIX} == "/usr" ]] && DST_PREFIX="/usr/X11R6"
 			mkdir -p ${DST_PREFIX}/include/GL
 			pushd ${DST_PREFIX}/include/GL &> /dev/null
 				for file in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
@@ -278,12 +276,11 @@ set-new-implementation() {
 					# then it should be installed to ${GL_IMPLEM}/include
 
 					if [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
-						if [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
-							ewarn "Profile-specific header file is being used for ${file} instead of the global version provided."
-						fi
 						ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
 					elif [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
 						ln -s ${PREFIX}/${LIBDIR}/opengl/global/include/${file}
+					elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then
+						ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file}
 					fi
 				done
 			popd &> /dev/null
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre4 b/x11-base/opengl-update/files/opengl-update-2.1_pre4
deleted file mode 100644
index 33b850c6b347..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre4
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre4,v 1.1 2005/01/27 01:49:27 eradicator Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
-# Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-need_version() {
-	local X11 X11_VER X11_MAJOR_VER X11_MINOR_VER X11_MICRO_VER ERROR_MSG
-	ERROR_MSG="This version requires >=x11-base/xorg-x11-6.8.0-r4"
-	X11="$(portageq match / virtual/x11)"
-	# Got the egrep from ferringb, who got it from portage code
-	X11_VER="$(echo ${X11} | egrep -o '(cvs\.)?([[:digit:]]+)((\.[[:digit:]]+)*)([a-z]?)((_(pre|p|beta|alpha|rc)[[:digit:]]*)*)(-r([[:digit:]]+))?$')"
-	X11_MAJOR_VER="${X11_VER%%.*}"
-	# Hack around a little to get the minor version
-	X11_MINOR_VER="${X11_VER#*.}"
-	X11_MINOR_VER="${X11_MINOR_VER%%.*}"
-	X11_REVISION_VER="${X11_VER##*-r}"
-
-	# If version <6.*, die
-	if [ ${X11_MAJOR_VER} -lt 6 ]
-	then
-		einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-		eerror "${ERROR_MSG}"
-		exit 1
-	# If version =6.* and <6.8.*, die
-	elif [ ${X11_MAJOR_VER} -eq 6 -a ${X11_MINOR_VER} -lt 8 ]
-	then
-		einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-		eerror "${ERROR_MSG}"
-		exit 1	
-	# If version =6.8.0 and <r4, die
-	elif [ "${X11_VER}" = "6.8.0" ]
-	then
-		if [ ! ${X11_REVISION_VER} -lt 4 ]
-		then
-			einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-			eerror "${ERROR_MSG}"
-			exit 1
-		fi
-	fi
-}
-
-count_implementations() {
-	local DIR
-	COUNT="0"
-	for DIR in $(ls /usr/lib/opengl)
-	do
-		if [ "${DIR}" != "global" ]
-		then
-			DIRS="${DIRS} ${DIR}"
-			COUNT="$((COUNT + 1))"
-		fi
-	done
-}
-
-usage() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# 	for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# 	no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-count_implementations
-
-# Get grammar right in message
-local IS_ARE IMPLEM_PLURAL
-if [ ${COUNT} -eq 1 ]
-then
-	IS_ARE="is"
-	IMPLEM_PLURAL=""
-else
-	IS_ARE="are"
-	IMPLEM_PLURAL="s"
-fi
-
-cat << FOO
-usage: ${0##*/} <GL implementation>
-
-note:
-       This utility switches between OpenGL implementations.  There ${IS_ARE}
-       ${COUNT} available implementation${IMPLEM_PLURAL}: ${DIRS}.
-
-examples:
-       ${0##*/} xorg-x11
-       This will setup things to use libGL.so from X.org.
-
-       ${0##*/} nvidia
-       This will setup things to use libGL.so from the nVidia drivers.
-
-FOO
-	exit 1
-}
-
-need_version
-
-if [ "$#" -ne 1 -a "$#" -ne 2 ] || \
-	[ "$#" -eq 2 -a "$1" != "--use-old" ]
-then
-	usage
-fi
-
-GL_IMPLEM=""
-
-# Discover GL implementation if it exists
-get_implem() {
-	if [ -f /etc/env.d/03opengl ]
-	then
-		source /etc/env.d/03opengl
-		if [ -n "${LDPATH}" ]
-		then
-			GL_IMPLEM="${LDPATH%%:*}"
-			GL_IMPLEM="${GL_IMPLEM##*opengl/}"
-			GL_IMPLEM="${GL_IMPLEM%/lib*}"
-			unset LDPATH
-		fi
-	fi
-}
-
-# Return current GL implementation
-if [ "$1" = "--get-implementation" ]
-then
-	get_implem
-
-	if [ -n "${GL_IMPLEM}" ]
-	then
-		echo "${GL_IMPLEM}"
-	fi
-
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		exit 2
-	fi
-
-	exit 0
-fi
-
-if [ $(id -u) -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-# Only use specified implementation if it is not already selected.
-if [ "$1" = "--use-old" ]
-then
-	shift
-
-	get_implem
-
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		GL_IMPLEM="$1"
-	fi
-else
-	GL_IMPLEM="$1"
-fi
-
-if [ ! -d /usr/lib/opengl/${GL_IMPLEM} ]
-then
-	usage
-fi
-
-ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-	rm -f /etc/env.d/03opengl &> /dev/null
-
-	LIBDIRS="lib lib32 lib64"
-	for LIBDIR in ${LIBDIRS}; do
-		[ "${LIBDIR}" = "lib32" ] || [ -d "/usr/${LIBDIR}" -a ! -h "/usr/${LIBDIR}" ] || continue
-
-		# System wide tls stuff
-		[ -h "/usr/${LIBDIR}/tls" ] && rm -f /usr/${LIBDIR}/tls
-		[ -d "/usr/${LIBDIR}/tls" ] || mkdir -p /usr/${LIBDIR}/tls
-
-		# Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
-		if [ ! -d /usr/${LIBDIR}/opengl/"${GL_IMPLEM}" ]; then
-			GL_LOCAL="xorg-x11"
-		else
-			GL_LOCAL="${GL_IMPLEM}"
-		fi
-		
-		# Provide the right libnvidia-tls depending on ntpl or not
-		if [ "${GL_LOCAL}" = "nvidia" ]; then
-			if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]; then
-				rm -f /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls
-			fi
-		
-			if getconf GNU_LIBPTHREAD_VERSION | grep -i nptl; then
-				ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/tls /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/tls
-				# This shouldn't be neccessary...
-				#ldpath="${ldpath:+${ldpath}:}/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls"
-			fi
-		fi
-
-		pushd /usr/${LIBDIR}
-			# First remove old symlinks
-			for file in libGL.so* libGLcore.so* libnvidia-tls.so*  tls/libnvidia-tls.so*; do
-				[ -h ${file} ] && rm -f ${file}
-			done
-
-			# Note that we don't do .so*, just .so on purpose.  The
-			# loader knows to look in the profile dir, and the
-			# linked just needs the .so
-			for file in opengl/${GL_LOCAL}/lib/*.{so,a,la}; do
-				[ -f "${file}" ] || continue
-				rm -f $(basename ${file})
-
-				# Fix libtool archives (#48297)
-				if [ "${file%.la}" != "${file}" ]; then
-					sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-				else
-					ln -s ${file}
-				fi
-			done
-		popd
-
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]; then
-			pushd /usr/${LIBDIR}/tls
-				for file in ../opengl/${GL_LOCAL}/lib/tls/*.{so,a,la}; do
-					[ -f "${file}" ] || continue
-					rm -f $(basename ${file})
-
-					# Fix libtool archives (#48297)
-					if [ "${file%.la}" != "${file}" ]; then
-						sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-					else
-						ln -s ${file}
-					fi
-				done
-			popd
-		fi
-
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]; then
-			mkdir -p /usr/${LIBDIR}/modules/extensions
-			pushd /usr/${LIBDIR}/modules/extensions
-				# First remove old symlinks
-				for file in libglx.so libglx.a; do
-					[ -h ${file} ] && rm -f ${file}
-				done
-
-				for file in ../../opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
-					[ -f "${file}" ] || continue
-					rm -f $(basename ${file})
-
-					# Fix libtool archives (#48297)
-					if [ "${file%.la}" != "${file}" ]; then
-						sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-					else
-						ln -s ${file}
-					fi
-				done
-			popd
-		fi
-
-		# Setup the includes
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/include" ]; then
-			for x in gl.h glx.h glxtokens.h glext.h; do
-				if [ -e /usr/X11R6/include/GL/${x} ]; then
-					rm -f /usr/X11R6/include/GL/${x}
-				fi
-
-				# IMPORTANT
-				# It is preferable currently to use the standard glext.h file
-				# however if an OpenGL provider must use a self produced glext.h
-				# then it should be installed to ${GL_IMPLEM}/include
-
-				if [ -e /usr/${LIBDIR}/opengl/${GL_IMPLEM}/include/${x} ]; then
-					ln -sf /usr/${LIBDIR}/opengl/${GL_IMPLEM}/include/${x} \
-						/usr/X11R6/include/GL/${x}
-				else
-					ln -sf /usr/${LIBDIR}/opengl/global/include/${x} \
-						/usr/X11R6/include/GL/${x}
-				fi
-			done
-		fi
-
-		# Setup the $LDPATH
-		ldpath="${ldpath:+${ldpath}:}/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib"
-
-	done &> /dev/null
-
-	echo "LDPATH=\"${ldpath}\"" > /etc/env.d/03opengl
-
-	env-update
-
-eend 0
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/files/opengl-update-2.1_pre6 b/x11-base/opengl-update/files/opengl-update-2.1_pre6
deleted file mode 100644
index f99f7c4fb18e..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.1_pre6
+++ /dev/null
@@ -1,300 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1_pre6,v 1.1 2005/02/07 08:51:15 eradicator Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
-# Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-need_version() {
-	local X11 X11_VER X11_MAJOR_VER X11_MINOR_VER X11_MICRO_VER ERROR_MSG
-	ERROR_MSG="This version requires >=x11-base/xorg-x11-6.8.0-r4"
-	X11="$(portageq match / virtual/x11)"
-	# Got the egrep from ferringb, who got it from portage code
-	X11_VER="$(echo ${X11} | egrep -o '(cvs\.)?([[:digit:]]+)((\.[[:digit:]]+)*)([a-z]?)((_(pre|p|beta|alpha|rc)[[:digit:]]*)*)(-r([[:digit:]]+))?$')"
-	X11_MAJOR_VER="${X11_VER%%.*}"
-	# Hack around a little to get the minor version
-	X11_MINOR_VER="${X11_VER#*.}"
-	X11_MINOR_VER="${X11_MINOR_VER%%.*}"
-	X11_REVISION_VER="${X11_VER##*-r}"
-
-	# If version <6.*, die
-	if [ ${X11_MAJOR_VER} -lt 6 ]
-	then
-		einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-		eerror "${ERROR_MSG}"
-		exit 1
-	# If version =6.* and <6.8.*, die
-	elif [ ${X11_MAJOR_VER} -eq 6 -a ${X11_MINOR_VER} -lt 8 ]
-	then
-		einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-		eerror "${ERROR_MSG}"
-		exit 1	
-	# If version =6.8.0 and <r4, die
-	elif [ "${X11_VER}" = "6.8.0" ]
-	then
-		if [ ! ${X11_REVISION_VER} -lt 4 ]
-		then
-			einfo "Detected X ${X11_MAJOR_VER}.${X11_MINOR_VER} series, revision ${X11_REVISION_VER}"
-			eerror "${ERROR_MSG}"
-			exit 1
-		fi
-	fi
-}
-
-count_implementations() {
-	local DIR
-	COUNT="0"
-	for DIR in $(ls /usr/lib/opengl)
-	do
-		if [ "${DIR}" != "global" ]
-		then
-			DIRS="${DIRS} ${DIR}"
-			COUNT="$((COUNT + 1))"
-		fi
-	done
-}
-
-usage() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# 	for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# 	no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-count_implementations
-
-# Get grammar right in message
-local IS_ARE IMPLEM_PLURAL
-if [ ${COUNT} -eq 1 ]
-then
-	IS_ARE="is"
-	IMPLEM_PLURAL=""
-else
-	IS_ARE="are"
-	IMPLEM_PLURAL="s"
-fi
-
-cat << FOO
-usage: ${0##*/} <GL implementation>
-
-note:
-       This utility switches between OpenGL implementations.  There ${IS_ARE}
-       ${COUNT} available implementation${IMPLEM_PLURAL}: ${DIRS}.
-
-examples:
-       ${0##*/} xorg-x11
-       This will setup things to use libGL.so from X.org.
-
-       ${0##*/} nvidia
-       This will setup things to use libGL.so from the nVidia drivers.
-
-FOO
-	exit 1
-}
-
-need_version
-
-if [ "$#" -ne 1 -a "$#" -ne 2 ] || \
-	[ "$#" -eq 2 -a "$1" != "--use-old" ]
-then
-	usage
-fi
-
-GL_IMPLEM=""
-
-# Discover GL implementation if it exists
-get_implem() {
-	if [ -f /etc/env.d/03opengl ]
-	then
-		source /etc/env.d/03opengl
-		if [ -n "${LDPATH}" ]
-		then
-			GL_IMPLEM="${LDPATH%%:*}"
-			GL_IMPLEM="${GL_IMPLEM##*opengl/}"
-			GL_IMPLEM="${GL_IMPLEM%/lib*}"
-			unset LDPATH
-		fi
-	fi
-}
-
-# Return current GL implementation
-if [ "$1" = "--get-implementation" ]
-then
-	get_implem
-
-	if [ -n "${GL_IMPLEM}" ]
-	then
-		echo "${GL_IMPLEM}"
-	fi
-
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		exit 2
-	fi
-
-	exit 0
-fi
-
-if [ $(id -u) -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-# Only use specified implementation if it is not already selected.
-if [ "$1" = "--use-old" ]
-then
-	shift
-
-	get_implem
-
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		GL_IMPLEM="$1"
-	fi
-else
-	GL_IMPLEM="$1"
-fi
-
-if [ ! -d /usr/lib/opengl/${GL_IMPLEM} ]
-then
-	usage
-fi
-
-ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-	rm -f /etc/env.d/03opengl &> /dev/null
-
-	LIBDIRS="lib lib32 lib64"
-	for LIBDIR in ${LIBDIRS}; do
-		# Special case handling of lib32 because it can be a symlink to
-		# emul libs
-		if [ "${LIBDIR}" = "lib32" ]; then
-			[ -d "/usr/${LIBDIR}" ] || continue
-		else
-			[ -d "/usr/${LIBDIR}" -a ! -h "/usr/${LIBDIR}" ] || continue
-		fi
-
-		# System wide tls stuff
-		[ -h "/usr/${LIBDIR}/tls" ] && rm -f /usr/${LIBDIR}/tls
-		[ -d "/usr/${LIBDIR}/tls" ] || mkdir -p /usr/${LIBDIR}/tls
-
-		# Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
-		if [ ! -d /usr/${LIBDIR}/opengl/"${GL_IMPLEM}" ]; then
-			GL_LOCAL="xorg-x11"
-		else
-			GL_LOCAL="${GL_IMPLEM}"
-		fi
-		
-		# Provide the right libnvidia-tls depending on ntpl or not
-		if [ "${GL_LOCAL}" = "nvidia" ]; then
-			if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]; then
-				rm -f /usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls
-			fi
-		
-			if getconf GNU_LIBPTHREAD_VERSION | grep -i nptl; then
-				ln -sf /usr/${LIBDIR}/opengl/${GL_LOCAL}/tls /usr/${LIBDIR}/opengl/${GL_IMPLEM}/lib/tls
-				# This shouldn't be neccessary...
-				#ldpath="${ldpath:+${ldpath}:}/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls"
-			fi
-		fi
-
-		pushd /usr/${LIBDIR}
-			# First remove old symlinks
-			for file in libGL.so* libGLcore.so* libnvidia-tls.so*  tls/libnvidia-tls.so*; do
-				[ -h ${file} ] && rm -f ${file}
-			done
-
-			# Note that we don't do .so*, just .so on purpose.  The
-			# loader knows to look in the profile dir, and the
-			# linked just needs the .so
-			for file in opengl/${GL_LOCAL}/lib/*.{so,a,la}; do
-				[ -f "${file}" ] || continue
-				rm -f $(basename ${file})
-
-				# Fix libtool archives (#48297)
-				if [ "${file%.la}" != "${file}" ]; then
-					sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-				else
-					ln -s ${file}
-				fi
-			done
-		popd
-
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]; then
-			pushd /usr/${LIBDIR}/tls
-				for file in ../opengl/${GL_LOCAL}/lib/tls/*.{so,a,la}; do
-					[ -f "${file}" ] || continue
-					rm -f $(basename ${file})
-
-					# Fix libtool archives (#48297)
-					if [ "${file%.la}" != "${file}" ]; then
-						sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-					else
-						ln -s ${file}
-					fi
-				done
-			popd
-		fi
-
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]; then
-			mkdir -p /usr/${LIBDIR}/modules/extensions
-			pushd /usr/${LIBDIR}/modules/extensions
-				# First remove old symlinks
-				for file in libglx.so libglx.a; do
-					[ -h ${file} ] && rm -f ${file}
-				done
-
-				for file in ../../opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
-					[ -f "${file}" ] || continue
-					rm -f $(basename ${file})
-
-					# Fix libtool archives (#48297)
-					if [ "${file%.la}" != "${file}" ]; then
-						sed "s:/usr/[^/]*/opengl/[^/]*/lib:/usr/${LIBDIR}:g" ${file} > $(basename ${file})
-					else
-						ln -s ${file}
-					fi
-				done
-			popd
-		fi
-
-		# Setup the includes
-		if [ -e "/usr/${LIBDIR}/opengl/${GL_LOCAL}/include" ]; then
-			for x in gl.h glx.h glxtokens.h glext.h glxext.h glxmd.h glxproto.h; do
-				if [ -e /usr/X11R6/include/GL/${x} ]; then
-					rm -f /usr/X11R6/include/GL/${x}
-				fi
-
-				# IMPORTANT
-				# It is preferable currently to use the standard glext.h file
-				# however if an OpenGL provider must use a self produced glext.h
-				# then it should be installed to ${GL_IMPLEM}/include
-
-				if [ -e /usr/${LIBDIR}/opengl/${GL_IMPLEM}/include/${x} ]; then
-					ln -sf /usr/${LIBDIR}/opengl/${GL_IMPLEM}/include/${x} \
-						/usr/X11R6/include/GL/${x}
-				else
-					ln -sf /usr/${LIBDIR}/opengl/global/include/${x} \
-						/usr/X11R6/include/GL/${x}
-				fi
-			done
-		fi
-
-		# Setup the $LDPATH
-		ldpath="${ldpath:+${ldpath}:}/usr/${LIBDIR}/opengl/${GL_LOCAL}/lib"
-
-	done &> /dev/null
-
-	echo "LDPATH=\"${ldpath}\"" > /etc/env.d/03opengl
-
-	env-update
-
-eend 0
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/opengl-update-1.5.ebuild b/x11-base/opengl-update/opengl-update-1.5.ebuild
deleted file mode 100644
index 99587ae94099..000000000000
--- a/x11-base/opengl-update/opengl-update-1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.5.ebuild,v 1.13 2005/01/20 17:36:34 fmccor Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used."
-SRC_URI=""
-HOMEPAGE="http://www.gentoo.org/"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND="virtual/libc"
-
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update
-}
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre7.ebuild b/x11-base/opengl-update/opengl-update-2.1.0.ebuild
index 1ccbb8059586..62d701de7896 100644
--- a/x11-base/opengl-update/opengl-update-2.1_pre7.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.1.0.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/x11-base/opengl-update/opengl-update-2.1_pre7.ebuild,v 1.2 2005/02/08 10:44:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1.0.ebuild,v 1.1 2005/02/09 08:46:21 eradicator Exp $
 
 inherit multilib toolchain-funcs
 
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild b/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild
deleted file mode 100644
index f2101a27d7c5..000000000000
--- a/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1_pre4.ebuild,v 1.2 2005/02/03 05:49:18 eradicator Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-GLEXT="20040830"
-SRC_URI="http://dev.gentoo.org/~cyfred/distfiles/glext.h-${GLEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#Removed: ~arm ~hppa ~ia64 due to insufficient xorg-x11 version
-IUSE=""
-RESTRICT="multilib-pkg-force"
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-RDEPEND="!x11-base/xfree86
-	 !<x11-base/xorg-x11-6.8.0-r4
-	 !<media-video/ati-drivers-8.8.25-r3"
-
-src_unpack() {
-	bzcat ${DISTDIR}/glext.h-${GLEXT}.bz2 > ${WORKDIR}/glext.h || die
-}
-
-pkg_preinst() {
-	# It needs to be before 04multilib
-	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
-
-	OABI="${ABI}"
-	for ABI in $(get_install_abis); do
-		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
-		fi
-		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
-		fi
-	done
-	ABI="${OABI}"
-	unset OABI
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			# Install default glext.h
-			insinto /usr/$(get_libdir)/opengl/global/include
-			doins ${WORKDIR}/glext.h || die
-		done
-		ABI="${OABI}"
-		unset OABI
-	else
-		# Install default glext.h
-		insinto /usr/$(get_libdir)/opengl/global/include
-		doins ${WORKDIR}/glext.h || die
-	fi
-}
diff --git a/x11-base/opengl-update/opengl-update-2.1_pre6.ebuild b/x11-base/opengl-update/opengl-update-2.1_pre6.ebuild
deleted file mode 100644
index e76ff3bee658..000000000000
--- a/x11-base/opengl-update/opengl-update-2.1_pre6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1_pre6.ebuild,v 1.1 2005/02/07 08:51:15 eradicator Exp $
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# http://oss.sgi.com/projects/ogl-sample/ABI/glxext.h
-
-GLEXT="26"
-GLXEXT="10"
-
-SRC_URI="http://dev.gentoo.org/~eradicator/opengl/glext.h-${GLEXT}.bz2
-	 http://dev.gentoo.org/~eradicator/opengl/glxext.h-${GLXEXT}.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-#Removed: ~arm ~hppa ~ia64 due to insufficient xorg-x11 version
-IUSE=""
-RESTRICT="multilib-pkg-force"
-
-DEPEND="virtual/libc
-	app-arch/bzip2"
-
-RDEPEND="!x11-base/xfree86
-	 !<x11-base/xorg-x11-6.8.0-r4
-	 !<media-video/ati-drivers-8.8.25-r3"
-
-pkg_preinst() {
-	# It needs to be before 04multilib
-	[ -f "${ROOT}/etc/env.d/09opengl" ] && mv ${ROOT}/etc/env.d/09opengl ${ROOT}/etc/env.d/03opengl
-
-	OABI="${ABI}"
-	for ABI in $(get_install_abis); do
-		if [ -e "${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from xorg-x11 profile.  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/opengl/xorg-x11/lib/libMesaGL.so
-		fi
-		if [ -e "${ROOT}/usr/$(get_libdir)/libMesaGL.so" ]; then
-			einfo "Removing libMesaGL.so from /usr/$(get_libdir).  See bug #47598."
-			rm -f ${ROOT}/usr/$(get_libdir)/libMesaGL.so
-		fi
-	done
-	ABI="${OABI}"
-	unset OABI
-}
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-
-	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
-	local MLTEST=$(type dyn_unpack)
-	if has_multilib_profile && [ "${MLTEST/set_abi}" = "${MLTEST}" ]; then
-		OABI="${ABI}"
-		for ABI in $(get_install_abis); do
-			# Install default glext.h
-			insinto /usr/$(get_libdir)/opengl/global/include
-			newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
-			newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
-		done
-		ABI="${OABI}"
-		unset OABI
-	else
-		# Install default glext.h
-		insinto /usr/$(get_libdir)/opengl/global/include
-		newins ${WORKDIR}/glext.h-${GLEXT} glext.h || die
-		newins ${WORKDIR}/glxext.h-${GLXEXT} glxext.h || die
-	fi
-}