Fix for ppc-macos. Marked testing

(Portage version: 2.0.51.19)

3 files changed, 139 insertions, 5 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index c630b3900a7b..e42c46c357c8 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/aalib
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.16 2004/10/05 09:32:17 eradicator Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.17 2005/04/09 22:00:32 j4rg0n Exp $
+
+  09 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/aalib-osx.patch,
+  aalib-1.4_rc4-r2.ebuild:
+  Fix for ppc-macos. Marked testing
 
   05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml:
   static USE flag support and added metadata.
diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
index c45783eca521..c8a63d7d65eb 100644
--- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc4-r2.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-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.27 2005/03/29 01:55:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.28 2005/04/09 22:00:32 j4rg0n Exp $
 
 inherit eutils libtool
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE="X slang gpm static"
 
 RDEPEND=">=sys-libs/ncurses-5.1
@@ -21,12 +21,16 @@ RDEPEND=">=sys-libs/ncurses-5.1
 	gpm? ( sys-libs/gpm )
 	slang? ( >=sys-libs/slang-1.4.2 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
+	!ppc-macos? (>=sys-devel/autoconf-2.58)
 	>=sys-devel/automake-1.4"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.diff
+	if use ppc-macos; then
+		cd ${S}/src
+		epatch ${FILESDIR}/${PN}-osx.patch
+	fi
 
 	elibtoolize
 
@@ -42,6 +46,11 @@ src_compile() {
 		`use_with X x11-driver` \
 		`use_enable static`
 
+	if use ppc-macos; then
+		cd ${S}
+		sed -i -e 's:$(AUTOMAKE) --foreign --include-deps:$(AUTOMAKE) --foreign --include-deps -a -c -f:' src/Makefile
+	fi
+
 	emake || die
 }
 
diff --git a/media-libs/aalib/files/aalib-osx.patch b/media-libs/aalib/files/aalib-osx.patch
new file mode 100644
index 000000000000..6fa9de8742de
--- /dev/null
+++ b/media-libs/aalib/files/aalib-osx.patch
@@ -0,0 +1,121 @@
+diff -Naur src-old/aados.c src/aados.c
+--- src-old/aados.c	Sat Apr  9 17:44:58 2005
++++ src/aados.c	Sat Apr  9 17:46:00 2005
+@@ -5,7 +5,7 @@
+ #include <go32.h>

+ #include <dpmi.h>

+ #include <sys/nearptr.h>

+-#include <malloc.h>

++#include <malloc/malloc.h>

+ #include "aalib.h"

+ #include "aaint.h"

+ int __use_nearptr_hack;

+diff -Naur src-old/aadoskbd.c src/aadoskbd.c
+--- src-old/aadoskbd.c	Sat Apr  9 17:44:58 2005
++++ src/aadoskbd.c	Sat Apr  9 17:46:09 2005
+@@ -4,7 +4,7 @@
+ #include <go32.h>
+ #include <dpmi.h>
+ #include <sys/nearptr.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdlib.h>
+ #include <dos.h>
+ #include <dpmi.h>
+diff -Naur src-old/aaedit.c src/aaedit.c
+--- src-old/aaedit.c	Sat Apr  9 17:44:58 2005
++++ src/aaedit.c	Sat Apr  9 17:46:18 2005
+@@ -1,6 +1,6 @@
+ #include <string.h>
+ #include <ctype.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "aalib.h"
+ #include "aaint.h"
+ static void aa_editdisplay(struct aa_edit *e)
+diff -Naur src-old/aafire.c src/aafire.c
+--- src-old/aafire.c	Sat Apr  9 17:44:58 2005
++++ src/aafire.c	Sat Apr  9 17:46:27 2005
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdlib.h>
+ #include "aalib.h"
+ 
+diff -Naur src-old/aakbdreg.c src/aakbdreg.c
+--- src-old/aakbdreg.c	Sat Apr  9 17:44:58 2005
++++ src/aakbdreg.c	Sat Apr  9 17:46:36 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "config.h"
+ #include "aalib.h"
+ #include "aaint.h"
+diff -Naur src-old/aalib.c src/aalib.c
+--- src-old/aalib.c	Sat Apr  9 17:44:58 2005
++++ src/aalib.c	Sat Apr  9 17:46:46 2005
+@@ -1,6 +1,6 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "aalib.h"
+ #include "aaint.h"
+ 
+diff -Naur src-old/aamoureg.c src/aamoureg.c
+--- src-old/aamoureg.c	Sat Apr  9 17:44:58 2005
++++ src/aamoureg.c	Sat Apr  9 17:47:08 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "config.h"
+ #include "aalib.h"
+ #include "aaint.h"
+diff -Naur src-old/aarec.c src/aarec.c
+--- src-old/aarec.c	Sat Apr  9 17:44:58 2005
++++ src/aarec.c	Sat Apr  9 17:47:15 2005
+@@ -1,5 +1,5 @@
+ #include <string.h>
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "aalib.h"
+ #include "aaint.h"
+ aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL,
+diff -Naur src-old/aaregist.c src/aaregist.c
+--- src-old/aaregist.c	Sat Apr  9 17:44:58 2005
++++ src/aaregist.c	Sat Apr  9 17:47:25 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include "config.h"
+ #include "aalib.h"
+ #include "aaint.h"
+diff -Naur src-old/aax.c src/aax.c
+--- src-old/aax.c	Sat Apr  9 17:45:25 2005
++++ src/aax.c	Sat Apr  9 17:42:07 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+diff -Naur src-old/aaxkbd.c src/aaxkbd.c
+--- src-old/aaxkbd.c	Sat Apr  9 17:45:13 2005
++++ src/aaxkbd.c	Sat Apr  9 17:42:07 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>
+diff -Naur src-old/aaxmouse.c src/aaxmouse.c
+--- src-old/aaxmouse.c	Sat Apr  9 17:45:38 2005
++++ src/aaxmouse.c	Sat Apr  9 17:42:07 2005
+@@ -1,4 +1,4 @@
+-#include <malloc.h>
++#include <malloc/malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdio.h>