Fix detection and test on FreeBSD and keyword it.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 52 insertions, 6 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index 69d9f5cb15ca..57287dbc13e5 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.74 2009/09/07 13:58:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.75 2009/09/23 19:15:35 aballier Exp $
+
+  23 Sep 2009; Alexis Ballier <aballier@gentoo.org> libffi-3.0.8.ebuild,
+  +files/libffi-3.0.8-fbsd.patch:
+  Fix detection and test on FreeBSD and keyword it.
 
   07 Sep 2009; Raúl Porcel <armin76@gentoo.org> libffi-3.0.8.ebuild:
   arm/ia64/s390/sh stable
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index 572887c5ef61..35a52877c759 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libffi-3.0.8-fbsd.patch 866 RMD160 ac8c5a157bf3faf5d54ef2bab8822cec5656aaef SHA1 d460fd0a55365f0b4befbdb2c2259399dd875e44 SHA256 5c50d84ba3e6312c046efa5ac8bed0c6b9b719ae98196f7841511f62dccb568d
 DIST libffi-3.0.8.tar.gz 722834 RMD160 4144f64e79ebf95161a6afd58ceaeef8372b5e57 SHA1 ce44d10c39d9a37479c8777e206cac0f36c48712 SHA256 2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
-EBUILD libffi-3.0.8.ebuild 1017 RMD160 4071fe943edd5cc04c96fd2e497ae637c761931f SHA1 92a4f92a281f2c88dd42824f946503c67b199798 SHA256 c023149180b88ffadb1106eed6f76ae93495c9098699194ad84ea83361d85a6a
-MISC ChangeLog 10451 RMD160 7190b24a7377f59301136bc7f5a55b9db0a2e901 SHA1 b8836133e0ceec9f05a9390e17ecf0fc66d150fd SHA256 40a1668d12d7b68c845b6a98d212feabaa8a6a9e4fca0bfcd181156681d92961
+EBUILD libffi-3.0.8.ebuild 1108 RMD160 4006a30c35613a1209e1ab5279ec783facec9626 SHA1 fed2dda89834c79fde936cd8784b3d6a4cdfe795 SHA256 f5ad144a914a5c50ca6949f3081e315e7a126aa36200b26f4060ee4065199a18
+MISC ChangeLog 10612 RMD160 6b4ce13b5d79d6a3220f8e6e22a437ac17182eb5 SHA1 ff17ceb660c256a4defa4f45775172441c4f238c SHA256 c2a15c07a1e3940bbc755dbe4a0a450c98eccfac99b59d1134082077ca556ee2
 MISC metadata.xml 1834 RMD160 4ae38a0125a0d16e2f8eeced99225474ba6a7a01 SHA1 ff8e48fc31017e3206a550b7d833a2e54b5a9041 SHA256 7c023f3a22feee632409f456117fc2339ae8090683a311495b6def4da9ae9fa5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq6c90ACgkQvFcC4BYPU0obYQCgiPPG81/fv7j9qL1r6ZDcdqtq
+MnMAoJmiZS40CTPOOo1fEKifAisDs0KW
+=IyWy
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libffi/files/libffi-3.0.8-fbsd.patch b/dev-libs/libffi/files/libffi-3.0.8-fbsd.patch
new file mode 100644
index 000000000000..0b6f422e66a0
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.8-fbsd.patch
@@ -0,0 +1,26 @@
+Index: libffi-3.0.8/src/x86/ffi.c
+===================================================================
+--- libffi-3.0.8.orig/src/x86/ffi.c
++++ libffi-3.0.8/src/x86/ffi.c
+@@ -124,7 +124,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
+ #ifdef X86
+     case FFI_TYPE_STRUCT:
+ #endif
+-#if defined(X86) || defined(X86_DARWIN)
++#if defined(X86) || defined(X86_DARWIN) || defined(X86_FREEBSD)
+     case FFI_TYPE_UINT8:
+     case FFI_TYPE_UINT16:
+     case FFI_TYPE_SINT8:
+Index: libffi-3.0.8/configure.ac
+===================================================================
+--- libffi-3.0.8.orig/configure.ac
++++ libffi-3.0.8/configure.ac
+@@ -71,7 +71,7 @@ case "$host" in
+ 	TARGET=PA_HPUX; TARGETDIR=pa
+ 	;;
+ 
+-  i386-*-freebsd* | i386-*-openbsd*)
++  i?86-*-freebsd* | i?86-*-openbsd*)
+ 	TARGET=X86_FREEBSD; TARGETDIR=x86
+ 	;;
+   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw*)
diff --git a/dev-libs/libffi/libffi-3.0.8.ebuild b/dev-libs/libffi/libffi-3.0.8.ebuild
index 0b9330811d13..3c8f7d61a912 100644
--- a/dev-libs/libffi/libffi-3.0.8.ebuild
+++ b/dev-libs/libffi/libffi-3.0.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.16 2009/09/07 13:58:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.8.ebuild,v 1.17 2009/09/23 19:15:35 aballier Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="a portable, high level programming interface to various calling conventions."
 HOMEPAGE="http://sourceware.org/libffi"
@@ -11,13 +11,18 @@ SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug static-libs test"
 
 RDEPEND=""
 DEPEND="!<dev-libs/g-wrap-1.9.11
 	test? ( dev-util/dejagnu )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \