version bump (bug #407891)

Package-Manager: portage-2.1.10.44/cvs/Linux i686

5 files changed, 18 insertions, 86 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/Manifest b/games-emulation/hatari/Manifest
index 8268452a28c9..6a2f0f426f5b 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,10 +1,8 @@
-AUX hatari-1.4.0-gentoo.patch 3624 RMD160 b6620cbe522be2f953fbbd3dafceed9299d53682 SHA1 f1f5bf0ec41983782f2c398d34bc12c24dae524e SHA256 847d7ebbe0d2201ece1323cd22916c1f79560e835016a1dd0213189a2a3843ed
 AUX hatari-1.5.0-gentoo.patch 3174 RMD160 a38055e45a7f5b1488a053841bf146f96384caf4 SHA1 104bbb2cabc8016ffce9e3d49246496c4a10beb5 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc
-DIST hatari-1.3.1.tar.bz2 1045627 RMD160 83a7a8138013be3324cf54e5f0df2efb0ebc40d3 SHA1 d603e1ddea34af9d0c1001f83f3e16081c136ef9 SHA256 ebae927ad99a029f8cd8796463df2113357a7636c2199e00290ad4a35856e0da
-DIST hatari-1.4.0.tar.bz2 1260844 RMD160 a85dda4e4ad5f84b3fe3f77b8f5d3a4bb523a929 SHA1 9fa2ef9fbcbeeefccb6e455eb91679c12f2f37bd SHA256 690e21bd2210a7e86af5d76ccc7f4e608aae37df466d2ead2ac4d105a637bc7b
+AUX hatari-1.6.1-gentoo.patch 3174 RMD160 a38055e45a7f5b1488a053841bf146f96384caf4 SHA1 104bbb2cabc8016ffce9e3d49246496c4a10beb5 SHA256 5f64695305cf1076e795ff8c17a903aa9aed4be02960b9491b637a0a93f8c3bc
 DIST hatari-1.5.0.tar.bz2 1570048 RMD160 2b7b9f7ae5fb54051ddd8be5c87a007a7f8e5a17 SHA1 5028abd9c110d5f9b6bb9ae5b9500e5fd088934e SHA256 0cb9c627ea6942bc60908c3a59b4b5c86a54e5bd0551cd95d8cff76bbde61e7f
-EBUILD hatari-1.3.1.ebuild 1564 RMD160 1f82493d15757733dff80f763a3b8afe28cafeca SHA1 0bab625bb22d88e05b518b73cd278d6986245822 SHA256 f1635d2d1eb0748ea7d5a1d112437a00ae43e6bc8bfb731f277a492d3c8cbd6a
-EBUILD hatari-1.4.0.ebuild 1721 RMD160 313010fc9eb1575f8500a8e264c8ad2f2e070343 SHA1 6669fcb19764744f8c6f0ecd2463b33464749aba SHA256 df56f53c1fdba9f42522432a09f1c1293eec4ce5dab936e47e54dc05abd4d527
+DIST hatari-1.6.1.tar.bz2 1777736 RMD160 51903a2181f8244955efc03b2cb456977a044f98 SHA1 c67051d0a837332ddc10794e4240e7216da0b138 SHA256 f6142b4d0c8f1731f990fcc4cf125d9b7a1822384c46e6af79058a461443e853
 EBUILD hatari-1.5.0.ebuild 1813 RMD160 713ef419b2d7186693b29e299370dc2e832b48da SHA1 0a130e90437240c4c7326a2c78f8257d8fb89381 SHA256 cd42284e0447c4d586c85ae3806d3bbe37abe6118b5a12488a178c66f69fe154
-MISC ChangeLog 4418 RMD160 c73016aa96229eb1a70defae03acc821467cad75 SHA1 e1256243a4ca82e24389e63fb97bd2e726d348c5 SHA256 86a3d3db331232d6c499083369a02a6145269994d84f11feb3b0e7ed1b8f5b6a
+EBUILD hatari-1.6.1.ebuild 1899 RMD160 1095c639e90d75597ff185f9ca02284d46e75d20 SHA1 34052d8b2fe4ccd525a5829e284f6eef6cb47b05 SHA256 4212a8cbdcf13515b6be7ae5ac9b8c352609c7d34ce9026b263c2a6e8d663ad9
+MISC ChangeLog 4673 RMD160 a1a324bdcbf053781abefb63ffaa6a68f910f7a1 SHA1 3ed7b9d57aa1f12643b92f90a63610627b4b21a7 SHA256 cc450f003b6fece0e3e739a45e8eed6251c50240b77ca17f0ef0de8739ebe90f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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
 }