dfhack - zlib has multilib now

4 files changed, 78 insertions, 5 deletions

diff --git a/games-util/dfhack/Manifest b/games-util/dfhack/Manifest
index 10a8574..edb36b5 100644
--- a/games-util/dfhack/Manifest
+++ b/games-util/dfhack/Manifest
@@ -51,6 +51,7 @@ AUX stonesense/0002-compile-time-configuration-of-magic-cwd.patch 7753 SHA256 79
 AUX stonesense/0003-screenshots-in-home-dir.patch 2578 SHA256 88bc1a28442dfe8e5ff08e27e82de6443a3c5bccf49d7bcb2a26637a71ae3e18 SHA512 988efaba82e96149641e8dd6d8769b3ac1d890ebaa35128507a8f0d633af947ad9d8090758e1734a2f9b118c5404e4d712e2abb9a4e971f980f4163c0b646f5b WHIRLPOOL f3f03c297fbd39f27b5957cca0073a3420a10ba0a1741cf73f210cf680c2083c761cb68a637663281e69d1fee9e7b5049c3074f18fed394f48888bc377f5bb70
 AUX stonesense/0004-create-various-output-files-in-HOME-not-cwd.patch 5217 SHA256 3ac09c948cc36b04058a82cb9f04e0ff26ffee765bf2300a46eac09cebc867de SHA512 9f0c2c5f4a2d15c99e06d30e1d3825527449f63de4d370533f07ce4324d0afbd1a2190dcf9589cbd326fd0f9705333bb436bed74e72ac4a7485f002fa3600639 WHIRLPOOL cbe81a086301a3dc218f31e3b1edb837bd81a25d151e5d46c0988d080165e95faac8ab14a97995a7092262542cbb8b29a2a540fe45a5c74b520e47ec5ab0f420
 EBUILD dfhack-0.34.11.2.ebuild 5523 SHA256 c126fc718aaddcfd1f62c04a5ce37add8c6ecfb72e0fa73d8048383e02d048f0 SHA512 ab671faa41ab7cff26b933ef816fba8f5c86389769f5dcf1da6a5ee7413324d50ebcd7e60812935fd0ddd70688461ca23d55edf499ffffec89e3ff3ad321c2e8 WHIRLPOOL 11246c870f497929299ccf75c91f77481a6d3faccc9a8646c668836b22906d089e04826b3f67f5dcc8640b918a9e3a0e1fa9821d7d17664ec58f8a88db498170
-EBUILD dfhack-0.34.11.3_p20130302.ebuild 8562 SHA256 6fbe01497156fbc370cd670d4b69003788430fe37e2ecfd80a9f0f6fea1444a1 SHA512 a4de96200bb4a5dda7cac98fe82cf038e5c36a2e4c65f2f19b893483f80864d343f72a484746bbb8ffe79adf2dd0ce08a43df80dc693e115651169fb48fc1b19 WHIRLPOOL 6d3c12daa228bb4fe6a0b4bb25366c2be4f5e950e1d5e63ca2f0bb889cfeb13a68921b14350283c5432a31435d33b53bc7e6f146e32493cf2ac97a19d7c43440
-EBUILD dfhack-9999.ebuild 8511 SHA256 df36a4d5b563b9477f7bf058652a0304cae99a3dd0940855b96136bf90b2e595 SHA512 b73c84664dd1a2f30b950eb061bea811b9368ef087e6907f067e444db8a66f77d8684aac5053ba472673761b949c394f274f95fedf6b34e12948f65de1c9acb3 WHIRLPOOL bdef3f0f92b7564eca460ab717ece45df9778b266a4a3c67d4913632c7740bdbe699718b32d7f712ffd40642078a63ee5cd99b06431fdf9bccf3b835b050aae6
+EBUILD dfhack-0.34.11.3_p20130302.ebuild 8590 SHA256 e874107fcec7c0ae16b3eb4ac63f251948027a289c3e31f2bcaf44c74b068dce SHA512 62c5792079dfb4d7f6e3a69fd9e215620748f1fabaf75a0632bf82ab12c1d1e3634e217a5b808cd7e82161ba703d6e06bfde96fa332b7e90d110ab0203f04bb5 WHIRLPOOL c0f2d8f58d2feb107f3772e68f742b4accecd516aa4e7594734cd5c32dec6383682d24312051035b1a6fa37042381516e9a3231a810930081368ddd54b28af09
+EBUILD dfhack-9999.ebuild 8498 SHA256 adfc7edc5173777b877f8aac8244b129d9b2864a7b08096985dfbfab7c9fd1a6 SHA512 ecb6e57b999a77d91967bfcc5688856d2ff90d067ab1d0afe2ded515e371b20dfbb806050d3273382b2b78d26386eb3fe5dcc5d8249b8ef5f454aacc28502715 WHIRLPOOL 8bf6497db4de25a61a333d3af1b16be470c3709bf8bde1f6d6e26e572bdfe25686785b74ac0cd998692fee1c7f7d08dd23f4403ccbfb4730b6dab8d9a3ad619e
 MISC metadata.xml 721 SHA256 92c6cfa56d7afc563cd87101664f1200e50d02fedd5a7a3d19b8a549f042e8bc SHA512 009c4d722c0515a03323e711440db763bb47697719017d0ea8aa2da396739e55a125fcebdd94a1103f48ddf79735523e39ca9edfba77d67ed77c735a62e83a1f WHIRLPOOL ca03b60ff2b56d2bffabfdd8c26f980e5fe6ee70fb50cf13399c1fed55f3a6e7ae28ec7b4290df41f6ae27473b8ef561fe2c82597ef4aca771893a7664786bbb
+MISC todo.txt 2592 SHA256 3653d4111e53ff212fa8ff2a6a9d30a8698008485defeb1c2cb4b02d5155ab52 SHA512 422bff731050f868a721547a430df896dcb5fbbba4b1552261fbbdc31643ea0faa58ba7f69d30409b3f33d9c3a12e268d39f46caa6196e1fbc9acaaa6176e740 WHIRLPOOL 86716dd744146fca20422d7d3906a4f4ff15a92f6bf935bfeeb6d397fc8a6ac3aa000054981f8d8f46bc23e1bb40a6ed136c03cfbbeda9ff0d316bcba813689f
diff --git a/games-util/dfhack/dfhack-0.34.11.3_p20130302.ebuild b/games-util/dfhack/dfhack-0.34.11.3_p20130302.ebuild
index d3d5c72..0a11cbe 100644
--- a/games-util/dfhack/dfhack-0.34.11.3_p20130302.ebuild
+++ b/games-util/dfhack/dfhack-0.34.11.3_p20130302.ebuild
@@ -43,8 +43,9 @@ HDEPEND="
 	dev-perl/XML-LibXSLT
 	doc? ( app-doc/doxygen )"
 LIBRARY_DEPEND="
-	app-emulation/emul-linux-x86-baselibs[development]
+	sys-libs/zlib[abi_x86_32]
 	ssense? ( media-libs/fontconfig[abi_x86_32]
+		app-emulation/emul-linux-x86-baselibs[development]
 		media-libs/freetype[abi_x86_32]
 		x11-libs/libICE[abi_x86_32]
 		x11-libs/libSM[abi_x86_32]
diff --git a/games-util/dfhack/dfhack-9999.ebuild b/games-util/dfhack/dfhack-9999.ebuild
index e42f4b4..3388e33 100644
--- a/games-util/dfhack/dfhack-9999.ebuild
+++ b/games-util/dfhack/dfhack-9999.ebuild
@@ -43,8 +43,9 @@ HDEPEND="
 	dev-perl/XML-LibXSLT
 	doc? ( app-doc/doxygen )"
 LIBRARY_DEPEND="
-	app-emulation/emul-linux-x86-baselibs[development]
+	sys-libs/zlib[abi_x86_32]
 	ssense? ( media-libs/fontconfig[abi_x86_32]
+		app-emulation/emul-linux-x86-baselibs[development]
 		media-libs/freetype[abi_x86_32]
 		x11-libs/libICE[abi_x86_32]
 		x11-libs/libSM[abi_x86_32]
@@ -63,7 +64,6 @@ RDEPEND="${LIBRARY_DEPEND}
 ## missing multilib
 #dev-lang/lua - binary bundled
 #dev-libs/protobuf - bundled
-#   sys-libs/zlib (libz.so.1) - baselibs
 ## ssense
 #allegro - binary bundled
 #	dev-libs/atk (libatk-1.0.so.0) - gtklibs
diff --git a/games-util/dfhack/todo.txt b/games-util/dfhack/todo.txt
new file mode 100644
index 0000000..5151a43
--- /dev/null
+++ b/games-util/dfhack/todo.txt
@@ -0,0 +1,71 @@
+	# Fix up the startup scripts
+	sed -f - -i "package/linux/dfhack" "package/linux/dfhack-run" <<- EOF || die
+		s%"\./stonesense/deplibs"%"${datadir}/stonesense/deplibs"%
+		s%"\./hack"%"${dfhack_libdir}"%
+		s%\./hack/libdfhack.so%"${dfhack_libdir}/libdfhack.so"%
+		s%\./libs/Dwarf_Fortress%"df-34.11"%
+		s%hack/dfhack-run%"${dfhack_libdir}/dfhack-run"%
+		EOF
+
+	sed -i "s:\./hack/ruby/:${GAMES_DATADIR}/${P}/ruby/:" \
+		"./plugins/ruby/ruby.rb" || die
+	if use dfusion; then
+	sed -f - -i plugins/Dfusion/luafiles/{init.lua,friendship/{init.lua,plugin.lua,install.lua},triggers/{plugin.lua,functions_menu.lua},friendship_civ/init.lua,common.lua,embark/{init.lua,plugin.lua},migrants/{init.lua,plugin.lua},xml_struct.lua,xml_types.lua} <<- EOF || die
+		s:("dfusion/:("${datadir}/dfusion/:
+		s:('dfusion/:('${datadir}/dfusion/:
+		EOF
+		sed -i "s:libs/Dwarf_Fortress:Dwarf_Fortress:" plugins/Dfusion/luafiles/common.lua
+	fi
+
+	if use egg; then
+	sed -f - -i ./library/Hooks-egg.cpp <<- EOF || die
+		s/SDL_Event\* event/SDL::Event\* event/
+		EOF
+	fi
+
+# Issues
+ - /plugins/df2mc/source/df2minecraft.cpp # Also abandoned
+ - dfusion is strange. It's always been that, though.
+ - prebuilt ruby
+ - prebuilt allegro for stonesense.
+ - ssense fails when reloaded, does not in old setup. Well, sometimes it
+ does. I don't know anymore. I'll ignore it for now.
+ - Have cmake do something with the scripts so we can stop seding
+ - stonesense conf file: /usr/share/games/dfhack-9999/stonesense/init.txt
+ Set in ./Config.cpp, installed together with the rest of the directory.
+ - - Current symlink works well, editing the source would work better.
+ - egg
+
+# Ssense functions that fopen filenames:
+ - DumpMaterialNamesToDisk - No users
+ - DumpItemNamesToDisk - 1 user, called on start
+ - DumpPrefessionNamesToDisk - No users
+
+    $ find . -type f -cmin -20 | xargs ls -l 
+    -rw-r--r-- 1 eroen users      11 Oct 21 06:40 ./df_linux/dfhack.history
+    # -rw-r--r-- 1 eroen users 7805320 Oct 21 06:38 ./df_linux/gamelog.txt #
+    # -rw-r--r-- 1 eroen users    1436 Oct 21 06:40 ./df_linux/itemdump.txt #
+    -rw-r--r-- 1 eroen users    1826 Oct 21 06:40 ./df_linux/stderr.log
+    -rw-r--r-- 1 eroen users   14922 Oct 21 06:40 ./df_linux/stdout.log
+    # -rw-r--r-- 1 eroen users    1044 Oct 21 06:40 ./df_linux/Stonesense.log #
+
+
+
+2013-05
+paths:
+- hack
+
+library/Core.cpp - getHackPath
+    library/Process*.cpp - getPath
+    -    not sure if state or resource.
+
+- ./
+./plugins/zone.cpp
+
+library/Core.cpp:
+core->loadScriptFile(con, "dfhack.init", true);
+
+#later:
+ssense
+isoworld
+./plugins/df2mc/source/df2minecraft.cpp