diff options
| author |   eroen <eroen@occam.eroen.eu> | 2016-07-29 16:44:17 +0200 |
|---|---|---|
| committer | eroen <eroen@occam.eroen.eu> | 2016-07-29 16:44:17 +0200 |
| commit | b466de2bfbd1468748c520d62abfc73f5f81eb11 (patch) | |
| tree | 255389d5116dc51b0eb98313be258f6e6af0563b | |
| parent | dfhack-0.43.05_pre20160726 - snapshot (diff) | |
| download | eroen-b466de2bfbd1468748c520d62abfc73f5f81eb11.tar.gz eroen-b466de2bfbd1468748c520d62abfc73f5f81eb11.tar.bz2 eroen-b466de2bfbd1468748c520d62abfc73f5f81eb11.zip | |
dfhack-0.43.05_pre20160726 - fixes
| -rw-r--r-- | games-util/dfhack/dfhack-0.43.05_pre20160726.ebuild | 6 | ||||
| -rw-r--r-- | games-util/dfhack/files/dfhack | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/games-util/dfhack/dfhack-0.43.05_pre20160726.ebuild b/games-util/dfhack/dfhack-0.43.05_pre20160726.ebuild index 44f3c0f..c4975d4 100644 --- a/games-util/dfhack/dfhack-0.43.05_pre20160726.ebuild +++ b/games-util/dfhack/dfhack-0.43.05_pre20160726.ebuild @@ -23,7 +23,7 @@ else xml_EGIT_COMMIT="95f0627d9f2fe9179865a1eaebf348ea6afcbc27" fi -# KEYWORDS="-* ~amd64" # ~x86 +KEYWORDS="-* ~amd64" # ~x86 CMAKE_MIN_VERSION=2.8.0 CMAKE_REMOVE_MODULES_LIST="FindCurses FindDoxygen CMakeVS10FindMake" @@ -48,6 +48,8 @@ RDEPEND="${LIBRARY_DEPEND} PATCHES=( "$FILESDIR"/dfhack-$PV ) +QA_PREBUILT="opt/dfhack/hack/libruby.so" + pkg_setup() { multilib_toolchain_setup x86 } @@ -62,7 +64,7 @@ src_unpack() { src_prepare() { default - local install="\${HOME}/.dwarf-fortress-${PV}_${MULTILIB_ABI_FLAG}" exe="./libs_abi_x86_32/Dwarf_Fortress" + local install="\${HOME}/.dwarf-fortress-${df_PV}_dfhack" exe="./libs_abi_x86_32/Dwarf_Fortress" sed -e "s:^install=.*:install=${install}:" \ -e "s:^exe=.*:exe=\"${exe}\":" \ "$FILESDIR"/dfhack > "$T"/dfhack || die diff --git a/games-util/dfhack/files/dfhack b/games-util/dfhack/files/dfhack index e55671f..7456f5d 100644 --- a/games-util/dfhack/files/dfhack +++ b/games-util/dfhack/files/dfhack @@ -23,9 +23,11 @@ if [ -d "$install" ]; then find -L "$install/" -type l -delete # ignore "are the same file" errors do_install 2>/dev/null + do_dfhack_install 2>/dev/null else mkdir "$install" || exit do_install || exit + do_dfhack_install || exit fi cd "$install" || exit |