fixes bug #299883.

(Portage version: 2.1.7.17/cvs/Linux i686)

3 files changed, 52 insertions, 9 deletions

diff --git a/mail-filter/scmail/ChangeLog b/mail-filter/scmail/ChangeLog
index 8b17bb7c0d98..6ed7728e08fd 100644
--- a/mail-filter/scmail/ChangeLog
+++ b/mail-filter/scmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/scmail
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.9 2009/08/16 07:17:05 hattya Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.10 2010/04/11 10:08:49 hattya Exp $
+
+  11 Apr 2010; Akinori Hattori <hattya@gentoo.org>
+  +files/scmail-gauche-0.9.diff, scmail-1.3.ebuild:
+  fixes bug #299883.
 
   16 Aug 2009; Akinori Hattori <hattya@gentoo.org> scmail-1.3.ebuild:
   fixes bug #276896.
diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.diff b/mail-filter/scmail/files/scmail-gauche-0.9.diff
new file mode 100644
index 000000000000..36fc3b3daa77
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-gauche-0.9.diff
@@ -0,0 +1,35 @@
+--- scmail-1.3.orig/scbayes.in
++++ scmail-1.3/scbayes.in
+@@ -16,6 +16,7 @@
+ 
+ (use gauche.parseopt)
+ (use gauche.parameter)
++(use gauche.version)
+ (use dbm)
+ (use dbm.gdbm) ;; should be customizable
+ (use util.digest)
+@@ -130,12 +131,18 @@
+      (sys-rename (temporary-table-file) (table-file))
+      (sys-rename (temporary-digest-file) (digest-file)))))
+ 
+-(define (lock)
+-  (unless (eq? (create-directory* (lock-file)) #t)
+-     (scmail-wformat "~a is now being updated" (table-file))
+-     (scmail-wformat "or perhaps ~a is staled." (lock-file))
+-     (scmail-eformat "(Please remove the lock file if it is staled.)"))
+-  )
++(if (version<? (gauche-version) "0.9")
++    (define (lock)
++      (unless (eq? (create-directory* (lock-file)) #t)
++        (scmail-wformat "~a is now being updated" (table-file))
++        (scmail-wformat "or perhaps ~a is staled." (lock-file))
++        (scmail-eformat "(Please remove the lock file if it is staled.)")))
++    (define (lock)
++      (guard (e (else
++                 (scmail-wformat "~a is now being updated" (table-file))
++                 (scmail-wformat "or perhaps ~a is staled." (lock-file))
++                 (scmail-eformat "(Please remove the lock file if it is staled.)")))
++        (create-directory* (lock-file)))))
+ 
+ (define force-learn? (make-parameter #f))
+ 
diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index 8f22ed7b74b6..ecd4f7362c1f 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.3.ebuild,v 1.5 2009/08/16 07:17:05 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.3.ebuild,v 1.6 2010/04/11 10:08:49 hattya Exp $
 
-inherit fixheadtails
+EAPI="2"
+
+inherit eutils fixheadtails
 
 IUSE=""
 
@@ -14,15 +16,17 @@ LICENSE="BSD"
 KEYWORDS="x86 ~ppc"
 SLOT="0"
 
-DEPEND=">=dev-scheme/gauche-0.7.4.1"
+DEPEND="dev-scheme/gauche"
 
-src_unpack() {
+src_prepare() {
 
-	unpack ${A}
-	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-gauche-0.9.diff
 
 	ht_fix_file tests/scmail-commands
 
+	# replace make -> $(MAKE)
+	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile || die
+
 }
 
 src_install() {