[gentoo-commits] eselect r707 - trunk/extern/modules

[gentoo-commits] eselect r707 - trunk/extern/modules

[Tomas Chvatal (scarabeus)]

Author: scarabeus
Date: 2009-11-06 21:36:40 +0000 (Fri, 06 Nov 2009)
New Revision: 707

Modified:
   trunk/extern/modules/opengl.eselect
Log:
Prepare for 1.1.0 release.

Modified: trunk/extern/modules/opengl.eselect
===================================================================
--- trunk/extern/modules/opengl.eselect	2009-11-06 17:15:08 UTC (rev 706)
+++ trunk/extern/modules/opengl.eselect	2009-11-06 21:36:40 UTC (rev 707)
@@ -16,7 +16,7 @@
 MAINTAINER="x11@gentoo.org"
 SVN_DATE='$Date$'
 VERSION=$(svn_date_to_version "${SVN_DATE}" )
-EBUILD_VERSION="1.0.9"
+EBUILD_VERSION="1.1.0"
 
 # Our data
 ENV_FILE="${ROOT}/etc/env.d/03opengl"
@@ -132,6 +132,9 @@
 set_new_implementation() {
 	local gl_implem=${1}
 	local avail_implems=$(get_implementations)
+	local libdir
+	local gl_local
+	local moduledir
 
 	# Set a sane umask... bug #83115
 	umask 022
@@ -145,40 +148,52 @@
 			rm -f "${ENV_FILE}" || die -q "Failed to remove ${ENV_FILE}"
 		fi
 
-		local libdir
 		for libdir in $(list_libdirs); do
+			# Set libdir correctly to EROOT
 			[[ ${ROOT} != / ]] && libdir=${libdir//${ROOT}}
 
-			# First make sure we have an opengl directory and this is a real lib dir, not a symlink
+			# First make sure we have an opengl directory and this
+			# is a real lib dir, not a symlink
 			[[ -d ${PREFIX}/${libdir}/opengl && ! -h ${PREFIX}/${libdir} ]] || continue
 
-			# Fallback on xorg-x11 if we don't have this implementation for this libdir.
-			local gl_local
-			if [[ ! -d ${PREFIX}/${libdir}/opengl/"${gl_implem}" ]] ; then
+			# Set moduledir
+			# only xorg module is used now can change to case when we add other
+			# implementations.
+			moduledir="xorg/modules"
+
+			# Check if opengl implementation directory exists and
+			# use xorg-x11 as fallback (mesa)
+			# FIXME: this can be wrong because users can have implementation
+			# but don't need to have mesa installed
+			if [[ -d ${PREFIX}/${libdir}/opengl/"${gl_implem}" ]] ; then
+				gl_local="${gl_implem}"
+			else
 				gl_local="xorg-x11"
-			else
-				gl_local="${gl_implem}"
 			fi
 
-			setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib" "${DST_PREFIX}/${libdir}"
+			setup_lib_symlinks \
+				"${PREFIX}/${libdir}/opengl/${gl_local}/lib" \
+				"${DST_PREFIX}/${libdir}"
 
-			if [[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls ]] ; then
-				setup_lib_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls" "${DST_PREFIX}/${libdir}/tls"
-			fi
+			# check if the implementation has TLS libs around
+			# and install those if around
+			[[ -e ${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls ]] && \
+				setup_lib_symlinks \
+					"${PREFIX}/${libdir}/opengl/${gl_local}/lib/tls" \
+					"${DST_PREFIX}/${libdir}/tls"
 
-			local moduledir
-			if [[ -e ${DST_PREFIX}/${libdir}/xorg/modules ]] ; then
-				moduledir="xorg/modules"
-			else
-				moduledir="modules"
-			fi
-			setup_extensions_symlinks "${PREFIX}/${libdir}/opengl/${gl_local}/extensions" "${DST_PREFIX}/${libdir}/${moduledir}/extensions"
+			setup_extensions_symlinks \
+				"${PREFIX}/${libdir}/opengl/${gl_local}/extensions" \
+				"${DST_PREFIX}/${libdir}/${moduledir}/extensions"
 
-			setup_includes_symlinks "${DST_PREFIX}/include/GL" "${PREFIX}/${libdir}/opengl/${gl_implem}/include/" "${PREFIX}/${libdir}/opengl/global/include/" "${PREFIX}/${libdir}/opengl/xorg-x11/include/"
+			setup_includes_symlinks \
+				"${DST_PREFIX}/include/GL" \
+				"${PREFIX}/${libdir}/opengl/${gl_implem}/include/" \
+				"${PREFIX}/${libdir}/opengl/global/include/" \
+				"${PREFIX}/${libdir}/opengl/xorg-x11/include/"
 
 			# Setup the $LDPATH
 			ldpath="${ldpath:+${ldpath}:}${PREFIX}/${libdir}/opengl/${gl_local}/lib"
-
 		done
 
 		store_config ${ENV_FILE} LDPATH "${ldpath}"