stable on x86.

(Portage version: 2.1.2.2)

7 files changed, 9 insertions, 132 deletions

diff --git a/dev-scheme/gauche/ChangeLog b/dev-scheme/gauche/ChangeLog
index dc8bf88cf877..345fcf6ce0a9 100644
--- a/dev-scheme/gauche/ChangeLog
+++ b/dev-scheme/gauche/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-scheme/gauche
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/ChangeLog,v 1.4 2007/02/09 00:02:00 swegener Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/ChangeLog,v 1.5 2007/03/12 14:57:57 hattya Exp $
+
+  12 Mar 2007; Akinori Hattori <hattya@gentoo.org>
+  -files/gauche-0.8.8-report-error.diff, -files/gauche-gauche.m4-cc.diff,
+  -files/gauche-gdbm-gentoo.diff, -gauche-0.8.8.ebuild, gauche-0.8.9.ebuild:
+  stable on x86.
 
   19 Jan 2007; Akinori Hattori <hattya@gentoo.org> gauche-0.8.8.ebuild:
   stable on x86.
diff --git a/dev-scheme/gauche/files/digest-gauche-0.8.8 b/dev-scheme/gauche/files/digest-gauche-0.8.8
deleted file mode 100644
index 5f21d6e343dd..000000000000
--- a/dev-scheme/gauche/files/digest-gauche-0.8.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed12c4e28ec36f68629843c4e8725ccc Gauche-0.8.8.tgz 3022297
-RMD160 dbac8e0359eaa4bf9378d771485fadab678d77e9 Gauche-0.8.8.tgz 3022297
-SHA256 508834bd84a4c5446d6c8d7606246debea5bc88a8b6a06ee6c42f4f93d07cf11 Gauche-0.8.8.tgz 3022297
diff --git a/dev-scheme/gauche/files/gauche-0.8.8-report-error.diff b/dev-scheme/gauche/files/gauche-0.8.8-report-error.diff
deleted file mode 100644
index e0f9559bc684..000000000000
--- a/dev-scheme/gauche/files/gauche-0.8.8-report-error.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: src/main.c
-===================================================================
-RCS file: /cvsroot/gauche/Gauche/src/main.c,v
-retrieving revision 1.92
-retrieving revision 1.93
-diff -u -I$.*$ -r1.92 -r1.93
---- src/main.c	13 Nov 2006 22:38:12 -0000	1.92
-+++ src/main.c	18 Nov 2006 01:20:03 -0000	1.93
-@@ -442,7 +442,10 @@
-             if (r > 0) {
-                 ScmObj res = epak.results[0];
-                 if (SCM_INTP(res)) exit_code = SCM_INT_VALUE(res);
-+                else exit_code = 70;  /* EX_SOFTWARE, see SRFI-22. */
-             } else {
-+                /* NB: better error reporting for uncaptured errors? */
-+                Scm_ReportError(epak.exception);
-                 exit_code = 70;  /* EX_SOFTWARE, see SRFI-22. */
-             }
-         }
diff --git a/dev-scheme/gauche/files/gauche-gauche.m4-cc.diff b/dev-scheme/gauche/files/gauche-gauche.m4-cc.diff
deleted file mode 100644
index e438ffd2deb1..000000000000
--- a/dev-scheme/gauche/files/gauche-gauche.m4-cc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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-scheme/gauche/files/gauche-gdbm-gentoo.diff b/dev-scheme/gauche/files/gauche-gdbm-gentoo.diff
deleted file mode 100644
index a87c8dba692a..000000000000
--- a/dev-scheme/gauche/files/gauche-gdbm-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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-scheme/gauche/gauche-0.8.8.ebuild b/dev-scheme/gauche/gauche-0.8.8.ebuild
deleted file mode 100644
index 68dcfbeccd2f..000000000000
--- a/dev-scheme/gauche/gauche-0.8.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/gauche-0.8.8.ebuild,v 1.2 2007/01/19 11:11:32 hattya Exp $
-
-inherit autotools eutils flag-o-matic
-
-IUSE="ipv6"
-
-MY_P=${P/g/G}
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://gauche.sf.net/"
-SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc x86"
-SLOT="0"
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=sys-libs/gdbm-1.8.0"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-dbm.ac.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-runpath.diff
-	epatch "${FILESDIR}"/${P}-report-error.diff
-
-	eautoconf
-
-}
-
-src_compile() {
-
-	local myconf="--enable-threads=pthreads --enable-multibyte=utf8"
-
-	strip-flags
-
-	econf \
-		`use_enable ipv6` \
-		${myconf} \
-		|| die
-	emake || die
-
-}
-
-src_test() {
-
-	emake -j1 -s check || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog HACKING README
-
-}
-
-pkg_postinst() {
-
-	echo
-	ewarn "As of version 0.8.6, Gauche switched the default character"
-	ewarn "encoding from euc-jp to utf-8."
-	echo
-
-}
diff --git a/dev-scheme/gauche/gauche-0.8.9.ebuild b/dev-scheme/gauche/gauche-0.8.9.ebuild
index b73814b16020..e9ac1e899c24 100644
--- a/dev-scheme/gauche/gauche-0.8.9.ebuild
+++ b/dev-scheme/gauche/gauche-0.8.9.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-scheme/gauche/gauche-0.8.9.ebuild,v 1.1 2007/01/19 11:10:43 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/gauche/gauche-0.8.9.ebuild,v 1.2 2007/03/12 14:57:57 hattya Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://gauche.sf.net/"
 SRC_URI="mirror://sourceforge/gauche/${MY_P}.tgz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc x86"
 SLOT="0"
 S=${WORKDIR}/${MY_P}