gentoo resync : 21.07.2018

3 files changed, 55 insertions, 4 deletions

diff --git a/mail-filter/scmail/files/scmail-doc-encoding.diff b/mail-filter/scmail/files/scmail-doc-encoding.patch
index 5ed00a62d02d..8740774379f9 100644
--- a/mail-filter/scmail/files/scmail-doc-encoding.diff
+++ b/mail-filter/scmail/files/scmail-doc-encoding.patch
@@ -1,5 +1,5 @@
---- scmail-1.3.orig/doc/embed.scm
-+++ scmail-1.3/doc/embed.scm
+--- a/doc/embed.scm
++++ b/doc/embed.scm
 @@ -1,3 +1,4 @@
 +(use gauche.charconv)
  (use gauche.regexp)
diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.diff b/mail-filter/scmail/files/scmail-gauche-0.9.patch
index 36fc3b3daa77..9062df4eb71d 100644
--- a/mail-filter/scmail/files/scmail-gauche-0.9.diff
+++ b/mail-filter/scmail/files/scmail-gauche-0.9.patch
@@ -1,5 +1,5 @@
---- scmail-1.3.orig/scbayes.in
-+++ scmail-1.3/scbayes.in
+--- a/scbayes.in
++++ b/scbayes.in
 @@ -16,6 +16,7 @@
  
  (use gauche.parseopt)
diff --git a/mail-filter/scmail/files/scmail-undefined-reference.patch b/mail-filter/scmail/files/scmail-undefined-reference.patch
new file mode 100644
index 000000000000..5059ef4b1fd2
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-undefined-reference.patch
@@ -0,0 +1,51 @@
+--- a/scmail/config.scm
++++ b/scmail/config.scm
+@@ -30,6 +30,8 @@
+ 	  ))
+ (select-module scmail.config)
+ 
++(autoload scmail.util scmail-eformat)
++
+ (define scmail-config-directory (make-parameter (expand-path "~/.scmail")))
+ 
+ (define (scmail-config-set-directory! directory)
+--- a/scmail/mailbox.scm
++++ b/scmail/mailbox.scm
+@@ -19,6 +19,7 @@
+   (use srfi-1)
+   (use file.util)
+   (use gauche.parameter)
++  (use scmail.util)
+   (export <mailbox>
+           make-scmail-mailbox
+           scmail-mailbox-mail-list
+--- a/scmail/util.scm
++++ b/scmail/util.scm
+@@ -19,7 +19,6 @@
+   (use file.util)
+   (use srfi-13)
+   (use gauche.parameter)
+-  (use scmail.config)
+   (use scmail.progress)
+   (use gauche.version)
+   (export filter safe-rxmatch 
+@@ -31,6 +30,8 @@
+ 
+ (select-module scmail.util)
+ 
++(autoload scmail.config scmail-config-verbose-mode?)
++
+ ;;
+ ;; FIXME: Reinvent it because filter in srfi-1 module is too
+ ;; slow in old Gauche implementations.
+--- a/scmail.scm
++++ b/scmail.scm
+@@ -264,7 +264,7 @@
+               (unless (eq? status :last)
+                       (scmail-filter-iter mail (cdr filter-rules))))))
+   (unless (is-a? mail <mail>)
+-          (scmail-eprintf "<mail> required but got ~a" (class-of mail)))
++          (scmail-eformat "<mail> required but got ~a" (class-of mail)))
+   (scmail-filter-iter mail (filter-rules)))
+ 
+