Fixes #30569.

4 files changed, 49 insertions, 11 deletions

diff --git a/dev-lisp/gauche/ChangeLog b/dev-lisp/gauche/ChangeLog
index 6637bfecd135..ae24c7e1017e 100644
--- a/dev-lisp/gauche/ChangeLog
+++ b/dev-lisp/gauche/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-lisp/gauche
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gauche/ChangeLog,v 1.8 2003/10/05 17:10:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gauche/ChangeLog,v 1.9 2003/10/08 17:52:33 karltk Exp $
 
+  08 Oct 2003; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  gauche-0.7.2.ebuild:
+  Didn't compile on all boxes with gdbm. Fixes #30569.
+  
 *gauche-0.7.2 (05 Oct 2003)
 
   05 Oct 2003; Karl Trygve Kalleberg <karltk@gentoo.org> 
diff --git a/dev-lisp/gauche/Manifest b/dev-lisp/gauche/Manifest
index 09bf90870db3..5897b5688ee9 100644
--- a/dev-lisp/gauche/Manifest
+++ b/dev-lisp/gauche/Manifest
@@ -2,9 +2,10 @@ MD5 f0b25c1c0e80d62e15843ce1ad00c89b gauche-0.5.7.ebuild 926
 MD5 be98c24253953ad39d9d25796f685301 gauche-0.6.ebuild 920
 MD5 53c75ab7e309bdffb34f74e5ea22f4fe metadata.xml 705
 MD5 5afbc10159d0a6000c0a42524fce1fa2 gauche-0.7.1.ebuild 1261
-MD5 d46e2d1a6b7b1f720c59993854469406 gauche-0.7.2.ebuild 1261
-MD5 96b3a5d51e44374e4a659f695bcd51a2 ChangeLog 1570
+MD5 e52b9b22b099b830754d012b52bb9409 gauche-0.7.2.ebuild 1391
+MD5 36d7e24b0d07b73d021747fde0f60c93 ChangeLog 1709
 MD5 c18c00a2c663b57c0da69ccc7d589d39 files/digest-gauche-0.5.7 62
 MD5 970a94ed0e9da51ed4b007b7a3456111 files/digest-gauche-0.6 60
 MD5 8e1c8c57c6a2b38a3d62148d0e358a91 files/digest-gauche-0.7.1 62
 MD5 cba997bb32757ee9b5991d5dde1b6d6a files/digest-gauche-0.7.2 62
+MD5 177cc4fa4c84d465bab80e5b3adb5cc1 files/gauche-gdbm-gentoo.diff 729
diff --git a/dev-lisp/gauche/files/gauche-gdbm-gentoo.diff b/dev-lisp/gauche/files/gauche-gdbm-gentoo.diff
new file mode 100644
index 000000000000..a87c8dba692a
--- /dev/null
+++ b/dev-lisp/gauche/files/gauche-gdbm-gentoo.diff
@@ -0,0 +1,23 @@
+diff -u ext/dbm/dbm.ac ext/dbm.orig/dbm.ac
+--- ext/dbm/dbm.ac	2003-10-07 17:56:35.000000000 +0900
++++ ext/dbm.orig/dbm.ac	2003-10-07 17:55:47.000000000 +0900
+@@ -16,15 +16,17 @@
+   DBM_ARCHFILES=gdbm.$SHLIB_SO_SUFFIX
+   DBM_SCMFILES=gdbm.scm
+ ])
+-AC_CHECK_HEADERS(ndbm.h gdbm/ndbm.h, [
++AC_CHECK_HEADERS(gdbm/ndbm.h ndbm.h, [
+   NDBM_HEADER=$ac_header
+   DBM_ARCHFILES="ndbm.$SHLIB_SO_SUFFIX $DBM_ARCHFILES"
+   DBM_SCMFILES="ndbm.scm $DBM_SCMFILES"
++  break
+ ])
+-AC_CHECK_HEADERS(dbm.h gdbm/dbm.h, [
++AC_CHECK_HEADERS(gdbm/dbm.h dbm.h, [
+   ODBM_HEADER=$ac_header
+   DBM_ARCHFILES="odbm.$SHLIB_SO_SUFFIX $DBM_ARCHFILES"
+   DBM_SCMFILES="odbm.scm $DBM_SCMFILES"
++  break
+ ])
+ 
+ AC_CHECK_LIB(gdbm, gdbm_open, [ GDBMLIB="-lgdbm" ])
diff --git a/dev-lisp/gauche/gauche-0.7.2.ebuild b/dev-lisp/gauche/gauche-0.7.2.ebuild
index d64cc1cd9228..014a379de9e5 100644
--- a/dev-lisp/gauche/gauche-0.7.2.ebuild
+++ b/dev-lisp/gauche/gauche-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gauche/gauche-0.7.2.ebuild,v 1.1 2003/10/05 17:10:31 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/gauche/gauche-0.7.2.ebuild,v 1.2 2003/10/08 17:52:33 karltk Exp $
 
 inherit flag-o-matic
 
@@ -15,11 +15,18 @@ KEYWORDS="~x86 ~sparc"
 SLOT="0"
 S="${WORKDIR}/Gauche-${PV}"
 
-DEPEND="virtual/glibc
-	>=sys-libs/gdbm-1.8.0-r5"
+DEPEND=">=sys-libs/gdbm-1.8.0-r5"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gdbm-gentoo.diff
+	autoconf
+}
 
 src_compile() {
-	local myconf
+	local myconf mycflags
 
 	use ipv6 && myconf="--enable-ipv6"
 
@@ -36,14 +43,17 @@ src_compile() {
 
 	filter-flags -fforce-addr
 
-	CFLAGS="" CXXFLAGS="" econf $myconf --enable-threads=pthreads
-	emake OPTFLAGS="$CFLAGS"
+	mycflags=${CFLAGS}
+	unset CFLAGS CXXFLAGS
 
-	make check
+	econf ${myconf} --enable-threads=pthreads || die
+	emake OPTFLAGS="${mycflags}" || die
+
+	make -s check || die
 }
 
 src_install () {
-#	einstall
+
 	make install DESTDIR=${D}
 
 	dodoc AUTHORS COPYING ChangeLog HACKING INSTALL INSTALL.eucjp README