Fix for Bug 91630

Package-Manager: portage-2.0.51-r15

5 files changed, 126 insertions, 21 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index 133c5abed0c3..7505fe3d564f 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/aalib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.18 2005/05/03 20:35:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.19 2005/05/10 04:02:01 j4rg0n Exp $
+
+  09 May 2005; Lina Pezzella <j4rg0n@gentoo.org> +files/aalib-1.4_rc5-osx.patch,
+  aalib-1.4_rc4-r2.ebuild, aalib-1.4_rc5.ebuild:
+  Fix for Bug 91630. rc4 stable on ppc-macos.
 
 *aalib-1.4_rc5 (03 May 2005)
 
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 964faa0637be..6af00cfc730a 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 660fa7ac0109114cc58977c167da7db5 ChangeLog 2410
-MD5 ac183cd88c5b0926e6c8738ed2f3cf74 aalib-1.4_rc4-r2.ebuild 1116
+MD5 d9f92308bf9dc71c07e218c1135185ee ChangeLog 2583
+MD5 39011cf6d523134026d20090897d1144 aalib-1.4_rc4-r2.ebuild 1115
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
-MD5 190604eec8497c65c4fcfc029bf2e786 aalib-1.4_rc5.ebuild 1146
-MD5 da57c040ac70e4ac57714131aaaeb6c6 files/digest-aalib-1.4_rc5 64
-MD5 ffa1e1a7420535a1fe146ae5145ddbd6 files/digest-aalib-1.4_rc4-r2 64
-MD5 b59998ef8f5e2f1740b1e6ed0b22bb4b files/aalib-osx.patch 3399
+MD5 bd3f74a38d8989cbf43e998376ee90d5 aalib-1.4_rc5.ebuild 1141
 MD5 4aff44ab71184e49f997a1b6f0593b83 files/aalib-1.4_rc4-gentoo.patch 1245
+MD5 ffa1e1a7420535a1fe146ae5145ddbd6 files/digest-aalib-1.4_rc4-r2 64
 MD5 224b7aa8488763f7d7b4bfa63948adef files/aalib-1.4_rc4-m4.patch 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCd+C8ArHZZzCEUG0RAs/7AJ9TcXLmxbNySAtqkgfJElcdlu7pHQCfXATb
-JZKXl5AVUnidFdkdRcoW2Qw=
-=l+Wu
------END PGP SIGNATURE-----
+MD5 b59998ef8f5e2f1740b1e6ed0b22bb4b files/aalib-osx.patch 3399
+MD5 da57c040ac70e4ac57714131aaaeb6c6 files/digest-aalib-1.4_rc5 64
+MD5 09587da2537886441b0d5590bfd45d47 files/aalib-1.4_rc5-osx.patch 3121
diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild
index e6cb1aad51d7..31c68644f665 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.29 2005/04/28 23:17:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.30 2005/05/10 04:02:01 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 ~ppc-macos s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
 IUSE="X slang gpm static"
 
 DEPEND=">=sys-libs/ncurses-5.1
diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index 53ff866c7b20..7f389acaa262 100644
--- a/media-libs/aalib/aalib-1.4_rc5.ebuild
+++ b/media-libs/aalib/aalib-1.4_rc5.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_rc5.ebuild,v 1.1 2005/05/03 20:35:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.2 2005/05/10 04:02:01 j4rg0n Exp $
 
 inherit eutils libtool toolchain-funcs
 
@@ -28,7 +28,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
 	if use ppc-macos; then
 		cd src
-		epatch "${FILESDIR}"/${PN}-osx.patch
+		epatch "${FILESDIR}"/${P}-osx.patch
 	fi
 }
 
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-osx.patch b/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
new file mode 100644
index 000000000000..b19ab6ac2a67
--- /dev/null
+++ b/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
@@ -0,0 +1,110 @@
+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/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>