[gentoo-commits] gentoo-x86 commit in eclass: games.eclass

[Tristan Heaven (nyhm)]

nyhm        08/09/11 16:57:15

  Modified:             games.eclass
  Log:
  fix LDPATH on multilib systems, bug #202032

Revision  Changes    Path
1.127                eclass/games.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games.eclass?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games.eclass?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/games.eclass?r1=1.126&r2=1.127

Index: games.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/games.eclass,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- games.eclass	5 Sep 2008 17:02:43 -0000	1.126
+++ games.eclass	11 Sep 2008 16:57:14 -0000	1.127
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.126 2008/09/05 17:02:43 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.127 2008/09/11 16:57:14 nyhm Exp $
 
 # devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@g.o
 #
@@ -32,7 +32,7 @@
 export GAMES_GROUP=${GAMES_GROUP:-games}
 
 games_get_libdir() {
-	echo ${GAMES_LIBDIR:-${GAMES_PREFIX}/$(get_libdir)}
+	echo ${GAMES_PREFIX}/$(get_libdir)
 }
 
 egamesconf() {
@@ -95,25 +95,16 @@
 }
 
 gamesenv() {
-	# As much as I hate doing this, we need to be a bit more flexibility with
-	# our library directories.
-	local hasit=0 GAMES_LIBDIRS="" GAMES_LIBDIR=$(games_get_libdir)
-	if has_multilib_profile ; then
-		for libdir in $(get_all_libdirs) ; do
-			if [[ ${GAMES_LIBDIR} != ${GAMES_PREFIX}/${libdir} ]] ; then
-				GAMES_LIBDIRS="${GAMES_LIBDIRS}:${GAMES_PREFIX}/${libdir}"
-			else
-				hasit=1
-			fi
-		done
-	fi
-	[[ ${hasit} == "1" ]] \
-		&& GAMES_LIBDIRS=${GAMES_LIBDIRS:1} \
-		|| GAMES_LIBDIRS="${GAMES_LIBDIR}:${GAMES_LIBDIRS}"
+	local d libdirs
+
+	for d in $(get_all_libdirs) ; do
+		libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
+	done
+
 	# Wish we could use doevnd here, but we dont want the env
 	# file to be tracked in the CONTENTS of every game
 	cat <<-EOF > "${ROOT}"/etc/env.d/${GAMES_ENVD}
-	LDPATH="${GAMES_LIBDIRS}"
+	LDPATH="${libdirs:1}"
 	PATH="${GAMES_BINDIR}"
 	EOF
 }