fixes dynamic link problem of dbm.ndbm.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 75 insertions, 15 deletions

diff --git a/dev-lang/gauche/ChangeLog b/dev-lang/gauche/ChangeLog
index 04f1ae3d12eb..e45aa8b5d2bd 100644
--- a/dev-lang/gauche/ChangeLog
+++ b/dev-lang/gauche/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gauche
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/ChangeLog,v 1.23 2006/04/20 14:48:02 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/ChangeLog,v 1.24 2006/07/14 13:27:39 hattya Exp $
+
+  14 Jul 2006; Akinori Hattori <hattya@gentoo.org>
+  -files/gauche-aclocal.m4-1.31.diff, -files/gauche-aclocal.m4-cc.diff,
+  +files/gauche-dbm.ac.diff, +files/gauche-gauche.m4.diff,
+  gauche-0.8.7.ebuild:
+  fixes dynamic link problem of dbm.ndbm.
 
 *gauche-0.8.7 (20 Apr 2006)
 
diff --git a/dev-lang/gauche/files/digest-gauche-0.8.7 b/dev-lang/gauche/files/digest-gauche-0.8.7
index 43aa1c56450e..14ce7c635c89 100644
--- a/dev-lang/gauche/files/digest-gauche-0.8.7
+++ b/dev-lang/gauche/files/digest-gauche-0.8.7
@@ -1 +1,3 @@
 MD5 5c7cb6eba7455c9877aec884b0088a25 Gauche-0.8.7.tgz 2939701
+RMD160 ebfa445419d86e67c0677856e5ffc959ff0220eb Gauche-0.8.7.tgz 2939701
+SHA256 4b8ff6064529c457c81b9bc5205cb1ec3cd6f316735de0d1b611f97cccfe655c Gauche-0.8.7.tgz 2939701
diff --git a/dev-lang/gauche/files/gauche-dbm.ac.diff b/dev-lang/gauche/files/gauche-dbm.ac.diff
new file mode 100644
index 000000000000..de96484cf592
--- /dev/null
+++ b/dev-lang/gauche/files/gauche-dbm.ac.diff
@@ -0,0 +1,37 @@
+diff -ur -x'config*' Gauche-0.8.7.orig/ext/dbm/dbm.ac Gauche-0.8.7/ext/dbm/dbm.ac
+--- Gauche-0.8.7.orig/ext/dbm/dbm.ac	2003-07-20 19:06:48.000000000 +0900
++++ Gauche-0.8.7/ext/dbm/dbm.ac	2006-06-06 05:54:22.000000000 +0900
+@@ -20,27 +20,23 @@
+   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, [
+   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" ])
+ LIBSAVE="$LIBS"
+-if test "$NDBM_HEADER" = "gdbm/ndbm.h"; then
+-  NDBMLIB="-lgdbm"  # use emulation by gdbm
+-else
+-  AC_SEARCH_LIBS(dbm_open, ndbm gdbm gdbm_compat,
++LIBS=""
++  AC_SEARCH_LIBS(dbm_open, ndbm gdbm "gdbm_compat -lgdbm",
+     [ NDBMLIB="$LIBS"; LIBS="$LIBSAVE" ])
+-fi
+-if test "$ODBM_HEADER" = "gdbm/dbm.h"; then
+-  ODBMLIB="-lgdbm"  # use emulation by gdbm
+-else
+-  AC_SEARCH_LIBS(dbminit,  dbm gdbm gdbm_compat,
++  AC_SEARCH_LIBS(dbminit,  dbm gdbm "gdbm_compat -lgdbm",
+     [ ODBMLIB="$LIBS"; LIBS="$LIBSAVE" ])
+-fi
++LIBS="$LIBSAVE"
+ 
+ AC_SUBST(DBM_ARCHFILES)
+ AC_SUBST(DBM_SCMFILES)
diff --git a/dev-lang/gauche/files/gauche-gauche.m4.diff b/dev-lang/gauche/files/gauche-gauche.m4.diff
new file mode 100644
index 000000000000..e438ffd2deb1
--- /dev/null
+++ b/dev-lang/gauche/files/gauche-gauche.m4.diff
@@ -0,0 +1,12 @@
+diff -urN Gauche-0.8.6.orig/m4/gauche.m4 Gauche-0.8.6/m4/gauche.m4
+--- Gauche-0.8.6.orig/m4/gauche.m4	2005-10-05 22:31:32.000000000 +0900
++++ Gauche-0.8.6/m4/gauche.m4	2005-11-06 16:50:52.000000000 +0900
+@@ -103,7 +103,7 @@
+   i686-*) I686OPT="-DUSE_I686_PREFETCH";;
+ esac
+ case "$CC" in
+-  gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
++  *gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
+     case "$target" in
+       *mingw*) ;;
+       *)     GCCOPT="-fomit-frame-pointer";;
diff --git a/dev-lang/gauche/gauche-0.8.7.ebuild b/dev-lang/gauche/gauche-0.8.7.ebuild
index f520feb67e17..1d89e59d3a72 100644
--- a/dev-lang/gauche/gauche-0.8.7.ebuild
+++ b/dev-lang/gauche/gauche-0.8.7.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.7.ebuild,v 1.1 2006/04/20 14:48:02 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gauche/gauche-0.8.7.ebuild,v 1.2 2006/07/14 13:27:39 hattya Exp $
 
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic
 
 IUSE="ipv6"
 
-MY_P="${P/g/G}"
+MY_P=${P/g/G}
 
 DESCRIPTION="A Unix system friendly Scheme Interpreter"
 HOMEPAGE="http://gauche.sf.net/"
@@ -15,19 +15,20 @@ SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DEPEND=">=sys-libs/gdbm-1.8.0"
 
 src_unpack() {
 
 	unpack ${A}
+	cd "${S}"
 
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-gdbm-gentoo.diff
-	epatch ${FILESDIR}/${PN}-gauche.m4-cc.diff
-	epatch ${FILESDIR}/${PN}-runpath.diff
-	autoconf
+	epatch "${FILESDIR}"/${PN}-dbm.ac.diff
+	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
+	epatch "${FILESDIR}"/${PN}-runpath.diff
+
+	eautoconf
 
 }
 
@@ -35,23 +36,25 @@ src_compile() {
 
 	local myconf="--enable-threads=pthreads --enable-multibyte=utf8"
 
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
 	strip-flags
-	econf ${myconf} || die
+
+	econf \
+		`use_enable ipv6` \
+		${myconf} \
+		|| die
 	emake || die
 
 }
 
 src_test() {
 
-	make -s check || die
+	emake -j1 -s check || die
 
 }
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog HACKING README