Bump to latest. Add a large patch on mirrors to forward-port libffi to the code distributed in gcc 4.2.0, because I was getting segfaults on ppc with the original code, and an accompanying patch to let it build outside the gcc tree. Add another patch to make sure the ffi header directory gets found during the compile. Removed ~amd64 and ~sparc because guile-lib isn't keyworded for them yet.

(Portage version: 2.1.2.7)

5 files changed, 112 insertions, 1 deletions

diff --git a/dev-libs/g-wrap/ChangeLog b/dev-libs/g-wrap/ChangeLog
index b7812abd902f..f1083f823a6c 100644
--- a/dev-libs/g-wrap/ChangeLog
+++ b/dev-libs/g-wrap/ChangeLog
@@ -1,6 +1,18 @@
 # 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.49 2007/04/04 19:30:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/g-wrap/ChangeLog,v 1.50 2007/06/06 23:10:25 dberkholz Exp $
+
+*g-wrap-1.9.8 (06 Jun 2007)
+
+  06 Jun 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.9.8-fix-gcc-4.2.0-libffi.patch,
+  +files/1.9.8-fix-ffi-build-issue.patch, +g-wrap-1.9.8.ebuild:
+  Bump to latest. Add a large patch on mirrors to forward-port libffi to the
+  code distributed in gcc 4.2.0, because I was getting segfaults on ppc with
+  the original code, and an accompanying patch to let it build outside the gcc
+  tree. Add another patch to make sure the ffi header directory gets found
+  during the compile. Removed ~amd64 and ~sparc because guile-lib isn't
+  keyworded for them yet.
 
   04 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   g-wrap-1.9.6-r3.ebuild:
diff --git a/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch b/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch
new file mode 100644
index 000000000000..c9ba466e9016
--- /dev/null
+++ b/dev-libs/g-wrap/files/1.9.8-fix-ffi-build-issue.patch
@@ -0,0 +1,15 @@
+diff -urN g-wrap-1.9.8.orig/guile/examples/Makefile.am g-wrap-1.9.8/guile/examples/Makefile.am
+--- g-wrap-1.9.8.orig/guile/examples/Makefile.am	2007-05-31 15:07:17.000000000 -0700
++++ g-wrap-1.9.8/guile/examples/Makefile.am	2007-06-01 10:07:32.000000000 -0700
+@@ -5,7 +5,10 @@
+ 
+ lib_LTLIBRARIES += libgw-guile-miscutils.la
+ libgw_guile_miscutils_la_SOURCES = miscutils-guile.c miscutils-guile.h gw-miscutils.c
+-libgw_guile_miscutils_la_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/guile
++libgw_guile_miscutils_la_CFLAGS = \
++	-I$(top_srcdir) \
++	-I$(top_srcdir)/guile \
++	$(LIBFFI_CFLAGS)
+ libgw_guile_miscutils_la_LDFLAGS = -module
+ libgw_guile_miscutils_la_LIBADD = libmiscutils.la \
+ 				  $(top_builddir)/guile/g-wrap/libgwrap-guile-runtime.la \
diff --git a/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch b/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch
new file mode 100644
index 000000000000..e2a2abc645d6
--- /dev/null
+++ b/dev-libs/g-wrap/files/1.9.8-fix-gcc-4.2.0-libffi.patch
@@ -0,0 +1,21 @@
+diff -urN g-wrap-1.9.8.orig/libffi/configure.ac g-wrap-1.9.8/libffi/configure.ac
+--- g-wrap-1.9.8.orig/libffi/configure.ac	2007-06-03 21:50:15.000000000 -0700
++++ g-wrap-1.9.8/libffi/configure.ac	2007-06-03 21:50:31.000000000 -0700
+@@ -5,7 +5,7 @@
+ AC_INIT([libffi], [2.1], [http://gcc.gnu.org/bugs.html])
+ AC_CONFIG_HEADERS([fficonfig.h])
+ 
+-AM_ENABLE_MULTILIB(, ..)
++#AM_ENABLE_MULTILIB(, ..)
+ 
+ AC_CANONICAL_SYSTEM
+ target_alias=${target_alias-$host_alias}
+diff -urN g-wrap-1.9.8.orig/libffi/include/Makefile.am g-wrap-1.9.8/libffi/include/Makefile.am
+--- g-wrap-1.9.8.orig/libffi/include/Makefile.am	2007-06-03 21:50:15.000000000 -0700
++++ g-wrap-1.9.8/libffi/include/Makefile.am	2007-06-03 21:50:47.000000000 -0700
+@@ -9,4 +9,4 @@
+ gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
+ 
+-toollibffi_HEADERS = ffi.h ffitarget.h
++include_HEADERS = ffi.h ffitarget.h
diff --git a/dev-libs/g-wrap/files/digest-g-wrap-1.9.8 b/dev-libs/g-wrap/files/digest-g-wrap-1.9.8
new file mode 100644
index 000000000000..8daabb08f231
--- /dev/null
+++ b/dev-libs/g-wrap/files/digest-g-wrap-1.9.8
@@ -0,0 +1,6 @@
+MD5 fff0e4978c95275aacb88be49f1ba09f g-wrap-1.9.8-gcc-4.2.0.patch.bz2 56607
+RMD160 e3b45b1c90fb88fbbbad599ace507caf315513e8 g-wrap-1.9.8-gcc-4.2.0.patch.bz2 56607
+SHA256 ca7022319847bdc8e4b1453fe7d62f4886627d7f7064be2f9e15ba4c8d9846e1 g-wrap-1.9.8-gcc-4.2.0.patch.bz2 56607
+MD5 b6deb04db3e1008f7d1db4ab7df594b2 g-wrap-1.9.8.tar.gz 964660
+RMD160 609f73e608d3676b03660cee78ef2eab3aa24a37 g-wrap-1.9.8.tar.gz 964660
+SHA256 ec2258b9b5dfa8f312d853df22d03e9d40384c152644cab3c77fc57db1ceba54 g-wrap-1.9.8.tar.gz 964660
diff --git a/dev-libs/g-wrap/g-wrap-1.9.8.ebuild b/dev-libs/g-wrap/g-wrap-1.9.8.ebuild
new file mode 100644
index 000000000000..67d01e4274ad
--- /dev/null
+++ b/dev-libs/g-wrap/g-wrap-1.9.8.ebuild
@@ -0,0 +1,57 @@
+# 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.8.ebuild,v 1.1 2007/06/06 23:10:25 dberkholz Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A tool for exporting C libraries into Scheme"
+HOMEPAGE="http://www.nongnu.org/g-wrap/"
+SRC_URI="http://download.savannah.gnu.org/releases/g-wrap/${P}.tar.gz
+	dev.gentoo.org/~dberkholz/distfiles/${P}-gcc-4.2.0.patch.bz2"
+KEYWORDS="~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+# guile-lib for srfi-34, srfi-35
+DEPEND="dev-scheme/guile
+	=dev-libs/glib-2*
+	!=dev-libs/libffi-4*
+	dev-scheme/guile-lib"
+
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if has_version =dev-scheme/guile-1.8*; then
+		built_with_use dev-scheme/guile deprecated || die "guile must be built with deprecated use flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/libffi_automagic.patch
+	epatch ${FILESDIR}/${PV}-fix-ffi-build-issue.patch
+
+	pushd libffi
+	epatch ${DISTDIR}/${P}-gcc-4.2.0.patch.bz2
+	epatch ${FILESDIR}/${PV}-fix-gcc-4.2.0-libffi.patch 
+	popd
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+#looks like parallel build and install fails occasionally
+src_compile() {
+	econf --with-glib
+	emake -j1 || die 'make 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'
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+	insinto /usr/share/guile/site/srfi
+	doins lib/srfi/srfi*
+}