build with newer zlib (bug #387829)

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

diff --git a/games-emulation/hatari/ChangeLog b/games-emulation/hatari/ChangeLog
index 8948eaa25f22f0fd87dbcbe41c2dcccfd3d91fa1..55d8dd835db5db2ad4358d9b353ff2fdf745dbdb 100644 (file)
--- a/games-emulation/hatari/ChangeLog
+++ b/games-emulation/hatari/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/hatari
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.31 2011/08/24 19:33:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/ChangeLog,v 1.32 2011/11/13 21:54:12 mr_bones_ Exp $
+
+  13 Nov 2011; Michael Sterrett <mr_bones_@gentoo.org> hatari-1.5.0.ebuild:
+  build with newer zlib (bug #387829)
 
   24 Aug 2011; Markus Meier <maekke@gentoo.org> hatari-1.5.0.ebuild:
   x86 stable, bug #380177

diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index f886cfe01c31d02cd5d001ac9afee703d0e3a849..9fcc48663554b80880a4a5572f9ad9c97a35a187 100644 (file)
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -8,13 +5,6 @@ DIST hatari-1.4.0.tar.bz2 1260844 RMD160 a85dda4e4ad5f84b3fe3f77b8f5d3a4bb523a92
 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
-EBUILD hatari-1.5.0.ebuild 1716 RMD160 8d55f71b620561727e4aa179cebe4176ff541209 SHA1 ced5ca51a774576fb190b3f8a728df46d341a38e SHA256 f85b75aec42e77a24ce4064064306243ab82d9e69848ec77d33320c771762c12
-MISC ChangeLog 4192 RMD160 7647693ab7c15bed9f7e5123e243911e8fe9ffb6 SHA1 8718c5ade5bc27c064267d8633dfd6f528480a34 SHA256 8946ffe033c66cdd7bd4b79c354fa7d80bdb9fb390932954d83d517180ef93c9
+EBUILD hatari-1.5.0.ebuild 1817 RMD160 cc78a4bc01f598c8a232099b742b382568bcb6da SHA1 ef65a91322348b1608d1ea524b78f4e08261aa86 SHA256 732a2a2850ab6e50e5972dfa3e2e1124971779848f83db2a79875908c51177e0
+MISC ChangeLog 4310 RMD160 1d2f8534edff766376180c95690efbe089d258dc SHA1 9686c16300b41a47e68336e035744d0534f16908 SHA256 445be40e154720d959ee53050bad7d0ebf51578395696e130d77dab0743e3206
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5VUk4ACgkQkKaRLQcq0GK7egCeIsQkGW/P9S63oB24VgScFNXi
-GuYAn28iHQbGCxT80CbQ8GThUso9VDjf
-=/W2q
------END PGP SIGNATURE-----

diff --git a/games-emulation/hatari/hatari-1.5.0.ebuild b/games-emulation/hatari/hatari-1.5.0.ebuild
index 8505871b99426268b8b5264c19a61d2f2b755b0e..703217042aa06108b897ad1af20c9b7703d86d03 100644 (file)
--- a/games-emulation/hatari/hatari-1.5.0.ebuild
+++ b/games-emulation/hatari/hatari-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.5.0.ebuild,v 1.3 2011/08/24 19:33:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/hatari/hatari-1.5.0.ebuild,v 1.4 2011/11/13 21:54:12 mr_bones_ Exp $
 
 EAPI=2
 inherit toolchain-funcs cmake-utils games
@@ -25,6 +25,8 @@ 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
        rm -f doc/CMakeLists.txt
 }