Added compilation fix for OSX and marked ~ppc-macos (bug #110944)

Package-Manager: portage-2.0.51.22-r3

diff --git a/media-gfx/tic98/ChangeLog b/media-gfx/tic98/ChangeLog
index 1d0ace7250f2ab6a036416c03132fa92ce7daa7d..1754b287b23517846e0379fcb0bfb05400a1dd79 100644 (file)
--- a/media-gfx/tic98/ChangeLog
+++ b/media-gfx/tic98/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/tic98
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.3 2005/08/02 15:48:13 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/ChangeLog,v 1.4 2005/11/03 10:39:00 grobian Exp $
+
+  03 Nov 2005; Fabian Groffen <grobian@gentoo.org>
+  +files/tic98-1.01-macos.patch, tic98-1.01-r1.ebuild:
+  Added compilation fix for OSX and marked ~ppc-macos (bug #110944)
 
   02 Aug 2005; <sekretarz@gentoo.org> -files/tic98.diff,
   files/tic98-1.01-gentoo.diff, tic98-1.01-r1.ebuild:

diff --git a/media-gfx/tic98/Manifest b/media-gfx/tic98/Manifest
index 89a31cc9959fdd6e55a9ff616832273e3f610888..51b98b9ac73fa401b4be2d6fdf165d79bf5fe72a 100644 (file)
--- a/media-gfx/tic98/Manifest
+++ b/media-gfx/tic98/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f1b8ded8c1ce9cacc32aad24811f61da ChangeLog 908
-MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01 62
+MD5 67a664586abca340c603b5f503d03f2e tic98-1.01-r1.ebuild 776
+MD5 ea29b649c56723cdcb113d0c8cc8ba68 tic98-1.01.ebuild 882
+MD5 c6ac9537ba5649114b922cc6865f47f7 ChangeLog 1081
+MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
 MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01-r1 62
+MD5 b2419a7092da155e7165fec26d606e07 files/digest-tic98-1.01 62
+MD5 b80a7cb3b7dc39abec555032dc752cc5 files/tic98-1.01-macos.patch 643
 MD5 d20e8645219f4317f941051e02713f3b files/tic98-1.01-gentoo.diff 5452
-MD5 5fc54c5d01402d0610fafa96961bb8e0 metadata.xml 161
-MD5 91082c83c7f92def599dce315d38bdf3 tic98-1.01-r1.ebuild 683
-MD5 ea29b649c56723cdcb113d0c8cc8ba68 tic98-1.01.ebuild 882
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC77ZII1lqEGTUzyQRAqCLAJ98v5S+M2Y7gDbPhB6LnWFGfUQjTgCffM23
-I+uhI4lI2R2pzkF1+9gK7Ok=
-=J4Ap
------END PGP SIGNATURE-----

diff --git a/media-gfx/tic98/files/tic98-1.01-macos.patch b/media-gfx/tic98/files/tic98-1.01-macos.patch
new file mode 100644 (file)
index 0000000..607e76f
--- /dev/null
+++ b/media-gfx/tic98/files/tic98-1.01-macos.patch
@@ -0,0 +1,26 @@
+--- tic98/ppmd_hash.c.orig     2005-11-03 11:09:22.000000000 +0100
++++ tic98/ppmd_hash.c  2005-11-03 11:09:49.000000000 +0100
+@@ -2,7 +2,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#ifndef __APPLE__
+ #include <malloc.h>
++#endif
+ #include "ppmd_hash.h"
+ 
+ #define HASH_NULL 0
+--- tic98/ppmd_model.c.orig    2005-11-03 11:07:09.000000000 +0100
++++ tic98/ppmd_model.c 2005-11-03 11:09:04.000000000 +0100
+@@ -1,7 +1,11 @@
+ /* PPM* model for arithmetic encoder. */
+ #include <stdio.h>
+ #include <assert.h>
++#ifndef __APPLE__
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include "arithcode.h"
+ #include "ppmd_hash.h"
+ 

diff --git a/media-gfx/tic98/tic98-1.01-r1.ebuild b/media-gfx/tic98/tic98-1.01-r1.ebuild
index 6a2149dd264789b710d7bd19fa032387370f5530..ebb019e0e0fb6f6fa51832e8cdd615a70babf366 100644 (file)
--- a/media-gfx/tic98/tic98-1.01-r1.ebuild
+++ b/media-gfx/tic98/tic98-1.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r1.ebuild,v 1.4 2005/08/02 18:06:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tic98/tic98-1.01-r1.ebuild,v 1.5 2005/11/03 10:39:00 grobian Exp $
 
 inherit eutils
 
@@ -10,15 +10,21 @@ SRC_URI="http://www.cs.waikato.ac.nz/~singlis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc-macos x86"
 IUSE=""
 
 DEPEND=""
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+       unpack ${A}
+       epatch "${FILESDIR}/${P}"-macos.patch
+       cd "${S}"
+       epatch "${FILESDIR}/${P}"-gentoo.diff
+}
+
 src_compile() {
-       epatch ${FILESDIR}/${P}-gentoo.diff
        emake all || die
        emake all2 || die
 }