2 files changed, 20 insertions, 1 deletions
diff --git a/games-simulation/dwarffortress/dwarffortress-40.06.ebuild b/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
index 9a26b89..b1657dc 100644
--- a/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
+++ b/games-simulation/dwarffortress/dwarffortress-40.06.ebuild
@@ -47,6 +47,8 @@ DEPEND=""
 
 MY_PREFIX=${GAMES_PREFIX_OPT}/${P}
 DF_DIR='${HOME}'/.${P}
+#df_LIBPATH=$(games_get_libdir)/${P}
+df_LIBPATH=${GAMES_PREFIX}/lib32/${P}
 
 QA_PREBUILT="${MY_PREFIX#/}/libs/*"
 
@@ -59,6 +61,8 @@ src_prepare() {
 	cp "${FILESDIR}"/dwarffortress.sh "${T}"/${P}
 	sed -e "s:@@DF_DIR@@:${DF_DIR}:" \
 		-e "s:@@DATA_PREFIX@@:${MY_PREFIX}:" \
+		-e "s:@@LIBPATH@@:${df_LIBPATH}:" \
+		-e '/SET_LIBPATH/s/false/true/' \
 		-i "${T}"/${P} || die
 	use system-libgraphics || sed \
 		-e '/PRELOAD_LIBZ/s/false/true/' \
diff --git a/games-simulation/dwarffortress/files/dwarffortress.sh b/games-simulation/dwarffortress/files/dwarffortress.sh
index 334e377..059d72b 100644
--- a/games-simulation/dwarffortress/files/dwarffortress.sh
+++ b/games-simulation/dwarffortress/files/dwarffortress.sh
@@ -41,6 +41,7 @@ fi
 
 DF_DIR="@@DF_DIR@@"
 DATA_PREFIX="@@DATA_PREFIX@@"
+LIBPATH="@@LIBPATH@@"
 
 if ! [ -d "${DF_DIR}" ]; then
 	echo "Creating ${DF_DIR} ..."
@@ -84,9 +85,23 @@ fi
 
 # 40.03: There seems to be an issue with prebuilt libgraphics
 if false; then # PRELOAD_LIBZ
-	LD_PRELOAD=${LD_PRELOAD}:/lib32/libz.so.1
+	if [ "${LD_LIBRARY_PATH+set}" = "set" ] ; then
+		LD_PRELOAD=${LD_PRELOAD}:/lib32/libz.so.1
+	else
+		LD_PRELOAD=/lib32/libz.so.1
+	fi
 	export LD_PRELOAD
 fi
 
+# Used for system-libgraphics and dfhack
+if false; then # SET_LIBPATH
+	if [ "${LD_LIBRARY_PATH+set}" = "set" ] ; then
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${LIBPATH}
+	else
+		LD_LIBRARY_PATH=${LIBPATH}
+	fi
+	export LD_LIBRARY_PATH
+fi
+
 cd "${DF_DIR}"
 exec "${DATA_PREFIX}"/libs/Dwarf_Fortress ${DFOPTS}