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.

Package-Manager: portage-2.1.2.7

6 files changed, 133 insertions, 15 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/Manifest b/dev-libs/g-wrap/Manifest
index 3011f1a8fa61..459a69bbf8ff 100644
--- a/dev-libs/g-wrap/Manifest
+++ b/dev-libs/g-wrap/Manifest
@@ -1,6 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 1.9.8-fix-ffi-build-issue.patch 747 RMD160 f132750e503e18d13857b97d727be1fc31e2232b SHA1 ecfeb8f8a135cfa3ea6a83d1b189790bba0d0b1b SHA256 341283693ed008aa5ac8ab21a6b256d8d63fce1cd28bab75a52ebdab3e8225b7
+MD5 13192e64064bfd1ba12089c7ffd5fd30 files/1.9.8-fix-ffi-build-issue.patch 747
+RMD160 f132750e503e18d13857b97d727be1fc31e2232b files/1.9.8-fix-ffi-build-issue.patch 747
+SHA256 341283693ed008aa5ac8ab21a6b256d8d63fce1cd28bab75a52ebdab3e8225b7 files/1.9.8-fix-ffi-build-issue.patch 747
+AUX 1.9.8-fix-gcc-4.2.0-libffi.patch 947 RMD160 bf59fce47d69992dbf365b76fb25a80d9f87728a SHA1 c06ccc6fc5d779ff9690830fb207ca19da0ae058 SHA256 ac9e779010051b80ffdb2abf2ec88b6a5df00ab57824f34f7fb0be6925da4a6e
+MD5 003863d97a0fae5f36f713a85131be9f files/1.9.8-fix-gcc-4.2.0-libffi.patch 947
+RMD160 bf59fce47d69992dbf365b76fb25a80d9f87728a files/1.9.8-fix-gcc-4.2.0-libffi.patch 947
+SHA256 ac9e779010051b80ffdb2abf2ec88b6a5df00ab57824f34f7fb0be6925da4a6e files/1.9.8-fix-gcc-4.2.0-libffi.patch 947
 AUX g-wrap-1.3.4-direntry.patch 2202 RMD160 2fcc7c0adfd3544045294395912b7692e433b3d3 SHA1 b4cd7b381558672181242fac0031f7163ee11b50 SHA256 132ba88ddf150ddf0102d23e27e2a6efa850055bb509b18004febc1c5615989a
 MD5 05abd740e0c2fe308fd53514de5442e0 files/g-wrap-1.3.4-direntry.patch 2202
 RMD160 2fcc7c0adfd3544045294395912b7692e433b3d3 files/g-wrap-1.3.4-direntry.patch 2202
@@ -28,6 +33,8 @@ SHA256 5ae3e082904ebdf6f67092a805cfac6725b295edfd02f0b8b0cd1c595fa2c51f files/li
 DIST g-wrap-1.3.4.tar.gz 403570 RMD160 64eddd127e24df11067b498d0986d8823f012d76 SHA1 764f1c878e18341bf437f3e1ddc5f8618019bfc2 SHA256 bb9fa9b7b6b2a11899d98d730cf5970179bbf942fd763eda13b7b541278adee4
 DIST g-wrap-1.9.6.tar.gz 826045 RMD160 1e3d86e38061a217b9dde06885301f4a46433d39 SHA1 754116dd5d9af2fe0e1f8386e69721618e0eefdf SHA256 ddb0e31d40581402d6d7045cce7cdc79e0bc0627831a4b12012f45703446d311
 DIST g-wrap-1.9.7.tar.gz 917706 RMD160 ffe665feb1a4f9b527a5e173d697ba2890680dc7 SHA1 403434170d0302f8dbce1c4f85116fa8cd0bba0d SHA256 191f096c0cc5a6c4baac45cb595ebfee3ccba3599babc9fbd03d4c6f1f435355
+DIST g-wrap-1.9.8-gcc-4.2.0.patch.bz2 56607 RMD160 e3b45b1c90fb88fbbbad599ace507caf315513e8 SHA1 61b2c6e18b6c2bec78c8cfe70f6dd050f6f048e7 SHA256 ca7022319847bdc8e4b1453fe7d62f4886627d7f7064be2f9e15ba4c8d9846e1
+DIST g-wrap-1.9.8.tar.gz 964660 RMD160 609f73e608d3676b03660cee78ef2eab3aa24a37 SHA1 5f774c2379e362434d82c5aef4e416a4e8f9cac2 SHA256 ec2258b9b5dfa8f312d853df22d03e9d40384c152644cab3c77fc57db1ceba54
 EBUILD g-wrap-1.3.4-r1.ebuild 908 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2cd SHA1 e23c1e62eefc601766510dfaab756aedf4151dda SHA256 5785d96923c990c6da1572e00e493a69882d06c28cf18e52e52478be2a8c3b0d
 MD5 449f820c337d499d5838557ec14a7df2 g-wrap-1.3.4-r1.ebuild 908
 RMD160 42d9ba6a1da7a6c5937a70f5da9a9cfc269ca2cd g-wrap-1.3.4-r1.ebuild 908
@@ -40,10 +47,14 @@ EBUILD g-wrap-1.9.7-r3.ebuild 1340 RMD160 18df8b2335fd9f194432ae93afed126fe8dd54
 MD5 79cb3afa3e20d5ae83c23fc76767d928 g-wrap-1.9.7-r3.ebuild 1340
 RMD160 18df8b2335fd9f194432ae93afed126fe8dd5428 g-wrap-1.9.7-r3.ebuild 1340
 SHA256 00b0e5cf7e0b63da405273c2f891eeb0600648a59170837e1235e676e43bbca8 g-wrap-1.9.7-r3.ebuild 1340
-MISC ChangeLog 7005 RMD160 9ecb1fbe135d9a195fc7c02d1e93936874ddc9a8 SHA1 1f32bd76602db2bb7b656803a2eb85c743fab5a0 SHA256 0416e94191814d26c479cdf101d506c2a24981519b483f4435a606868d547704
-MD5 c1d6f300d4878eb02c293ee82c4fbff3 ChangeLog 7005
-RMD160 9ecb1fbe135d9a195fc7c02d1e93936874ddc9a8 ChangeLog 7005
-SHA256 0416e94191814d26c479cdf101d506c2a24981519b483f4435a606868d547704 ChangeLog 7005
+EBUILD g-wrap-1.9.8.ebuild 1568 RMD160 6dd717ac9d9347621d46a73178adb9af34941e07 SHA1 60e1a490a8bc9b315a4b03e72bbf70ffb5d45948 SHA256 4c2e0fec4910b22ba89969aac18051496499dd1be16a3b3aa2ae989523359d5d
+MD5 122cfacb90868233ada3f5ed85a7ca4f g-wrap-1.9.8.ebuild 1568
+RMD160 6dd717ac9d9347621d46a73178adb9af34941e07 g-wrap-1.9.8.ebuild 1568
+SHA256 4c2e0fec4910b22ba89969aac18051496499dd1be16a3b3aa2ae989523359d5d g-wrap-1.9.8.ebuild 1568
+MISC ChangeLog 7604 RMD160 eddf1cefb4f3d1d0a162f4a15186ad7fac904f81 SHA1 265e31fec6ac60649e91fee55269288d1c067429 SHA256 fd8c94b4d93b1912f9d617def29c1a47592181e39f691a5f85c8b05a42921eeb
+MD5 3e859e5e7f338f52b9ed23d652daf3e9 ChangeLog 7604
+RMD160 eddf1cefb4f3d1d0a162f4a15186ad7fac904f81 ChangeLog 7604
+SHA256 fd8c94b4d93b1912f9d617def29c1a47592181e39f691a5f85c8b05a42921eeb ChangeLog 7604
 MISC metadata.xml 468 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 SHA1 5627c00d4d4884e9d89a39eeac7e3a7cf51e6a44 SHA256 99779e068e75c9c4ceb9bc64b787f1c944ff1f3e45e659bee5eb04835498a936
 MD5 cb23790b246158fbaee5857f8ee9dea4 metadata.xml 468
 RMD160 110e67df4ca1cc3d6204b0066f1f2503671fc742 metadata.xml 468
@@ -57,10 +68,6 @@ SHA256 c300467065e5bfcbf694a59d0a1b0b6bd416760dc6705dd536cfbc1332247b85 files/di
 MD5 37000183ad6896bcc388dbf244e12ad8 files/digest-g-wrap-1.9.7-r3 238
 RMD160 3c46d0df2f2ecd0dbd55902b941a38065aa85fc0 files/digest-g-wrap-1.9.7-r3 238
 SHA256 e31944bc17cdcbb6bc46e819672d07805eb30c18890050e3fc294eec62534cd6 files/digest-g-wrap-1.9.7-r3 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGE/z1kT4lNIS36YERAnuNAJ96OifH9janUXGy3NSaLHR4dIBIdgCeJTW7
-gbcb7BBKGH75R9wF8tTW0/w=
-=ahpu
------END PGP SIGNATURE-----
+MD5 029ed607623bd096add25e4683569325 files/digest-g-wrap-1.9.8 512
+RMD160 c18030c3f990d5779822ffa64652875578605241 files/digest-g-wrap-1.9.8 512
+SHA256 70d085aae21941c46f2444532bc0ec0c5edd072768e9916453c84b05a758c737 files/digest-g-wrap-1.9.8 512
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*
+}