version bump (bug #407891)

(Portage version: 2.1.10.44/cvs/Linux i686)

4 files changed, 14 insertions, 80 deletions

diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog
index f6bc2b4e9d50..af16b43316a6 100644
--- a/games-emulation/hatari/ChangeLog
+++ b/games-emulation/hatari/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2012/01/10 20:37:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.34 2012/03/12 18:55:58 mr_bones_ Exp $
+
+*hatari-1.6.1 (12 Mar 2012)
+
+  12 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> -hatari-1.3.1.ebuild,
+  -hatari-1.4.0.ebuild, -files/hatari-1.4.0-gentoo.patch, +hatari-1.6.1.ebuild,
+  +files/hatari-1.6.1-gentoo.patch:
+  version bump (bug #407891)
 
   10 Jan 2012; Brent Baude <ranger@gentoo.org> hatari-1.5.0.ebuild:
   Marking hatari-1.5.0 ppc for bug 380177
diff --git a/games-emulation/hatari/files/hatari-1.4.0-gentoo.patch b/games-emulation/hatari/files/hatari-1.6.1-gentoo.patch
index 77aaddd9914c..4f10d6d9e3ce 100644
--- a/games-emulation/hatari/files/hatari-1.4.0-gentoo.patch
+++ b/games-emulation/hatari/files/hatari-1.6.1-gentoo.patch
@@ -1,23 +1,3 @@
---- hatari-1.4.0.orig/Makefile-MinGW.cnf
-+++ hatari-1.4.0/Makefile-MinGW.cnf
-@@ -24,7 +24,6 @@
- SYS_WINDOWS = 1
- 
- # Set the C compiler (e.g. gcc)
--CC = $(MINGW_PREFIX)gcc
- 
- # What warnings to use
- WARNFLAGS = -Wmissing-prototypes -Wstrict-prototypes -Wsign-compare \
---- hatari-1.4.0.orig/Makefile-default.cnf
-+++ hatari-1.4.0/Makefile-default.cnf
-@@ -14,7 +14,6 @@
- #	make CC=my-cc
- 
- # Set the C compiler (e.g. gcc)
--CC = gcc
- 
- OPTFLAGS = -O2
- 
 --- hatari-1.4.0.orig/src/paths.c
 +++ hatari-1.4.0/src/paths.c
 @@ -109,71 +109,6 @@
diff --git a/games-emulation/hatari/hatari-1.3.1.ebuild b/games-emulation/hatari/hatari-1.3.1.ebuild
deleted file mode 100644
index 87edb24f491e..000000000000
--- a/games-emulation/hatari/hatari-1.3.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.3.1.ebuild,v 1.3 2010/01/22 20:06:17 ranger Exp $
-
-EAPI=2
-inherit games
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.berlios.de/"
-SRC_URI="mirror://berlios/hatari/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[X,audio,video]
-	sys-libs/readline
-	media-libs/libpng
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	games-emulation/emutos"
-
-src_compile() {
-	# broken deps in the makefiles - bug #164068
-	emake -C src/uae-cpu gencpu || die "emake failed"
-	emake -C src/uae-cpu all || die "emake failed"
-	emake -C src || die "emake failed"
-}
-
-src_install() {
-	dogamesbin "${S}/src/hatari" || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins src/gui-sdl/font5x8.bmp src/gui-sdl/font10x16.bmp \
-		|| die "doins failed"
-	dodoc readme.txt doc/*.txt
-	dohtml -r doc/
-	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
-}
diff --git a/games-emulation/hatari/hatari-1.4.0.ebuild b/games-emulation/hatari/hatari-1.6.1.ebuild
index 96479ac3456e..9e01722b3237 100644
--- a/games-emulation/hatari/hatari-1.4.0.ebuild
+++ b/games-emulation/hatari/hatari-1.6.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.4.0.ebuild,v 1.1 2011/06/07 20:29:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.6.1.ebuild,v 1.1 2012/03/12 18:55:58 mr_bones_ Exp $
 
 EAPI=2
 inherit toolchain-funcs cmake-utils games
 
 DESCRIPTION="Atari ST emulator"
 HOMEPAGE="http://hatari.berlios.de/"
-SRC_URI="mirror://berlios/hatari/${P}.tar.bz2"
+SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,6 +25,9 @@ RDEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gentoo.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
 	rm -f doc/CMakeLists.txt
 }