always build internal libffi, fixes bug 163647

(Portage version: 2.1.2-r12)

6 files changed, 25 insertions, 12 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index c1972f680ca1..f3bd2f35873a 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for dev-libs/g-wrap
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.40 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.41 2007/03/02 14:41:51 hkbst Exp $
 
-*g-wrap-1.9.6-r2 (28 Feb 2007)
+  02 Mar 2007; Marijn Schouten <hkBst@gentoo.org>
+  +files/libffi_automagic.patch, -g-wrap-1.9.6-r2.ebuild,
+  +g-wrap-1.9.6-r3.ebuild, -g-wrap-1.9.7-r2.ebuild, +g-wrap-1.9.7-r3.ebuild:
+  always build internal libffi, fixes bug 163647
 
   28 Feb 2007; Marijn Schouten <hkBst@gentoo.org> g-wrap-1.9.6-r2.ebuild files/digest-g-wrap-1.9.6-r2
   fix srfi issues of bug 165763
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r2 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r3
index 79764f2c6023..79764f2c6023 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r2
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.6-r3
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r3
index 1829f97f18cf..1829f97f18cf 100644
--- a/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r2
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.7-r3
diff --git a/dev-libs/g-wrap/files/libffi_automagic.patch b/dev-libs/g-wrap/files/libffi_automagic.patch
new file mode 100644
index 000000000000..1cb6b1535225
--- /dev/null
+++ b/dev-libs/g-wrap/files/libffi_automagic.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2007-03-02 15:20:54.000000000 +0100
++++ configure.ac	2007-03-02 15:21:08.000000000 +0100
+@@ -55,7 +55,7 @@
+ dnl
+ 
+ dnl libffi
+-ar_WITH_LIB_LIBFFI([have_libffi=yes], [have_libffi=no])
++ar_WITH_LIB_LIBFFI([have_libffi=no], [have_libffi=no])
+ LIBFFI_CFLAGS_INSTALLED="$LIBFFI_CFLAGS"
+ LIBFFI_LIBS_INSTALLED="$LIBFFI_LIBS"
+ if test "$have_libffi" = no; then
diff --git a/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
index dea4be9b2fb5..03628a2db1d7 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r2.ebuild,v 1.1 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.6-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
 
 inherit eutils autotools
 
@@ -13,10 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="dev-scheme/guile
-	=dev-libs/glib-2*"
-# seems not to work. g-wrap builds its own libffi-4.0.1
-# dev-libs/libffi
+DEPEND="dev-scheme/guile =dev-libs/glib-2* !dev-libs/libffi"
 
 RDEPEND="${DEPEND}"
 
@@ -27,6 +24,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${P}_glib_automagic.patch
+	epatch ${FILESDIR}/libffi_automagic.patch
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
@@ -34,12 +32,12 @@ src_unpack() {
 src_compile() {
 	econf --with-glib
 	emake -j1 || die 'make failed'
-#	emake -j1 -C libffi || die 'make libffi failed'
+	emake -j1 -C libffi || die 'make libffi failed'
 }
 
 src_install () {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
-#	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
+	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	insinto /usr/share/guile/site/srfi
 	doins lib/srfi/srfi*
diff --git a/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
index 92af0481f52d..9c20697eadf2 100644
--- a/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild
+++ b/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r2.ebuild,v 1.4 2007/02/28 15:10:58 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/g-wrap-1.9.7-r3.ebuild,v 1.1 2007/03/02 14:41:51 hkbst Exp $
 
 inherit eutils autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch ${FILESDIR}/${P}_glib_automagic.patch
+	epatch ${FILESDIR}/libffi_automagic.patch
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
@@ -34,12 +35,12 @@ src_unpack() {
 src_compile() {
 	econf --with-glib
 	emake -j1 || die 'make failed'
-#	emake -j1 -C libffi || die 'make libffi failed'
+	emake -j1 -C libffi || die 'make libffi failed'
 }
 
 src_install () {
 	emake -j1 DESTDIR="${D}" install || die "make install failed"
-#	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
+	emake -C libffi -j1 DESTDIR="${D}" install || die 'make libffi failed'
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	insinto /usr/share/guile/site/srfi
 	doins lib/srfi/srfi*