[gentoo-commits] repo/gentoo:master commit in: mail-filter/scmail/, mail-filter/scmail/files/

2022-06-30 Thread Akinori Hattori
commit: 1b45410033de7e30b16d546f3a27c16f9f64339f
Author: Akinori Hattori  gentoo  org>
AuthorDate: Thu Jun 30 13:57:20 2022 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Thu Jun 30 13:57:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b454100

mail-filter/scmail: fix tests with >=dev-scheme/gauche-0.9.10

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 .../scmail/files/scmail-gauche-0.9.10.patch| 22 ++
 mail-filter/scmail/scmail-1.3.ebuild   |  1 +
 2 files changed, 23 insertions(+)

diff --git a/mail-filter/scmail/files/scmail-gauche-0.9.10.patch 
b/mail-filter/scmail/files/scmail-gauche-0.9.10.patch
new file mode 100644
index ..ab6f5e04d2f6
--- /dev/null
+++ b/mail-filter/scmail/files/scmail-gauche-0.9.10.patch
@@ -0,0 +1,22 @@
+--- a/scmail/mail.scm
 b/scmail/mail.scm
+@@ -202,7 +202,7 @@
+ (send-command "DATA" 354)
+ (port-for-each (lambda (line)
+(format out "~a~a\r\n"
+-   (if (string-prefix? "." line) "." "")
++   (if (and (not (string-incomplete? line)) 
(string-prefix? "." line)) "." "")
+line))
+(lambda () (read-line iport #t)))
+ (send-command "." 250)
+--- a/tests/mailbox.scm
 b/tests/mailbox.scm
+@@ -9,7 +9,7 @@
+ (test-module 'scmail.mailbox)
+ 
+ (define mailbox-table
+-  '((mh  #f "Mail""inbox")
++  `((mh  #f "Mail""inbox")
+ (maildir #f "Maildir" "")))
+ 
+ (define (mailbox-list)

diff --git a/mail-filter/scmail/scmail-1.3.ebuild 
b/mail-filter/scmail/scmail-1.3.ebuild
index 8c4b73406d53..25809d282452 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-doc-encoding.patch
"${FILESDIR}"/${PN}-gauche-0.9.patch
+   "${FILESDIR}"/${PN}-gauche-0.9.10.patch
"${FILESDIR}"/${PN}-undefined-reference.patch
 )
 HTML_DOCS=( doc/{${PN},scbayes}{,-ja}.html )



[gentoo-commits] repo/gentoo:master commit in: mail-filter/scmail/, mail-filter/scmail/files/

2018-07-17 Thread Akinori Hattori
commit: 4b07d5e71450371bfdfd2cef6c3fa509de5a8ae0
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Jul 17 13:23:07 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Jul 17 13:29:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b07d5e7

mail-filter/scmail: update patches

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/{scmail-doc-encoding.diff => scmail-doc-encoding.patch} | 4 ++--
 .../scmail/files/{scmail-gauche-0.9.diff => scmail-gauche-0.9.patch}  | 4 ++--
 mail-filter/scmail/scmail-1.3.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-filter/scmail/files/scmail-doc-encoding.diff 
b/mail-filter/scmail/files/scmail-doc-encoding.patch
similarity index 95%
rename from mail-filter/scmail/files/scmail-doc-encoding.diff
rename to mail-filter/scmail/files/scmail-doc-encoding.patch
index 5ed00a62d02..8740774379f 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
similarity index 95%
rename from mail-filter/scmail/files/scmail-gauche-0.9.diff
rename to mail-filter/scmail/files/scmail-gauche-0.9.patch
index 36fc3b3daa7..9062df4eb71 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/scmail-1.3.ebuild 
b/mail-filter/scmail/scmail-1.3.ebuild
index 1b7035efd7d..2d807f3fdee 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -18,8 +18,8 @@ RDEPEND="dev-scheme/gauche"
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-doc-encoding.diff
-   "${FILESDIR}"/${PN}-gauche-0.9.diff
+   "${FILESDIR}"/${PN}-doc-encoding.patch
+   "${FILESDIR}"/${PN}-gauche-0.9.patch
 )
 HTML_DOCS=( doc/{${PN},scbayes}{,-ja}.html )
 



[gentoo-commits] repo/gentoo:master commit in: mail-filter/scmail/, mail-filter/scmail/files/

2018-07-17 Thread Akinori Hattori
commit: 9bd3a6af8d7a63ee6b3b8ff5f4c943c9c978e0ce
Author: Akinori Hattori  gentoo  org>
AuthorDate: Tue Jul 17 13:25:18 2018 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Tue Jul 17 13:29:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd3a6af

mail-filter/scmail: fix undefined reference

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../scmail/files/scmail-undefined-reference.patch  | 51 ++
 mail-filter/scmail/scmail-1.3.ebuild   |  1 +
 2 files changed, 52 insertions(+)

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 000..5059ef4b1fd
--- /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 
+   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 )
+-  (scmail-eprintf " required but got ~a" (class-of mail)))
++  (scmail-eformat " required but got ~a" (class-of mail)))
+   (scmail-filter-iter mail (filter-rules)))
+ 
+ 

diff --git a/mail-filter/scmail/scmail-1.3.ebuild 
b/mail-filter/scmail/scmail-1.3.ebuild
index 2d807f3fdee..8e65b389804 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-1.3.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-doc-encoding.patch
"${FILESDIR}"/${PN}-gauche-0.9.patch
+   "${FILESDIR}"/${PN}-undefined-reference.patch
 )
 HTML_DOCS=( doc/{${PN},scbayes}{,-ja}.html )