From 511de054920d6e2f43eb973d13aee9b4e3e9a926 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Jul 2018 19:05:26 +0100
Subject: gentoo resync : 21.07.2018

---
 mail-filter/scmail/files/scmail-doc-encoding.diff  | 28 ------------
 mail-filter/scmail/files/scmail-doc-encoding.patch | 28 ++++++++++++
 mail-filter/scmail/files/scmail-gauche-0.9.diff    | 35 ---------------
 mail-filter/scmail/files/scmail-gauche-0.9.patch   | 35 +++++++++++++++
 .../scmail/files/scmail-undefined-reference.patch  | 51 ++++++++++++++++++++++
 5 files changed, 114 insertions(+), 63 deletions(-)
 delete mode 100644 mail-filter/scmail/files/scmail-doc-encoding.diff
 create mode 100644 mail-filter/scmail/files/scmail-doc-encoding.patch
 delete mode 100644 mail-filter/scmail/files/scmail-gauche-0.9.diff
 create mode 100644 mail-filter/scmail/files/scmail-gauche-0.9.patch
 create mode 100644 mail-filter/scmail/files/scmail-undefined-reference.patch

(limited to 'mail-filter/scmail/files')

diff --git a/mail-filter/scmail/files/scmail-doc-encoding.diff b/mail-filter/scmail/files/scmail-doc-encoding.diff
deleted file mode 100644
index 5ed00a62d02d..000000000000
--- a/mail-filter/scmail/files/scmail-doc-encoding.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- scmail-1.3.orig/doc/embed.scm
-+++ scmail-1.3/doc/embed.scm
-@@ -1,3 +1,4 @@
-+(use gauche.charconv)
- (use gauche.regexp)
- (define (escape str)
-   (set! str (regexp-replace-all #/&/ str "&amp;"))
-@@ -15,12 +16,18 @@
- (define (main args)
-   (call-with-input-file (cadr args)
-     (lambda (in)
--      (let* ((content (port->string in))
-+      (let* ((content (port->string (open-input-conversion-port in "*jp")))
-              (content (regexp-replace-all #/#\{(.*?)\}/ content
-                                           (lambda (m)
-                                             (string-append 
-                                              "<pre>\n"
-                                              (read-file-and-escape (rxmatch-substring m 1))
--                                             "</pre>\n")))))
-+                                             "</pre>\n"))))
-+             (content (regexp-replace #/(encoding=").*?(")/ content
-+                                      (lambda (m)
-+                                        (string-append
-+                                         (rxmatch-substring m 1)
-+                                         (ces-guess-from-string content "*jp")
-+                                         (rxmatch-substring m 2))))))
-         (display content))))
-   0)
diff --git a/mail-filter/scmail/files/scmail-doc-encoding.patch b/mail-filter/scmail/files/scmail-doc-encoding.patch
new file mode 100644
index 000000000000..8740774379f9
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-doc-encoding.patch
@@ -0,0 +1,28 @@
+--- a/doc/embed.scm
++++ b/doc/embed.scm
+@@ -1,3 +1,4 @@
++(use gauche.charconv)
+ (use gauche.regexp)
+ (define (escape str)
+   (set! str (regexp-replace-all #/&/ str "&amp;"))
+@@ -15,12 +16,18 @@
+ (define (main args)
+   (call-with-input-file (cadr args)
+     (lambda (in)
+-      (let* ((content (port->string in))
++      (let* ((content (port->string (open-input-conversion-port in "*jp")))
+              (content (regexp-replace-all #/#\{(.*?)\}/ content
+                                           (lambda (m)
+                                             (string-append 
+                                              "<pre>\n"
+                                              (read-file-and-escape (rxmatch-substring m 1))
+-                                             "</pre>\n")))))
++                                             "</pre>\n"))))
++             (content (regexp-replace #/(encoding=").*?(")/ content
++                                      (lambda (m)
++                                        (string-append
++                                         (rxmatch-substring m 1)
++                                         (ces-guess-from-string content "*jp")
++                                         (rxmatch-substring m 2))))))
+         (display content))))
+   0)
diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.diff b/mail-filter/scmail/files/scmail-gauche-0.9.diff
deleted file mode 100644
index 36fc3b3daa77..000000000000
--- a/mail-filter/scmail/files/scmail-gauche-0.9.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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/files/scmail-gauche-0.9.patch b/mail-filter/scmail/files/scmail-gauche-0.9.patch
new file mode 100644
index 000000000000..9062df4eb71d
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-gauche-0.9.patch
@@ -0,0 +1,35 @@
+--- a/scbayes.in
++++ b/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/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)))
+ 
+ 
-- 
cgit v1.2.3