From 4b07d5e71450371bfdfd2cef6c3fa509de5a8ae0 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Tue, 17 Jul 2018 22:23:07 +0900 Subject: mail-filter/scmail: update patches Package-Manager: Portage-2.3.40, Repoman-2.3.9 --- 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 ++++++++++++++++++++++ mail-filter/scmail/scmail-1.3.ebuild | 4 +-- 5 files changed, 65 insertions(+), 65 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 (limited to 'mail-filter') 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 "&")) -@@ -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 - "
\n"
-                                              (read-file-and-escape (rxmatch-substring m 1))
--                                             "
\n"))))) -+ "\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 "&")) +@@ -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 + "
\n"
+                                              (read-file-and-escape (rxmatch-substring m 1))
+-                                             "
\n"))))) ++ "\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