fixes bug #299883.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/mail-filter/scmail/ChangeLog b/mail-filter/scmail/ChangeLog
index 8b17bb7c0d98a1262edf0da52cd06463c89ee4a8..6ed7728e08fdac187187c88ba48b9fc5ea83067b 100644 (file)
--- 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/Manifest b/mail-filter/scmail/Manifest
index d2d4e04c0299c2237438847c7ee4f9867950379c..c91fdb93c066666a9b346fbdd83989e0e5a780bc 100644 (file)
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -1,4 +1,5 @@
+AUX scmail-gauche-0.9.diff 1318 RMD160 e19bfa22264e53e29f8c5233b341230256cd4129 SHA1 7bf5c2ba0f0acdfdf13211ab9cb18b73de50cb15 SHA256 5d1d27c09d7ffcd9d986f3a0b3b11fb6e3691fc2c4d5f168274859a852f76c47
 DIST scmail-1.3.tar.gz 52744 RMD160 484d8ca291b970dd070680ece1ed155646b5fa96 SHA1 bb1b9cecdaa994b76307162fe2f4e67240c5d13d SHA256 04648e6d9d48e934b2324596d2b0b887cc6d8b324d4d6533e248ba511b6bb525
-EBUILD scmail-1.3.ebuild 720 RMD160 6ca4b43a51139e8a46d24be30e41a13fb16a5b88 SHA1 8a07a9a7a5c1a605f03ef9679b2c72694c03d6c8 SHA256 8392118d97ea41ad2f4be12505c1a7563088074ad782e4599c44e4a98adceee4
-MISC ChangeLog 2135 RMD160 c128c86847f13890a57cdd345606cb7eca09b889 SHA1 079c391cab315e2ba45fd26b422d90e7b31ccfd1 SHA256 c4cffdbdacb9a6e6f663daf3d303a13b32cae6da7cf0e07f10b41eb99a892695
+EBUILD scmail-1.3.ebuild 830 RMD160 f81fa7450a857ab1a0e3ee041436d89313fe2c58 SHA1 561c0d85c2e93466c860b93d690cc659e0686934 SHA256 14e388b14cbe097d082a0d2a80098ff219577fd60df396c23512f7fdc7f2b1fb
+MISC ChangeLog 2261 RMD160 94fb57cc69e4a2e8b48fda3516dac19b4ee3a6ae SHA1 494642e03d65e46b36de7a5bade7073dc2c054d6 SHA256 fe460bdfc81f7c175bad5d3d58da4c121b787b878fd0c2e2a7ecc3fbc55af9d0
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae

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 (file)
index 0000000..36fc3b3
--- /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 8f22ed7b74b67fda9606e1c1603224b6c104ce2d..ecd4f7362c1fe5a8f0692f321e75dbde4a8a2401 100644 (file)
--- 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() {