dwarf-fortress-43_03 - bump

Bump to EAPI 6, drop deprecated games.eclass, adjust/correct dependencies,
make $PN usage for filenames more consistent.  Add missing source file to
Makefile.

4 files changed, 95 insertions, 2 deletions

diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index e842aac..96855c3 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,2 +1,3 @@
 DIST df_40_24_linux.tar.bz2 12921246 SHA256 da37c6263a679123e6ac57fe0dd6def11f1d61efee3c5913de09495c88ce9234 SHA512 2242e471b7dbc996e819e2f74b2bbfda30a9a301755bc025ddcccdffdd3afe2e48bbedca31a332283ef829d023069398e57d6a87e26c582ddbce4a67ff7fd755 WHIRLPOOL 03cb652a2564d2b0c809be8252f7754d893f69ac1b95124ea108ed0fde9ac742c498d9e369339775695861e430a2ded0741b018f85551d48731730f98303dc69
 DIST df_42_06_linux.tar.bz2 13857747 SHA256 03df8e73bf81e4f7bec9e789a83f8bd20b0b968d73131e4051e005db13fec99f SHA512 dfeb1406dcbd74091170eee4392c8eb876516d723b17e8aa291cab5b670be9fca4e22122788656e37afc03cd0e827e42b8cd27bc148d32639ebb7b8b7fa2bbf4 WHIRLPOOL d8fd93e9d90b4bee942c9a3751d1d03180157e4ecf406cf1cf31441946588990b2385a0b8d376f2a5386d7514d28b7ba5a6fbd2879e3a1e87124d902759909c3
+DIST df_43_03_linux.tar.bz2 13970214 SHA256 8725cb00188b4282fd5a3c4be10c3255f837b951ca48af90fa3a351e3a818337 SHA512 3315f8022485200fbe860c9ac72e481274951a368ab3aa2becf597a6be73a7e26779e7ab5ae318af7fac411b0d60472fc6387a1a6f0640bf21ee1dc00fe4eb80 WHIRLPOOL fded49bcaddf449ec7d9cb9895e45cbc059ceb448884915231e9eb2be213f505a6649388b5f9689896881525c363f51886621f117cd01cb42bb63412f94149ea
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.03.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.03.ebuild
new file mode 100644
index 0000000..058384f
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.03.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multilib versionator
+
+MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
+MY_PN=df
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="A single-player fantasy game"
+HOMEPAGE="http://www.bay12games.com/dwarves"
+SRC_URI="http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2"
+
+LICENSE="free-noncomm BSD BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE="debug"
+
+RDEPEND="media-libs/glew[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),joystick,video]
+	media-libs/sdl-image[abi_x86_32(-),png]
+	media-libs/sdl-ttf[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	virtual/glu[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]"
+# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
+# dlopens them at runtime if requested.
+DEPEND="${RDEPEND}
+	media-libs/libsndfile[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
+	sys-libs/ncurses[abi_x86_32(-),unicode]
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}_linux
+
+gamesdir="/opt/${PN}"
+QA_PRESTRIPPED="${gamesdir}/libs/Dwarf_Fortress"
+RESTRICT="strip"
+
+pkg_setup() {
+	multilib_toolchain_setup x86
+}
+
+src_prepare() {
+	rm -f libs/*.so* || die
+	cp "${FILESDIR}"/{dwarf-fortress,Makefile} . || die
+	default
+
+	# Fix build with gcc-5.4
+	sed -e '1i#include <math.h>\' \
+		-i g_src/ttf_manager.cpp || die
+}
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
+}
+
+src_compile() {
+	default
+	sed -i -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" dwarf-fortress || die
+}
+
+src_install() {
+	# install data-files and libs
+	insinto "${gamesdir}"
+	doins -r raw data libs
+
+	# install our wrapper
+	dobin dwarf-fortress
+
+	# install docs
+	dodoc README.linux *.txt
+
+	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
+}
+
+pkg_postinst() {
+	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
+	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
+	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
+	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
+	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
+	elog
+	elog "Optional runtime dependencies:"
+	elog "Install sys-libs/ncurses[$(use amd64 && echo "abi_x86_32,")unicode] for [PRINT_MODE:TEXT]"
+	elog "Install media-libs/openal$(use amd64 && echo "[abi_x86_32]") and media-libs/libsndfile$(use amd64 && echo "[abi_x86_32]") for audio output"
+	elog "Install media-libs/libsdl[$(use amd64 && echo "abi_x86_32,")opengl] for the OpenGL PRINT_MODE settings"
+}
diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile
index 66e6401..548027b 100644
--- a/games-roguelike/dwarf-fortress/files/Makefile
+++ b/games-roguelike/dwarf-fortress/files/Makefile
@@ -11,7 +11,7 @@ SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
 	g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \
 	g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \
 	g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \
-	g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp
+	g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp g_src/ViewBase.cpp
 OBJS := $(SRCS:.cpp=.o)
 
 BLIBS := ncursesw openal sndfile
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress b/games-roguelike/dwarf-fortress/files/dwarf-fortress
index 8594e0b..23b9c34 100644
--- a/games-roguelike/dwarf-fortress/files/dwarf-fortress
+++ b/games-roguelike/dwarf-fortress/files/dwarf-fortress
@@ -10,7 +10,7 @@ do_install() {
 	cp -rsn "$gamesdir"/* "$install"/
 }
 
-if [[ -d "$install" ]]; then
+if [ -d "$install" ]; then
 	# delete dangling symlinks
 	find -L "$install/" -type l -delete
 	# ignore "are the same file" errors