Replace the osx patch with a more generic sed line that works for FreeBSD, too. Add ~x86-fbsd keyword.

Package-Manager: portage-2.1_pre7-r4

4 files changed, 40 insertions, 120 deletions

diff --git a/media-libs/aalib/ChangeLog b/media-libs/aalib/ChangeLog
index 9c25a6068f9a..0a4d7ba7e81a 100644
--- a/media-libs/aalib/ChangeLog
+++ b/media-libs/aalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/aalib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.24 2006/04/04 02:59:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/ChangeLog,v 1.25 2006/04/08 00:49:28 flameeyes Exp $
+
+  08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/aalib-1.4_rc5-osx.patch, aalib-1.4_rc5.ebuild:
+  Replace the osx patch with a more generic sed line that works for FreeBSD,
+  too. Add ~x86-fbsd keyword.
 
   04 Apr 2006; Aron Griffis <agriffis@gentoo.org> aalib-1.4_rc5.ebuild:
   Mark 1.4_rc5 stable on ia64
diff --git a/media-libs/aalib/Manifest b/media-libs/aalib/Manifest
index 431bf3dd3f83..e6ff3fa50321 100644
--- a/media-libs/aalib/Manifest
+++ b/media-libs/aalib/Manifest
@@ -1,10 +1,37 @@
-MD5 a46242003eb888b8e0d187553091e2b4 ChangeLog 3170
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 64f6fa9ff5859473a61c66dcea9895e7 ChangeLog 3388
+RMD160 7fc994a8e719d2d8f868fcaa1b37c57b99396216 ChangeLog 3388
+SHA256 1531897bb145fe674e609d8f1737fcb295965808e0cb70a83f5c2b3cd008d24b ChangeLog 3388
 MD5 2dec76162a1d6a3b20096deb2f0b61d2 aalib-1.4_rc4-r2.ebuild 1411
-MD5 daeaee7bef1031f8db9e4ddd5fcf3588 aalib-1.4_rc5.ebuild 1433
+RMD160 a48bbc65cb0b1e1f2eb237be0fe5b504deddd400 aalib-1.4_rc4-r2.ebuild 1411
+SHA256 23843259b7d92fc48669932a7a1ba51745c6b30db5168500b31d0db463eb8935 aalib-1.4_rc4-r2.ebuild 1411
+MD5 26e078fc7b5279b5b3c94de67932cbcd aalib-1.4_rc5.ebuild 1441
+RMD160 694ffd21aad0dd48733d06b0816bef3089d937a6 aalib-1.4_rc5.ebuild 1441
+SHA256 ea70e442e39193364c657b483a3f3f9a5ccf90477fcb2c384b49dd0bf3e1a820 aalib-1.4_rc5.ebuild 1441
 MD5 4aff44ab71184e49f997a1b6f0593b83 files/aalib-1.4_rc4-gentoo.patch 1245
+RMD160 ca2df1fc54bf70ff57bec5260dad401e2a0dac12 files/aalib-1.4_rc4-gentoo.patch 1245
+SHA256 fa5d946e9d0e4a78c37187f6795b27bcb057e9e2ec00fe3a873a11e25fba23a7 files/aalib-1.4_rc4-gentoo.patch 1245
 MD5 224b7aa8488763f7d7b4bfa63948adef files/aalib-1.4_rc4-m4.patch 241
-MD5 09587da2537886441b0d5590bfd45d47 files/aalib-1.4_rc5-osx.patch 3121
+RMD160 8da68015ba2e16647f281aebd59bcc0329fe9954 files/aalib-1.4_rc4-m4.patch 241
+SHA256 24d09cb9eb9ed8d0990c677b5fbfe43762fe872d198c146c7de6fdb39eab692f files/aalib-1.4_rc4-m4.patch 241
 MD5 b59998ef8f5e2f1740b1e6ed0b22bb4b files/aalib-osx.patch 3399
+RMD160 cb2ec77425a3112cf908374baec9a38f497e7cbc files/aalib-osx.patch 3399
+SHA256 8ac989b3bb7e3aa1eed9e3e4d4cc654413e08cc5b9a86d41dbf8452ee5d9f739 files/aalib-osx.patch 3399
 MD5 ffa1e1a7420535a1fe146ae5145ddbd6 files/digest-aalib-1.4_rc4-r2 64
+RMD160 1a58231435357193fdb94475e71cbea57953144c files/digest-aalib-1.4_rc4-r2 64
+SHA256 9e0eecd059160e7a4bee2099c6162adcfe541d3f1548776040e874d7fc693b5c files/digest-aalib-1.4_rc4-r2 64
 MD5 da57c040ac70e4ac57714131aaaeb6c6 files/digest-aalib-1.4_rc5 64
+RMD160 9f796a4d132afd8e4117c84f19258c88370562e4 files/digest-aalib-1.4_rc5 64
+SHA256 c782d866bf3b2251c241b7d54005924f26db8aed249abe3fcb952e071322cd03 files/digest-aalib-1.4_rc5 64
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
+RMD160 d1f5ea37202987c54db9697175a55e5609386654 metadata.xml 259
+SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf metadata.xml 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFENwi0AiZjviIA2XgRAgb0AKCZMwMFik/1PIEfr6fLQOTcqnIInACfaPRw
+Sb+j5N6Cf3CYCSj1cEvpyfE=
+=VYL+
+-----END PGP SIGNATURE-----
diff --git a/media-libs/aalib/aalib-1.4_rc5.ebuild b/media-libs/aalib/aalib-1.4_rc5.ebuild
index b69fa7bf1fca..3e06363ba913 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-2006 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.9 2006/04/04 02:59:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc5.ebuild,v 1.10 2006/04/08 00:49:28 flameeyes Exp $
 
 inherit eutils libtool toolchain-funcs
 
@@ -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 ~ppc-macos ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="X slang gpm"
 
 RDEPEND="X? ( || ( x11-libs/libX11 virtual/x11 ) )"
@@ -29,10 +29,8 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.4_rc4-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-1.4_rc4-m4.patch
-	if use ppc-macos; then
-		cd src
-		epatch "${FILESDIR}"/${P}-osx.patch
-	fi
+
+	sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' ${S}/src/*.c
 	elibtoolize
 }
 
diff --git a/media-libs/aalib/files/aalib-1.4_rc5-osx.patch b/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
deleted file mode 100644
index b19ab6ac2a67..000000000000
--- a/media-libs/aalib/files/aalib-1.4_rc5-osx.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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>