3 files changed, 107 insertions, 2 deletions
diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog
index b4107b309947..f9c3e1034170 100644
--- a/games-emulation/hatari/ChangeLog
+++ b/games-emulation/hatari/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-emulation/hatari
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.39 2012/08/08 19:46:35 ranger Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.40 2013/06/13 10:37:26 hasufell Exp $
+
+*hatari-1.6.1-r1 (13 Jun 2013)
+
+  13 Jun 2013; Julian Ospald <hasufell@gentoo.org> +hatari-1.6.1-r1.ebuild,
+  +files/hatari-1.6.1-gentoo-docdir.patch:
+  use python-single-r1, add dev-python/pygtk dep, fix hatariui and docdir path
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> hatari-1.6.1.ebuild:
   Marking hatari-1.6.1 ppc for bug 411773
diff --git a/games-emulation/hatari/files/hatari-1.6.1-gentoo-docdir.patch b/games-emulation/hatari/files/hatari-1.6.1-gentoo-docdir.patch
new file mode 100644
index 000000000000..715fb189143f
--- /dev/null
+++ b/games-emulation/hatari/files/hatari-1.6.1-gentoo-docdir.patch
@@ -0,0 +1,13 @@
+--- hatari-1.6.1/python-ui/uihelpers.py
++++ hatari-1.6.1/python-ui/uihelpers.py
+@@ -97,9 +97,7 @@
+         # first try whether there are local Hatari docs in standard place
+         # for this Hatari/UI version
+         sep = os.sep
+-        path = self.get_binary_path("hatari")
+-        path = sep.join(path.split(sep)[:-2]) # remove "bin/hatari"
+-        path = path + sep + "share" + sep + "doc" + sep + "hatari" + sep
++        path = "@DOCDIR@"
+         if os.path.exists(path + "manual.html"):
+             return path
+         # if not, point to latest Hatari HG version docs
diff --git a/games-emulation/hatari/hatari-1.6.1-r1.ebuild b/games-emulation/hatari/hatari-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..76309c74b4ca
--- /dev/null
+++ b/games-emulation/hatari/hatari-1.6.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.6.1-r1.ebuild,v 1.1 2013/06/13 10:37:26 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+inherit eutils toolchain-funcs cmake-utils python-single-r1 games
+
+DESCRIPTION="Atari ST emulator"
+HOMEPAGE="http://hatari.berlios.de/"
+SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-libs/libsdl[X,audio,video]
+	sys-libs/readline
+	media-libs/libpng
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	games-emulation/emutos"
+
+pkg_setup() {
+	games_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-gentoo-docdir.patch
+	# build with newer zlib (bug #387829)
+	sed -i -e '1i#define OF(x) x' src/includes/unzip.h || die
+	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
+	sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
+	sed -i \
+		-e "s%conf=.*$%conf=\"${GAMES_SYSCONFDIR}\"%" \
+		-e "s%path=.*$%path=\"${GAMES_DATADIR}/${PN}/hatariui\"%" \
+		python-ui/hatariui || die
+	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
+	rm -f doc/CMakeLists.txt
+}
+
+src_configure() {
+	mycmakeargs=(
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DCMAKE_BUILD_TYPE:STRING=Release"
+		"-DDATADIR=${GAMES_DATADIR}/${PN}"
+		"-DBIN2DATADIR=${GAMES_DATADIR}/${PN}"
+		"-DBINDIR=${GAMES_BINDIR}"
+		"-DICONDIR=/usr/share/pixmaps"
+		"-DDESKTOPDIR=/usr/share/applications"
+		"-DMANDIR=/usr/share/man/man1"
+		"-DDOCDIR=/usr/share/doc/${PF}"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	DOCS="readme.txt doc/*.txt" cmake-utils_src_install
+	dohtml -r doc/
+	python_fix_shebang "${ED%/}"/usr/share/games/hatari/{hatariui,hconsole}/*.py
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,"
+	elog "has been installed in $(games_get_libdir) with a .img extension (there"
+	elog "are several from which to choose)."
+	elog
+	elog "Another option is to go to http://www.atari.st/ and get a real TOS:"
+	elog "  http://www.atari.st/"
+	elog
+	elog "The first time you run hatari, you should configure it to find the"
+	elog "TOS you prefer to use.  Be sure to save your settings."
+	echo
+}