Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/files/, dev-scheme/gauche/
Date: Tue, 29 Nov 2016 10:48:49
Message-Id: 1480416511.5d83e860ea62e3fb89adf982df0c03c81d2df1ea.hattya@gentoo
1 commit: 5d83e860ea62e3fb89adf982df0c03c81d2df1ea
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 29 10:48:31 2016 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 29 10:48:31 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d83e860
7
8 dev-scheme/gauche: fix tests
9
10 Package-Manager: portage-2.3.0
11
12 dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch | 5 +++--
13 .../gauche/files/gauche-0.9.3.3-file.util.patch | 21 +++++++++++++++++++++
14 dev-scheme/gauche/gauche-0.9.3.3.ebuild | 1 +
15 3 files changed, 25 insertions(+), 2 deletions(-)
16
17 diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
18 index 662ab43..0bce39a 100644
19 --- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
20 +++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
21 @@ -1,11 +1,12 @@
22 --- Gauche-0.9.3.2.orig/ext/tls/Makefile.in
23 +++ Gauche-0.9.3.2/ext/tls/Makefile.in
24 -@@ -77,6 +77,8 @@
25 +@@ -77,6 +77,9 @@
26 @sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \
27 -e "s/system/safe_system/g" \
28 -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \
29 + -e "/do_reneg = 1;/i#if 0" \
30 -+ -e "/do_reneg = 0;/a#endif" \
31 ++ -e "/do_reneg = 0;/a#endif" \
32 ++ -e "/SSL_server_test(/,/)/s/ -tls1//" \
33 $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED)
34 @cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED)
35
36
37 diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch
38 new file mode 100644
39 index 00000000..1e4cd5d
40 --- /dev/null
41 +++ b/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch
42 @@ -0,0 +1,21 @@
43 +commit 15fb279dccb83d66d7e866a0e6f4e3f9ff64fd8d
44 +Author: Shiro Kawai <shiro@×××.org>
45 +Date: Thu Nov 29 23:17:55 2012 -1000
46 +
47 + Fix file.util test
48 +
49 + The current test may fail when a size of a directory happens to
50 + 100. Patch from NIIBE Yutaka.
51 +
52 +--- a/ext/file/test.scm
53 ++++ b/ext/file/test.scm
54 +@@ -290,7 +290,8 @@
55 + (reverse
56 + (directory-fold "test.out"
57 + (^[path result]
58 +- (if (= (file-size path) 100)
59 ++ (if (and (file-is-regular? path)
60 ++ (= (file-size path) 100))
61 + (cons path result)
62 + result))
63 + '()
64
65 diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
66 index 675346c..5ccedde 100644
67 --- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
68 +++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
69 @@ -29,6 +29,7 @@ PATCHES=(
70 "${FILESDIR}"/${PN}-0.9-xz-info.patch
71 "${FILESDIR}"/${PN}-0.9-rfc.tls.patch
72 "${FILESDIR}"/${P}-gauche.threads.patch
73 + "${FILESDIR}"/${P}-file.util.patch
74 )
75
76 src_prepare() {