Fix removal of broken symlinks in headers. Check for /usr/libdir/opengl rather than /usr/libdir. Fix install of libglx to the correct place. Closes all open bugs (again). This should be the stable candidate (again).

(Portage version: 2.0.51.16)

6 files changed, 17 insertions, 361 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 59dc7645cc42..f00bb5243d9b 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,15 @@
 # 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.73 2005/02/10 00:03:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.74 2005/02/10 06:45:38 eradicator Exp $
+
+*opengl-update-2.1.1 (09 Feb 2005)
+
+  09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/opengl-update-2.1.0, files/opengl-update-2.1.1,
+  -opengl-update-2.1.0-r1.ebuild, +opengl-update-2.1.1.ebuild:
+  Fix removal of broken symlinks in headers. Check for /usr/libdir/opengl
+  rather than /usr/libdir. Fix install of libglx to the correct place. Closes
+  all open bugs (again). This should be the stable candidate (again).
 
   09 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
   +files/opengl-update-2.1.1:
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index b818291b8f41..8af3d20b0924 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b9e1d5f2f5bb0df3e69e24bc5a38cf31 ChangeLog 13764
 MD5 f4a810bc95a74e27b27973e4e948a937 metadata.xml 358
 MD5 4e8eebd835dbf4f24182d7cce7af8ab7 opengl-update-1.7.2.ebuild 541
@@ -8,6 +5,7 @@ MD5 020171f71e450cf568dac04eabd695f4 opengl-update-1.8.2.ebuild 1594
 MD5 1a24f101a73042eef1bc8ded313b9984 opengl-update-2.0_pre4-r1.ebuild 1740
 MD5 c4bd3ca5f011edc8adfaff3f32c0babd opengl-update-2.0_pre5.ebuild 1741
 MD5 a4456d5104c7a7d8e288d8d980495788 opengl-update-2.1.0-r1.ebuild 2425
+MD5 a4456d5104c7a7d8e288d8d980495788 opengl-update-2.1.1.ebuild 2425
 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
@@ -19,10 +17,4 @@ MD5 f21996de10b91b58cced8fbcc6c44792 files/opengl-update-2.0_pre5 9738
 MD5 6d1cf5524b4fb49bc35ed0410ef2c9a4 files/opengl-update-2.1.0 8887
 MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.0-r1 116
 MD5 7a9fd9555dbeb7813d0d84d25ab27d9a files/opengl-update-2.1.1 8996
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCCrsCArHZZzCEUG0RAqBoAJ9mvSWUSCAo/TzNniYD2R6OMqxfhQCfRNC4
-KCKijh/Is3hpJlaLZI/AEns=
-=gxxL
------END PGP SIGNATURE-----
+MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1 116
diff --git a/x11-base/opengl-update/files/digest-opengl-update-2.1.0-r1 b/x11-base/opengl-update/files/digest-opengl-update-2.1.1
index 6a175f487f3b..6a175f487f3b 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-2.1.0-r1
+++ b/x11-base/opengl-update/files/digest-opengl-update-2.1.1
diff --git a/x11-base/opengl-update/files/opengl-update-2.1.0 b/x11-base/opengl-update/files/opengl-update-2.1.0
deleted file mode 100644
index 946ae4bea9dc..000000000000
--- a/x11-base/opengl-update/files/opengl-update-2.1.0
+++ /dev/null
@@ -1,345 +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.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>
-# Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-hasq() {
-	local x
-
-	local me=${1}
-	shift
-        
-	for x in "${@}"; do
-		if [[ "${x}" == "${me}" ]]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-check_user() {
-	if [[ $(id -u) -ne 0 ]]; then
-		eerror "${0}: Must be run as root."
-		exit 1
-	fi
-}
-
-check_version() {
-	if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
-		eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
-		exit 1
-	fi
-}
-
-get_current_implem() {
-	local implem
-	if [[ -f ${ENV_D} ]]; then
-		source ${ENV_D}
-		if [[ -n "${OPENGL_PROFILE}" ]]; then
-			implem="${OPENGL_PROFILE}"
-		elif [[ -n "${LDPATH}" ]]; then
-			implem="${LDPATH%%:*}"
-			implem="${implem##*opengl/}"
-			implem="${implem%/lib*}"
-		fi
-		unset LDPATH
-		unset OPENGL_PROFILE
-	fi
-
-	echo ${implem}
-}
-
-get_implementations() {
-	local implems
-	for dir in ${PREFIX}/lib{,32,64}/opengl/*; do 
-		if [[ -d "${dir}" && ${dir##*/} != "global" ]] && ! hasq ${dir##*/} ${implems}; then
-			implems=${implems:+${implems} }${dir##*/}
-		fi
-	done
-	echo ${implems}
-}
-
-usage() {
-	# Get grammar right in message
-	local IS_ARE IMPLEM_PLURAL
-	if [[ $(echo ${AVAIL_IMPLEMS} | wc -w) -eq 1 ]]; then
-		IS_ARE="is"
-		IMPLEM_PLURAL=""
-	else
-		IS_ARE="are"
-		IMPLEM_PLURAL="s"
-	fi
-
-	cat << FOO
-Usage: ${0##*/} [<options>] <GL implementation>
-       Set the opengl implementation.
-       Valid options:
-       --use-old: only change the implementation if isn't already set.
-       --prefix: set the source prefix (default: /usr)
-       --dst-prefix: set the destination prefix (default: /usr)
-
-Usage: ${0##*/} --get-implementation
-       Print the current implementaion
-
-Note:
-       This utility switches between OpenGL implementations.  There ${IS_ARE}
-       $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS}
-
-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
-}
-
-parse_options() {
-	local opt
-	while [[ ${#} -gt 0 ]]; do
-		opt=${1}
-		shift
-		case ${opt} in
-			--use-old)
-				if [[ -n "${ACTION}" ]]; then
-					ACTION="error"
-					eerror "Invalid usage."
-				else
-					if [[ -n "${CURRENT_GL_IMPLEM}" ]] && hasq ${CURRENT_GL_IMPLEM} ${AVAIL_IMPLEMS}; then
-						ACTION="nothing"
-					fi
-				fi				
-			;;
-			--get-implementation)
-				if [[ -n "${ACTION}" ]]; then
-					ACTION="error"
-					eerror "Invalid usage."
-				else
-					ACTION="get-implementation"
-				fi				
-			;;
-			--prefix=*)
-				PREFIX=${opt#*=}
-				AVAIL_IMPLEMS=$(get_implementations)
-			;;
-			--dst-prefix=*)
-				DST_PREFIX=${opt#*=}
-			;;
-			--help|-h|-?)
-				ACION="usage"
-			;;
-			*)
-				if hasq ${opt} ${AVAIL_IMPLEMS}; then
-					NEW_GL_IMPLEM="${opt}"
-					if [[ "${ACTION}" != "nothing" ]]; then
-						if [[ -n "${ACTION}" ]]; then
-							ACTION="error"
-							eerror "Invalid usage."
-						else
-							ACTION="set-implementation"
-						fi
-					fi				
-				else
-					eerror "Unrecognized option: ${opt}"
-					ACTION="error"
-				fi
-			;;
-		esac
-	done
-}
-
-set-new-implementation() {
-	local GL_IMPLEM=${1}
-	local GL_LOCAL
-
-	check_version
-
-	if ! hasq ${GL_IMPLEM} ${AVAIL_IMPLEMS}; then
-		eerror "Invalid profile selected."
-		exit 1
-	fi
-
-	ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-		rm -f ${ENV_D} &> /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 "${PREFIX}/${LIBDIR}" ]] || continue
-			else
-				[[ -d "${PREFIX}/${LIBDIR}" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue
-			fi
-
-			# System wide tls stuff
-			[[ -h "${DST_PREFIX}/${LIBDIR}/tls" ]] && rm -f ${DST_PREFIX}/${LIBDIR}/tls
-			[[ -d "${DST_PREFIX}/${LIBDIR}/tls" ]] || mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
-
-			# Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
-			if [[ ! -d ${PREFIX}/${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 "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
-					rm -f ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls &> /dev/null
-				fi
-		
-				if getconf GNU_LIBPTHREAD_VERSION | grep -qi nptl; then
-					ln -sf ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/tls ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/lib/tls &> /dev/null
-				fi
-			fi
-
-			mkdir -p ${DST_PREFIX}/${LIBDIR}
-			pushd ${DST_PREFIX}/${LIBDIR} &> /dev/null
-				# 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 ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/*.{so,a,la}; do
-					[[ -f "${file}" ]] || continue
-					[[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
-					# Fix libtool archives (#48297)
-					if [[ "${file%.la}" != "${file}" ]]; then
-						sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
-					else
-						ln -s ${file}
-					fi
-				done
-			popd &> /dev/null
-
-			if [[ -e "${PREFIX}/${LIBDIR}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls" ]]; then
-				mkdir -p ${DST_PREFIX}/${LIBDIR}/tls
-				pushd ${DST_PREFIX}/${LIBDIR}/tls &> /dev/null
-					for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/*.{so,a,la}; do
-						[[ -f "${file}" ]] || continue
-						[[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
-						# Fix libtool archives (#48297)
-						if [ "${file%.la}" != "${file}" ]; then
-							sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
-						else
-							ln -s ${file}
-						fi
-					done
-				popd &> /dev/null
-			fi
-
-			if [[ -e "${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions" ]]; then
-				mkdir -p ${DST_PREFIX}/${LIBDIR}/modules/extensions
-				pushd ${DST_PREFIX}/${LIBDIR}/modules/extensions &> /dev/null
-					# First remove old symlinks
-					for file in libglx.so libglx.a; do
-						[[ -h ${file} ]] && rm -f ${file}
-					done
-
-					for file in ${PREFIX}/opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do
-						[[ -f "${file}" ]] || continue
-						[[ -f "${file##*/}" ]] && rm -f ${file##*/}
-
-						# Fix libtool archives (#48297)
-						if [[ "${file%.la}" != "${file}" ]]; then
-							sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/}
-						else
-							ln -s ${file}
-						fi
-					done
-				popd &> /dev/null
-			fi
-
-			# Setup the includes
-			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
-					[[ -f "${file}" ]] && rm -f ${file}
-
-					# 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 ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
-						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
-
-			# Setup the $LDPATH
-			ldpath="${ldpath:+${ldpath}:}${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib"
-
-		done
-
-		echo "LDPATH=\"${ldpath}\"" > ${ENV_D}
-		echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D}
-
-		env-update
-
-	eend 0
-}
-
-ENV_D="/etc/env.d/03opengl"
-NEW_GL_IMPLEM=""
-ACTION=""
-PREFIX="/usr"
-DST_PREFIX="/usr"
-AVAIL_IMPLEMS=$(get_implementations)
-CURRENT_GL_IMPLEM=$(get_current_implem)
-
-check_user
-parse_options ${@}
-
-case ${ACTION} in
-	get-implementation)
-		if [[ -n "${CURRENT_GL_IMPLEM}" ]]; then
-			echo ${CURRENT_GL_IMPLEM}
-			exit 0
-		else
-			exit 2
-		fi
-	;;
-	set-implementation)
-		if [[ -n "${NEW_GL_IMPLEM}" ]]; then
-			set-new-implementation ${NEW_GL_IMPLEM}
-			exit $?
-		else
-			usage
-			exit 1
-		fi
-	;;
-	nothing)
-		exit 0
-	;;
-	usage)
-		usage
-		exit 0
-	;;
-	error)
-		usage
-		exit 1
-	;;
-	*)
-		usage
-		exit 1
-	;;
-esac
diff --git a/x11-base/opengl-update/files/opengl-update-2.1.1 b/x11-base/opengl-update/files/opengl-update-2.1.1
index 129aa6b9168b..e18458af884a 100644
--- a/x11-base/opengl-update/files/opengl-update-2.1.1
+++ b/x11-base/opengl-update/files/opengl-update-2.1.1
@@ -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.1,v 1.2 2005/02/10 01:37:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.1.1,v 1.3 2005/02/10 06:45:38 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>
@@ -275,13 +275,13 @@ set-new-implementation() {
 					# then it should be installed to ${GL_IMPLEM}/include
 
 					if [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
-						[[ -f "${file}" ]] && rm -f ${file}
+						[[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
 						ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
 					elif [[ -e ${PREFIX}/${LIBDIR}/opengl/global/include/${file} ]]; then
-						[[ -f "${file}" ]] && rm -f ${file}
+						[[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
 						ln -s ${PREFIX}/${LIBDIR}/opengl/global/include/${file}
 					elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then
-						[[ -f "${file}" ]] && rm -f ${file}
+						[[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
 						ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file}
 					fi
 				done
diff --git a/x11-base/opengl-update/opengl-update-2.1.0-r1.ebuild b/x11-base/opengl-update/opengl-update-2.1.1.ebuild
index 0254476a2962..d428beb0805f 100644
--- a/x11-base/opengl-update/opengl-update-2.1.0-r1.ebuild
+++ b/x11-base/opengl-update/opengl-update-2.1.1.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.0-r1.ebuild,v 1.1 2005/02/09 11:43:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-2.1.1.ebuild,v 1.1 2005/02/10 06:45:38 eradicator Exp $
 
 inherit multilib toolchain-funcs