[gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2016-11-27  7:25 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2016-11-27  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     af870db01eb3bc19dbcf061522933eda9923265e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 07:25:09 2016 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 07:25:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af870db0

dev-scheme/gauche: rename patches

Package-Manager: portage-2.3.0

 ...uche-ext-ldflags.diff => gauche-0.9-ext-ldflags.patch} |  0
 .../{gauche-gauche.m4.diff => gauche-0.9-gauche.m4.patch} |  0
 .../{gauche-rfc.tls.diff => gauche-0.9-rfc.tls.patch}     |  0
 .../files/{gauche-rpath.diff => gauche-0.9-rpath.patch}   |  0
 .../{gauche-xz-info.diff => gauche-0.9-xz-info.patch}     |  0
 ...e.threads.diff => gauche-0.9.3.3-gauche.threads.patch} |  0
 dev-scheme/gauche/gauche-0.9.3.3.ebuild                   | 15 ++++++++-------
 dev-scheme/gauche/gauche-0.9.4-r1.ebuild                  | 12 ++++++------
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.diff b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-ext-ldflags.diff
rename to dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch

diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.diff b/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-gauche.m4.diff
rename to dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch

diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.diff b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-rfc.tls.diff
rename to dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch

diff --git a/dev-scheme/gauche/files/gauche-rpath.diff b/dev-scheme/gauche/files/gauche-0.9-rpath.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-rpath.diff
rename to dev-scheme/gauche/files/gauche-0.9-rpath.patch

diff --git a/dev-scheme/gauche/files/gauche-xz-info.diff b/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-xz-info.diff
rename to dev-scheme/gauche/files/gauche-0.9-xz-info.patch

diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.diff b/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.diff
rename to dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch

diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
index da7ad5f..ba9bc8d 100644
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,12 +24,13 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
-	epatch "${FILESDIR}"/${PN}-xz-info.diff
-	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
-	epatch "${FILESDIR}"/${P}-gauche.threads.diff
+	epatch "${FILESDIR}"/${PN}-0.9-rpath.patch
+	epatch "${FILESDIR}"/${PN}-0.9-gauche.m4.patch
+	epatch "${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-0.9-xz-info.patch
+	epatch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch
+	epatch "${FILESDIR}"/${P}-gauche.threads.patch
+
 	eautoconf
 }
 

diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
index 2dbbe97..03d53dc 100644
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
-	epatch "${FILESDIR}"/${PN}-xz-info.diff
-	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
+	epatch "${FILESDIR}"/${PN}-0.9-rpath.patch
+	epatch "${FILESDIR}"/${PN}-0.9-gauche.m4.patch
+	epatch "${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-0.9-xz-info.patch
+	epatch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch
 
 	mv gc/src/*.[Ss] gc || die
 	sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2016-11-27  7:35 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2016-11-27  7:35 UTC (permalink / raw
  To: gentoo-commits

commit:     b031eefc4323d44e065e23611efb8400ebaa0416
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 07:34:58 2016 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 07:34:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b031eefc

dev-scheme/gauche: new upstream release

Package-Manager: portage-2.3.0

 dev-scheme/gauche/Manifest                         |   1 +
 dev-scheme/gauche/files/gauche-0.9.5-bsd.patch     |  25 +++++
 .../gauche/files/gauche-0.9.5-libressl.patch       |  19 ++++
 dev-scheme/gauche/files/gauche-0.9.5-main.patch    | 116 +++++++++++++++++++++
 dev-scheme/gauche/files/gauche-0.9.5-unicode.patch |  19 ++++
 dev-scheme/gauche/files/gauche-ext-ldflags.patch   |  11 ++
 dev-scheme/gauche/files/gauche-gauche.m4.patch     |  18 ++++
 dev-scheme/gauche/files/gauche-rfc.tls.patch       |  12 +++
 dev-scheme/gauche/files/gauche-rpath.patch         |  10 ++
 dev-scheme/gauche/files/gauche-xz-info.patch       |  31 ++++++
 dev-scheme/gauche/gauche-0.9.5.ebuild              |  59 +++++++++++
 11 files changed, 321 insertions(+)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 18a8e5c..1a47c40 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,2 +1,3 @@
 DIST Gauche-0.9.3.3.tgz 5042189 SHA256 3d8b70075faa0f7a24f8d112cc102ee3e1066680cdd19d324d59f33fab79caac SHA512 5743781d88454d579d853a50c5c7651c52bdcea8b7b2130408e1c7761cee73edfdebaf258342e837ef7d5a3886e08bbb33b2862d1e19585f519ada5cb7475d1c WHIRLPOOL 7b11d62dc3917c3559897833da1248a3f54644159465df0d628fc5b761773ff59740231f57a7add62f2d0b03952f4f18daaf1be7598940d3b0a4719db2c767ab
 DIST Gauche-0.9.4.tgz 5601987 SHA256 7b18bcd70beaced1e004594be46c8cff95795318f6f5830dd2a8a700410fc149 SHA512 815e719d78950a31c238fd7879e09f40d6b3a83a3ebf9d5f7cd3cc7ada081e5f20fbc6b432900e3455bc59e5e60014bf77605b8c9c5f27def53f89284b9cfca3 WHIRLPOOL 354ef81913c6f617589590299f616a50dc1e1313e00d61f0918c9b6c20c0358878cd505f3fb02efa4615730380a6db6bd790e241871fde6cd6e11a662efb113c
+DIST Gauche-0.9.5.tgz 6458675 SHA256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a WHIRLPOOL b29a81a920fac514866dd4a4e2911f2336d37b84ef3b9b3f50a5386f01dacea05580799ff7941e58ba4e29a9eac9289ca5037cd1b49d28a1b05e5bb2a892a907

diff --git a/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
new file mode 100644
index 00000000..615020d
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-bsd.patch
@@ -0,0 +1,25 @@
+commit da2ea76503e8f1784d0f0be26435d4c8e0d1b12f
+Author: Shiro Kawai <shiro@acm.org>
+Date:   Sat Oct 15 11:44:28 2016 -1000
+
+    Avoid preprocessor symbols redefinition on OpenBSD
+
+    https://sourceforge.net/p/gauche/mailman/message/35429549/
+
+diff --git a/ext/net/gauche-net.h b/ext/net/gauche-net.h
+index d4f1dcd..decba64 100644
+--- a/ext/net/gauche-net.h
++++ b/ext/net/gauche-net.h
+@@ -362,8 +362,12 @@ extern ScmObj Scm_GetAddrinfo(const char *nodename,
+                               struct addrinfo *hints);
+ extern ScmObj Scm_GetNameinfo(ScmSockAddr *addr, int flags);
+ 
++#ifndef NI_MAXHOST
+ #define NI_MAXHOST  1025
++#endif
++#ifndef NI_MAXSERV
+ #define NI_MAXSERV    32
++#endif
+ 
+ #endif /* HAVE_IPV6 */
+ 

diff --git a/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
new file mode 100644
index 00000000..7b4c839
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-libressl.patch
@@ -0,0 +1,19 @@
+commit c26a4836e767807dd8c98d280c4d9e742b759edd
+Author: Shiro Kawai <shiro@acm.org>
+Date:   Sun Oct 9 02:04:19 2016 -1000
+
+    rfc.tls - Detect LibreSSL as well
+
+diff --git a/ext/tls/test.scm b/ext/tls/test.scm
+index 63a1d04..efbfbca 100644
+--- a/ext/tls/test.scm
++++ b/ext/tls/test.scm
+@@ -37,7 +37,7 @@
+      [(not gauche.os.windows)
+       (guard (e [(<process-abnormal-exit> e)
+                  (no-openssl "couldn't run openssl command")])
+-        (if-let1 m ($ #/OpenSSL\s+([\d\.]+\w*)/
++        (if-let1 m ($ #/(?:OpenSSL|LibreSSL)\s+([\d\.]+\w*)/
+                       $ process-output->string `(,openssl-cmd "version"))
+           (let1 vers (m 1)
+             (unless (version>=? vers "1.0.1")

diff --git a/dev-scheme/gauche/files/gauche-0.9.5-main.patch b/dev-scheme/gauche/files/gauche-0.9.5-main.patch
new file mode 100644
index 00000000..20f7070
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-main.patch
@@ -0,0 +1,116 @@
+commit 97196adb9dab30e7ab610daf4cc486bfc01ed403
+Author: Shiro Kawai <shiro@acm.org>
+Date:   Mon Oct 17 11:00:44 2016 -1000
+
+    Fix main.c to call 'main' proc properly
+
+    https://github.com/shirok/Gauche/issues/244
+
+diff --git a/src/core.c b/src/core.c
+index 923d116..fc01211 100644
+--- a/src/core.c
++++ b/src/core.c
+@@ -653,9 +653,14 @@ void Scm_SimpleMain(int argc, const char *argv[],
+     ScmModule *user = Scm_UserModule();
+     ScmObj mainproc = Scm_GlobalVariableRef(user, SCM_SYMBOL(SCM_INTERN("main")), 0);
+     if (SCM_PROCEDUREP(mainproc)) {
+-        ScmObj r = Scm_ApplyRec1(mainproc, args);
+-        if (SCM_INTP(r)) Scm_Exit(SCM_INT_VALUE(r));
+-        else             Scm_Exit(70);
++        static ScmObj run_main_proc = SCM_UNDEFINED;
++        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
++        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
++
++        ScmEvalPacket epak;
++        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
++        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
++        Scm_Exit(SCM_INT_VALUE(epak.results[0]));
+     } else {
+         Scm_Exit(70);
+     }
+diff --git a/src/libeval.scm b/src/libeval.scm
+index 2a2c1fc..279fd7f 100644
+--- a/src/libeval.scm
++++ b/src/libeval.scm
+@@ -370,6 +370,17 @@
+        (loop1)))))
+ 
+ ;;;
++;;; Kick 'main' procedure
++;;;   Returns an integer suitable for the exit code.
++;;;   This is mainly to display proper stack trace in case 'main'
++;;;   raises an error.
++(select-module gauche.internal)
++(define (run-main main args)
++  (guard (e [else (report-error e) 70])
++    (let1 r (main args)
++      (if (fixnum? r) r 70))))
++
++;;;
+ ;;; Macros
+ ;;;
+ 
+diff --git a/src/main.c b/src/main.c
+index 46223a6..55660c9 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -502,22 +502,14 @@ int execute_script(const char *scriptfile, ScmObj args)
+                                          SCM_BINDING_STAY_IN_MODULE);
+     }
+     if (SCM_PROCEDUREP(mainproc)) {
+-#if 0 /* Temporarily turned off due to the bug that loses stack traces. */
++        static ScmObj run_main_proc = SCM_UNDEFINED;
++        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
++        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
++        
+         ScmEvalPacket epak;
+-        int r = Scm_Apply(mainproc, SCM_LIST1(args), &epak);
+-        if (r > 0) {
+-            ScmObj res = epak.results[0];
+-            if (SCM_INTP(res)) return SCM_INT_VALUE(res);
+-            else return 70;  /* EX_SOFTWARE, see SRFI-22. */
+-        } else {
+-            Scm_ReportError(epak.exception);
+-            return 70;  /* EX_SOFTWARE, see SRFI-22. */
+-        }
+-#else
+-        ScmObj r = Scm_ApplyRec1(mainproc, args);
+-        if (SCM_INTP(r)) return SCM_INT_VALUE(r);
+-        else             return 70;
+-#endif
++        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
++        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
++        return SCM_INT_VALUE(epak.results[0]);
+     }
+     return 0;
+ }
+diff --git a/test/scripts.scm b/test/scripts.scm
+index 44bb44b..4e6777b 100644
+--- a/test/scripts.scm
++++ b/test/scripts.scm
+@@ -58,6 +58,25 @@
+              (process-output->string '("./gosh" "-ftest" "test.o")))
+          (delete-files "test.o")))
+ 
++;; This caused assertion failure in 0.9.5, because 'main' was called
++;; via Scm_ApplyRec without base VM running.
++;; See https://github.com/shirok/Gauche/issues/244
++(test* "proper error handling of 'main'" "ok"
++       (unwind-protect
++           (begin
++             (delete-files "test.o")
++             (with-output-to-file "test.o"
++               (^[]
++                 (write
++                  '(use gauche.partcont))
++                 (write
++                  '(define (main args)
++                     (reset (shift k (call-with-input-file "gauche.h" k)))
++                     (print 'ok)
++                     0))))
++             (process-output->string '("./gosh" "-ftest" "test.o")))
++         (delete-files "test.o")))
++
+ ;;=======================================================================
+ (test-section "gauche-config")
+ 

diff --git a/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
new file mode 100644
index 00000000..a87ca5d
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.5-unicode.patch
@@ -0,0 +1,19 @@
+commit d31eb5c02b65514e695b45c0c01cbd45a36bac4a
+Author: OOHASHI Daichi <dico.leque.comicron@gmail.com>
+Date:   Thu Oct 20 10:48:17 2016 +0900
+
+    (char-general-category #\x20000) should be Lo
+
+diff --git a/src/gauche/char_utf_8.h b/src/gauche/char_utf_8.h
+index 082e764..5f92d13 100644
+--- a/src/gauche/char_utf_8.h
++++ b/src/gauche/char_utf_8.h
+@@ -294,7 +294,7 @@ static inline unsigned char Scm__LookupCharCategory(ScmChar ch)
+ {
+     if (ch == SCM_CHAR_INVALID || ch >= 0x10ffff) {
+         return SCM_CHAR_CATEGORY_Cn;
+-    } else if (ch <= 0x20000) {
++    } else if (ch < 0x20000) {
+         return ucs_general_category_00000[ch];
+     } else {
+         return ucs_general_category_20000(ch);

diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
new file mode 100644
index 00000000..b4aedef
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-ext-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/ext/Makefile.ext.in
++++ b/ext/Makefile.ext.in
+@@ -22,7 +22,7 @@
+ LIBS         = $(XLIBS) @LIBS@ 
+ CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
+ CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
+-LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
++LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
+ 
+ # These are set by configure
+ DEFS     = @DEFS@

diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.patch b/dev-scheme/gauche/files/gauche-gauche.m4.patch
new file mode 100644
index 00000000..1b9947c
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-gauche.m4.patch
@@ -0,0 +1,18 @@
+--- a/m4/gauche.m4
++++ b/m4/gauche.m4
+@@ -103,13 +103,10 @@
+   AS_CASE(["$target"],
+ 	  [i686-*], [I686OPT="-DUSE_I686_PREFETCH"])
+   AS_CASE(["$CC"],
+-	  [gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
++	  [*gcc*], [ dnl some systems may have gcc-2.95, gcc-3, etc.
+ 		  AS_CASE(["$target"],
+ 			  [*mingw*], [],
+-				     [GCCOPT="-fomit-frame-pointer"])
+-		  AS_CASE(["$target"],
+-			  [i586-*], [GCCOPT="$GCCOPT -march=i586"],
+-			  [i686-*], [GCCOPT="$GCCOPT -march=i686"])])])
++				     [GCCOPT="-fomit-frame-pointer"])])])
+ OPTFLAGS="$GCCOPT $I686OPT"
+ AC_SUBST(OPTFLAGS)
+ ])

diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
new file mode 100644
index 00000000..1e5ef71
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@@ -0,0 +1,12 @@
+--- a/ext/tls/ssltest-mod.scm
++++ b/ext/tls/ssltest-mod.scm
+@@ -53,7 +53,8 @@
+      ($ format #t "~a\n" $ regexp-replace-all* line
+         #/\.\.\/ssl\// srcpath-replace
+         #/openssl /    kicker-replace
+-        #/system/      "safe_system")))
++        #/system/      "safe_system"
++        #/(s_server) / "\\1 -4 ")))
+ 
+   (p "#include <errno.h>"
+      "int safe_system(const char *commands)"

diff --git a/dev-scheme/gauche/files/gauche-rpath.patch b/dev-scheme/gauche/files/gauche-rpath.patch
new file mode 100644
index 00000000..8774bac
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rpath.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -709,7 +709,6 @@
+   fi
+   if test "$RPATH_FLAG" != ""; then
+     RPATH_TMP=$RPATH_FLAG'`pwd`'
+-    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
+   fi
+ fi
+ AC_SUBST(RPATH_FLAG)

diff --git a/dev-scheme/gauche/files/gauche-xz-info.patch b/dev-scheme/gauche/files/gauche-xz-info.patch
new file mode 100644
index 00000000..e55f536
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-xz-info.patch
@@ -0,0 +1,31 @@
+--- a/lib/gauche/interactive/info.scm
++++ b/lib/gauche/interactive/info.scm
+@@ -137,7 +137,8 @@
+                             :paths paths
+                             :pred (^p (or (file-is-readable? p)
+                                           (file-is-readable? #"~|p|.gz")
+-                                          (file-is-readable? #"~|p|.bz2"))))
++                                          (file-is-readable? #"~|p|.bz2")
++                                          (file-is-readable? #"~|p|.xz"))))
+         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
+     ))
+ 
+--- a/lib/text/info.scm
++++ b/lib/text/info.scm
+@@ -64,6 +64,7 @@
+ 
+ ;; Find bzip2 location
+ (define bzip2  (find-file-in-paths "bzip2"))
++(define xz     (find-file-in-paths "xz"))
+ 
+ ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\u001f)
+ ;; If FILE is not found, look for compressed one.
+@@ -78,6 +79,8 @@
+                      (close-input-port zp)))))]
+           [(and bzip2 (file-exists? #"~|file|.bz2"))
+            (with-input-from-process #"~bzip2 -c -d ~|file|.bz2" thunk)]
++          [(and xz (file-exists? #"~|file|.xz"))
++           (with-input-from-process #"~xz -c -d ~|file|.xz" thunk)]
+           [else (error "can't find info file" file)]))
+   (with-input-from-info
+    (lambda ()

diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
new file mode 100644
index 00000000..2e6fe55
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools eutils
+
+MY_P="${P^g}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl test"
+
+RDEPEND="sys-libs/gdbm"
+DEPEND="${RDEPEND}
+	test? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-rpath.patch
+	epatch "${FILESDIR}"/${PN}-gauche.m4.patch
+	epatch "${FILESDIR}"/${PN}-ext-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-xz-info.patch
+	epatch "${FILESDIR}"/${PN}-rfc.tls.patch
+	epatch "${FILESDIR}"/${P}-libressl.patch
+	epatch "${FILESDIR}"/${P}-bsd.patch
+	epatch "${FILESDIR}"/${P}-main.patch
+	epatch "${FILESDIR}"/${P}-unicode.patch
+	eapply_user
+
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	dodoc AUTHORS ChangeLog HACKING README
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2016-11-29 10:19 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2016-11-29 10:19 UTC (permalink / raw
  To: gentoo-commits

commit:     5d11e566d57fd1102c27a9a7628a6d5b788c050d
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 10:17:18 2016 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 10:17:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d11e566

dev-scheme/gauche: fix build

Gentoo-Bug: 600976

Package-Manager: portage-2.3.0

 dev-scheme/gauche/files/gauche-0.9.5-main.patch | 116 ------------------------
 dev-scheme/gauche/gauche-0.9.5.ebuild           |  22 +++--
 2 files changed, 12 insertions(+), 126 deletions(-)

diff --git a/dev-scheme/gauche/files/gauche-0.9.5-main.patch b/dev-scheme/gauche/files/gauche-0.9.5-main.patch
deleted file mode 100644
index 20f7070..00000000
--- a/dev-scheme/gauche/files/gauche-0.9.5-main.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-commit 97196adb9dab30e7ab610daf4cc486bfc01ed403
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Mon Oct 17 11:00:44 2016 -1000
-
-    Fix main.c to call 'main' proc properly
-
-    https://github.com/shirok/Gauche/issues/244
-
-diff --git a/src/core.c b/src/core.c
-index 923d116..fc01211 100644
---- a/src/core.c
-+++ b/src/core.c
-@@ -653,9 +653,14 @@ void Scm_SimpleMain(int argc, const char *argv[],
-     ScmModule *user = Scm_UserModule();
-     ScmObj mainproc = Scm_GlobalVariableRef(user, SCM_SYMBOL(SCM_INTERN("main")), 0);
-     if (SCM_PROCEDUREP(mainproc)) {
--        ScmObj r = Scm_ApplyRec1(mainproc, args);
--        if (SCM_INTP(r)) Scm_Exit(SCM_INT_VALUE(r));
--        else             Scm_Exit(70);
-+        static ScmObj run_main_proc = SCM_UNDEFINED;
-+        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
-+        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
-+
-+        ScmEvalPacket epak;
-+        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
-+        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
-+        Scm_Exit(SCM_INT_VALUE(epak.results[0]));
-     } else {
-         Scm_Exit(70);
-     }
-diff --git a/src/libeval.scm b/src/libeval.scm
-index 2a2c1fc..279fd7f 100644
---- a/src/libeval.scm
-+++ b/src/libeval.scm
-@@ -370,6 +370,17 @@
-        (loop1)))))
- 
- ;;;
-+;;; Kick 'main' procedure
-+;;;   Returns an integer suitable for the exit code.
-+;;;   This is mainly to display proper stack trace in case 'main'
-+;;;   raises an error.
-+(select-module gauche.internal)
-+(define (run-main main args)
-+  (guard (e [else (report-error e) 70])
-+    (let1 r (main args)
-+      (if (fixnum? r) r 70))))
-+
-+;;;
- ;;; Macros
- ;;;
- 
-diff --git a/src/main.c b/src/main.c
-index 46223a6..55660c9 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -502,22 +502,14 @@ int execute_script(const char *scriptfile, ScmObj args)
-                                          SCM_BINDING_STAY_IN_MODULE);
-     }
-     if (SCM_PROCEDUREP(mainproc)) {
--#if 0 /* Temporarily turned off due to the bug that loses stack traces. */
-+        static ScmObj run_main_proc = SCM_UNDEFINED;
-+        SCM_BIND_PROC(run_main_proc, "run-main", Scm_GaucheInternalModule());
-+        SCM_ASSERT(SCM_PROCEDUREP(run_main_proc));
-+        
-         ScmEvalPacket epak;
--        int r = Scm_Apply(mainproc, SCM_LIST1(args), &epak);
--        if (r > 0) {
--            ScmObj res = epak.results[0];
--            if (SCM_INTP(res)) return SCM_INT_VALUE(res);
--            else return 70;  /* EX_SOFTWARE, see SRFI-22. */
--        } else {
--            Scm_ReportError(epak.exception);
--            return 70;  /* EX_SOFTWARE, see SRFI-22. */
--        }
--#else
--        ScmObj r = Scm_ApplyRec1(mainproc, args);
--        if (SCM_INTP(r)) return SCM_INT_VALUE(r);
--        else             return 70;
--#endif
-+        int r = Scm_Apply(run_main_proc, SCM_LIST2(mainproc, args), &epak);
-+        SCM_ASSERT(r == 1 && SCM_INTP(epak.results[0]));
-+        return SCM_INT_VALUE(epak.results[0]);
-     }
-     return 0;
- }
-diff --git a/test/scripts.scm b/test/scripts.scm
-index 44bb44b..4e6777b 100644
---- a/test/scripts.scm
-+++ b/test/scripts.scm
-@@ -58,6 +58,25 @@
-              (process-output->string '("./gosh" "-ftest" "test.o")))
-          (delete-files "test.o")))
- 
-+;; This caused assertion failure in 0.9.5, because 'main' was called
-+;; via Scm_ApplyRec without base VM running.
-+;; See https://github.com/shirok/Gauche/issues/244
-+(test* "proper error handling of 'main'" "ok"
-+       (unwind-protect
-+           (begin
-+             (delete-files "test.o")
-+             (with-output-to-file "test.o"
-+               (^[]
-+                 (write
-+                  '(use gauche.partcont))
-+                 (write
-+                  '(define (main args)
-+                     (reset (shift k (call-with-input-file "gauche.h" k)))
-+                     (print 'ok)
-+                     0))))
-+             (process-output->string '("./gosh" "-ftest" "test.o")))
-+         (delete-files "test.o")))
-+
- ;;=======================================================================
- (test-section "gauche-config")
- 

diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
index 2e6fe55..b4bd7c8 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -25,17 +25,19 @@ DEPEND="${RDEPEND}
 	)"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-rpath.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-bsd.patch
+	"${FILESDIR}"/${P}-unicode.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.patch
-	epatch "${FILESDIR}"/${PN}-gauche.m4.patch
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-xz-info.patch
-	epatch "${FILESDIR}"/${PN}-rfc.tls.patch
-	epatch "${FILESDIR}"/${P}-libressl.patch
-	epatch "${FILESDIR}"/${P}-bsd.patch
-	epatch "${FILESDIR}"/${P}-main.patch
-	epatch "${FILESDIR}"/${P}-unicode.patch
-	eapply_user
+	default
 
 	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2018-06-23  6:50 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-06-23  6:50 UTC (permalink / raw
  To: gentoo-commits

commit:     42542c7b6db5c76d21a0ecb720b224de9b43088f
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 06:48:36 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 06:48:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42542c7b

dev-scheme/gauche: drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-scheme/gauche/Manifest                         |   2 -
 .../gauche/files/gauche-0.9-ext-ldflags.patch      |  11 --
 dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch |  19 ----
 dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch   |  12 ---
 dev-scheme/gauche/files/gauche-0.9-rpath.patch     |  10 --
 dev-scheme/gauche/files/gauche-0.9-xz-info.patch   |  31 ------
 .../gauche/files/gauche-0.9.3.3-file.util.patch    |  21 ----
 .../files/gauche-0.9.3.3-gauche.threads.patch      | 120 ---------------------
 dev-scheme/gauche/gauche-0.9.3.3.ebuild            |  52 ---------
 dev-scheme/gauche/gauche-0.9.4-r1.ebuild           |  56 ----------
 10 files changed, 334 deletions(-)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 92711774c98..d8fb93ee259 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,3 +1 @@
-DIST Gauche-0.9.3.3.tgz 5042189 BLAKE2B 28aaae506d89f0ba8dc7dd78eaf78678875d8d785a9ee67352f00e82531cafa4ec711f4ee55b9b791476cc1e196585131db8f63c3d2ac9584fb4fa0ab54b9291 SHA512 5743781d88454d579d853a50c5c7651c52bdcea8b7b2130408e1c7761cee73edfdebaf258342e837ef7d5a3886e08bbb33b2862d1e19585f519ada5cb7475d1c
-DIST Gauche-0.9.4.tgz 5601987 BLAKE2B 3c1181d4ff17b7c90fb1fb30401f9f284290fee05dfb368ced69c813966220152e81269c954f66d9b31ed182912d6552011e73ae92d69418160f86f7c0e758c8 SHA512 815e719d78950a31c238fd7879e09f40d6b3a83a3ebf9d5f7cd3cc7ada081e5f20fbc6b432900e3455bc59e5e60014bf77605b8c9c5f27def53f89284b9cfca3
 DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a

diff --git a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
deleted file mode 100644
index a9de4114d2b..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gauche-0.9.1.orig/ext/Makefile.ext.in
-+++ Gauche-0.9.1/ext/Makefile.ext.in
-@@ -22,7 +22,7 @@
- LIBS         = $(XLIBS) @LIBS@ 
- CFLAGS       = @CFLAGS@ @SHLIB_SO_CFLAGS@ $(XCFLAGS)
- CPPFLAGS     = @CPPFLAGS@ $(XCPPFLAGS)
--LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @SHLIB_SO_LDFLAGS@
-+LDFLAGS      = $(LOCAL_LFLAGS) $(XLDFLAGS) @LDFLAGS@ @SHLIB_SO_LDFLAGS@
- 
- # These are set by configure
- DEFS     = @DEFS@

diff --git a/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch b/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
deleted file mode 100644
index 8c4d3180836..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Gauche-0.9.4.orig/m4/gauche.m4
-+++ Gauche-0.9.4/m4/gauche.m4
-@@ -103,15 +103,11 @@
-   i686-*) I686OPT="-DUSE_I686_PREFETCH";;
- esac
- case "$CC" in
--  gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
-+  *gcc*)  # some systems may have gcc-2.95, gcc-3, etc.
-     case "$target" in
-       *mingw*) ;;
-       *)     GCCOPT="-fomit-frame-pointer";;
-     esac
--    case "$target" in
--     i586-*) GCCOPT="$GCCOPT -march=i586";;
--     i686-*) GCCOPT="$GCCOPT -march=i686";;
--    esac
-     ;;
- esac
- OPTFLAGS="$GCCOPT $I686OPT"

diff --git a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
deleted file mode 100644
index 0bce39ad992..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Gauche-0.9.3.2.orig/ext/tls/Makefile.in
-+++ Gauche-0.9.3.2/ext/tls/Makefile.in
-@@ -77,6 +77,9 @@
- 	@sed -e "s@\.\./ssl/@../../$(srcdir)/axTLS/ssl/@g" \
-              -e "s/system/safe_system/g" \
-              -e "s@openssl @sh ../../$(srcdir)/kick_openssl @g" \
-+             -e "/do_reneg = 1;/i#if 0" \
-+             -e "/do_reneg = 0;/a#endif" \
-+             -e "/SSL_server_test(/,/)/s/ -tls1//" \
-              $(srcdir)/axTLS/ssl/test/ssltest.c >> $(SSLTEST_GENERATED)
- 	@cat $(srcdir)/system-fix.c >> $(SSLTEST_GENERATED)
- 

diff --git a/dev-scheme/gauche/files/gauche-0.9-rpath.patch b/dev-scheme/gauche/files/gauche-0.9-rpath.patch
deleted file mode 100644
index ca76cb83123..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9-rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Gauche-0.9.1.orig/configure.ac
-+++ Gauche-0.9.1/configure.ac
-@@ -709,7 +709,6 @@
-   fi
-   if test "$RPATH_FLAG" != ""; then
-     RPATH_TMP=$RPATH_FLAG'`pwd`'
--    RPATH_REAL=$RPATH_FLAG'$(LIB_INSTALL_DIR)'
-   fi
- fi
- AC_SUBST(RPATH_FLAG)

diff --git a/dev-scheme/gauche/files/gauche-0.9-xz-info.patch b/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
deleted file mode 100644
index 809879c4cbd..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- Gauche-0.9.1.orig/lib/gauche/interactive/info.scm
-+++ Gauche-0.9.1/lib/gauche/interactive/info.scm
-@@ -84,7 +84,8 @@
-                             :pred (lambda (p)
-                                     (or (file-is-readable? p)
-                                         (file-is-readable? #`",|p|.gz")
--                                        (file-is-readable? #`",|p|.bz2"))))
-+                                        (file-is-readable? #`",|p|.bz2")
-+                                        (file-is-readable? #`",|p|.xz"))))
-         (errorf "couldn't find info file ~s in paths: ~s" *info-file* paths))
-     ))
- 
---- Gauche-0.9.1.orig/lib/text/info.scm
-+++ Gauche-0.9.1/lib/text/info.scm
-@@ -63,6 +63,7 @@
- ;; Find gunzip location
- (define gunzip (find-file-in-paths "gunzip"))
- (define bzip2  (find-file-in-paths "bzip2"))
-+(define xz     (find-file-in-paths "xz"))
- 
- ;; Read an info file FILE, and returns a list of strings splitted by ^_ (#\x1f)
- ;; If FILE is not found, look for compressed one.
-@@ -74,6 +75,8 @@
-            (with-input-from-process #`",gunzip -c ,file" thunk)]
-           [(and bzip2 (file-exists? #`",|file|.bz2"))
-            (with-input-from-process #`",bzip2 -c -d ,|file|.bz2" thunk)]
-+          [(and xz (file-exists? #`",|file|.xz"))
-+           (with-input-from-process #`",xz -c -d ,|file|.xz" thunk)]
-           [else (error "can't find info file" file)]))
-   (with-input-from-info
-    (lambda ()

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
deleted file mode 100644
index 1e4cd5d1952..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 15fb279dccb83d66d7e866a0e6f4e3f9ff64fd8d
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Thu Nov 29 23:17:55 2012 -1000
-
-    Fix file.util test
-
-    The current test may fail when a size of a directory happens to
-    100.  Patch from NIIBE Yutaka.
-
---- a/ext/file/test.scm
-+++ b/ext/file/test.scm
-@@ -290,7 +290,8 @@
-          (reverse
-           (directory-fold "test.out"
-                           (^[path result]
--                            (if (= (file-size path) 100)
-+                            (if (and (file-is-regular? path)
-+				     (= (file-size path) 100))
-                                 (cons path result)
-                                 result))
-                           '()

diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch b/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
deleted file mode 100644
index a44ee75b8d1..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-commit 60d82dd56c15a533562cf28111af5d3365d5d354
-Author: Shiro Kawai <shiro@acm.org>
-Date:   Thu May 31 15:23:22 2012 -1000
-
-    Fixed thread-terminate! bug that SEGVs when applied on non-running threads
-
---- a/ext/threads/test.scm
-+++ b/ext/threads/test.scm
-@@ -100,6 +100,18 @@
-            (thread-terminate! t1)
-            (thread-join! t1))))
- 
-+;; this SEGVs on 0.9.3.3. test code from @cryks.
-+(test* "thread termination before running" 'terminated
-+       (let1 t1 (make-thread (^[] #f))
-+         (thread-terminate! t1)
-+         (thread-state t1)))
-+
-+(test* "thread termination while being stopped" 'terminated
-+       (let1 t1 (thread-start! (make-thread (^[] (let loop () (loop)))))
-+         (thread-stop! t1)
-+         (thread-terminate! t1)
-+         (thread-state t1)))
-+
- ;;---------------------------------------------------------------------
- (test-section "thread and error")
- 
---- a/ext/threads/threads.c
-+++ b/ext/threads/threads.c
-@@ -432,36 +432,41 @@ ScmObj Scm_ThreadTerminate(ScmVM *target)
-     }
- 
-     (void)SCM_INTERNAL_MUTEX_LOCK(target->vmlock);
--    do {
--        /* This ensures only the first call of thread-terminate! on a thread
--           is in effect. */
--        if (target->canceller == NULL) {
--            target->canceller = vm;
--
--            /* First try */
--            target->stopRequest = SCM_VM_REQUEST_TERMINATE;
--            target->attentionRequest = TRUE;
--            if (wait_for_termination(target)) break;
--
--            /* Second try */
-+    if (target->state == SCM_VM_RUNNABLE || target->state == SCM_VM_STOPPED) {
-+        do {
-+            /* This ensures only the first call of thread-terminate! on a
-+               thread is in effect. */
-+            if (target->canceller == NULL) {
-+                target->canceller = vm;
-+
-+                /* First try */
-+                target->stopRequest = SCM_VM_REQUEST_TERMINATE;
-+                target->attentionRequest = TRUE;
-+                if (wait_for_termination(target)) break;
-+
-+                /* Second try */
-+                SCM_ASSERT(target->thread);
- #if defined(GAUCHE_USE_PTHREADS)
- # if defined(GAUCHE_PTHREAD_SIGNAL)
--            pthread_kill(target->thread, GAUCHE_PTHREAD_SIGNAL);
-+                pthread_kill(target->thread, GAUCHE_PTHREAD_SIGNAL);
- # endif /*defined(GAUCHE_PTHREAD_SIGNAL)*/
- #elif defined(GAUCHE_USE_WTHREADS)
--            /* TODO: implement signal mechanism using an event */
-+                /* TODO: implement signal mechanism using an event */
- #endif  /* defined(GAUCHE_USE_WTHREADS) */
--            if (wait_for_termination(target)) break;
-+                if (wait_for_termination(target)) break;
- 
--            /* Last resort */
--            thread_cleanup_inner(target);
-+                /* Last resort */
-+                thread_cleanup_inner(target);
- #if defined(GAUCHE_USE_PTHREADS)
--            pthread_cancel(target->thread);
-+                pthread_cancel(target->thread);
- #elif defined(GAUCHE_USE_WTHREADS)
--            TerminateThread(target->thread, 0);
-+                TerminateThread(target->thread, 0);
- #endif
--        }
--    } while (0);
-+            }
-+        } while (0);
-+    }
-+    /* target either is terminated or hasn't been run */
-+    target->state = SCM_VM_TERMINATED;
-     (void)SCM_INTERNAL_MUTEX_UNLOCK(target->vmlock);
-     return SCM_UNDEFINED;
- }
---- a/test/control.scm
-+++ b/test/control.scm
-@@ -72,7 +72,7 @@
- ;;
- 
- (cond-expand
-- [gauche.sys.pthreads
-+ [gauche.sys.threads
-   (test-section "control.thread-pool")
-   (use control.thread-pool)
-   (test-module 'control.thread-pool)
-@@ -173,7 +173,15 @@
-            (let1 xjob (add-job! pool work)
-              (terminate-all! pool :force-timeout 0.05)
-              (job-status xjob))))
--  ]
-+
-+  ;; This SEGVs on 0.9.3.3 (test code by @cryks)
-+  (test* "thread pool termination" 'terminated
-+         (let ([t (thread-start! (make-thread (cut undefined)))]
-+               [pool (make-thread-pool 10)])
-+           (terminate-all! pool)
-+           (thread-terminate! t)
-+           (thread-state t)))
-+  ] ; gauche.sys.pthreads
-  [else])
- 
- (test-end)

diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
deleted file mode 100644
index 011ca66086e..00000000000
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 test"
-
-RDEPEND="sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-rpath.patch
-	"${FILESDIR}"/${PN}-0.9-gauche.m4.patch
-	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-0.9-xz-info.patch
-	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
-	"${FILESDIR}"/${P}-gauche.threads.patch
-	"${FILESDIR}"/${P}-file.util.patch
-)
-
-src_prepare() {
-	default
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-slib="${EPREFIX}"/usr/share/slib
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
-}

diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
deleted file mode 100644
index 4cdcd5cc5d7..00000000000
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="ipv6 libressl test"
-
-RDEPEND="sys-libs/gdbm"
-DEPEND="${RDEPEND}
-	test? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9-rpath.patch
-	"${FILESDIR}"/${PN}-0.9-gauche.m4.patch
-	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-0.9-xz-info.patch
-	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
-)
-
-src_prepare() {
-	mv gc/src/*.[Ss] gc || die
-	sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am
-
-	default
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-slib="${EPREFIX}"/usr/share/slib
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install-pkg install-doc
-	dodoc AUTHORS ChangeLog HACKING README
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2018-07-11 13:42 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2018-07-11 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     9b966756dceaa5cc6a709273242dd360f38c8162
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 13:37:43 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 13:41:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b966756

dev-scheme/gauche: rename patches

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../{gauche-ext-ldflags.patch => gauche-0.9-ext-ldflags.patch}      | 0
 .../gauche/files/{gauche-rfc.tls.patch => gauche-0.9-rfc.tls.patch} | 0
 dev-scheme/gauche/gauche-0.9.5.ebuild                               | 6 +++---
 dev-scheme/gauche/metadata.xml                                      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.patch b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-ext-ldflags.patch
rename to dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch

diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-rfc.tls.patch
rename to dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch

diff --git a/dev-scheme/gauche/gauche-0.9.5.ebuild b/dev-scheme/gauche/gauche-0.9.5.ebuild
index 8cf193dcbce..2ace0a45f69 100644
--- a/dev-scheme/gauche/gauche-0.9.5.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.5.ebuild
@@ -27,11 +27,11 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-rpath.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-0.9-rfc.tls.patch
 	"${FILESDIR}"/${P}-bsd.patch
+	"${FILESDIR}"/${P}-libressl.patch
 	"${FILESDIR}"/${P}-unicode.patch
 )
 DOCS=( AUTHORS ChangeLog HACKING README )

diff --git a/dev-scheme/gauche/metadata.xml b/dev-scheme/gauche/metadata.xml
index b2990653937..48438982cc2 100644
--- a/dev-scheme/gauche/metadata.xml
+++ b/dev-scheme/gauche/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>scheme@gentoo.org</email>


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2019-09-27 14:37 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2019-09-27 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     7043de23ba596508d8088d7083b0faaaa6b8d114
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 14:29:18 2019 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 14:36:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7043de23

dev-scheme/gauche: new upstream release

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/gauche/Manifest                   |  1 +
 dev-scheme/gauche/files/gauche-info.patch    | 95 ++++++++++++++++++++++++++++
 dev-scheme/gauche/files/gauche-rfc.tls.patch | 10 +++
 dev-scheme/gauche/gauche-0.9.8.ebuild        | 60 ++++++++++++++++++
 4 files changed, 166 insertions(+)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 337e9006388..6992e6fe1f0 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,2 +1,3 @@
 DIST Gauche-0.9.5.tgz 6458675 BLAKE2B ca7f1ad48841a2a6a98632980d8a4fe5065234de5c23835c24e633345ba77fd4d3610d073c00a8da00c1e794e22a74e493793d8fca4a7f3ed1a3161a29622f30 SHA512 6d853d734c7a56a86f0015b1bfef378803d6acc1e0405ed841eab5afc08d1edef736d85df10c86d75fd5fb6b2def684bb1f2095a019133b9f497192f5511197a
 DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
+DIST Gauche-0.9.8.tgz 7101599 BLAKE2B 032c27b1bf5a15e7b1871801f57d9deefb4657c1921104bdb978f70df3627cf392be13dbe1a9cab4346d459c57ee4b31b622269cfc42451afdfaeb6751efc836 SHA512 53c8b022593385167a7fde7d6e8e1bfffeec91a765ffba3295c0c7a840b68977aad83d1460bdc77a5b3e0420b90eaaf55b1b7acba469f855cc6a1b72bd81f3cf

diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-info.patch
new file mode 100644
index 00000000000..f60f1f8a87d
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -417,7 +417,6 @@
+ AC_CHECK_PROGS(AR, ar gar)
+ AC_CHECK_PROGS(AS, as gas)
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ dnl for cross build
+ AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -16,7 +16,6 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTDIR    = $(top_srcdir)/mkinstalldirs
+ MAKEINFO     = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+ VERSION_INFO = @PACKAGE_STRING@
+ 
+ MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
+@@ -58,7 +57,7 @@
+ 	texi html htmls dvi pdf info \
+ 	clean distclean maintainer-clean
+ 
+-.SUFFIXES: .texi .html .info.gz .pdf .dvi
++.SUFFIXES: .texi .html .info .pdf .dvi
+ 
+ all: info
+ 
+@@ -66,7 +65,7 @@
+ 	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
+ 	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+ 	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
+-	if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
++	if test -f gauche-refe.info -o -f gauche-refj.info; then \
+ 	  for info in *.info*; do \
+ 	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
+ 	  done; \
+@@ -94,8 +93,8 @@
+ %/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+ 
+-%.info.gz : %.texi
+-	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
++%.info : %.texi
++	$(MAKEDOC) info $< "$(MAKEINFO)"
+ 
+ %.pdf : %.texi
+ 	$(MAKEDOC) pdf $< "$(MAKEINFO)"
+@@ -113,7 +112,7 @@
+ htmls : gauche-refe/index.html gauche-refj/index.html
+ dvi : gauche-refe.dvi gauche-refj.dvi
+ pdf : gauche-refe.pdf gauche-refj.pdf
+-info : gauche-refe.info.gz gauche-refj.info.gz
++info : gauche-refe.info gauche-refj.info
+ 
+ gauche-refe.texi : $(TEXIS) extract.scm
+ 	$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
+--- a/doc/makedoc.scm
++++ b/doc/makedoc.scm
+@@ -16,7 +16,7 @@
+    [gauche.sys.setenv (sys-putenv "LANG=C")]
+    [else])
+   (if (match (cdr args)
+-        [("info" input makeinfo gzip)     (do-info input makeinfo gzip)]
++        [("info" input makeinfo)          (do-info input makeinfo)]
+         [("html" input makeinfo)          (do-html input makeinfo)]
+         [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
+         [("pdf" input makeinfo)           (do-pdf input makeinfo)]
+@@ -27,7 +27,7 @@
+ (define (usage)
+   (print "Usage: gosh makedoc.scm command args ...")
+   (print "Valid commands (and args):")
+-  (print "  info input MAKEINFO GZIP            - generate info doc")
++  (print "  info input MAKEINFO                 - generate info doc")
+   (print "  html input MAKEINFO                 - generate single html")
+   (print "  htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
+   (print "  pdf input MAKEINFO                  - generate pdf")
+@@ -55,14 +55,11 @@
+         (warn "makeinfo version ~a or greater is required, but ~a's \
+                version is ~a.  Skipping.\n" min-version makeinfo vers)))))
+ 
+-(define (do-info input makeinfo gzip)
++(define (do-info input makeinfo)
+   (define info (path-swap-extension input "info"))
+   (or (string-null? makeinfo)
+-      (string-null? gzip)
+       (not (check-makeinfo-version makeinfo "5.0"))
+-      (and (do-process (make-cmd `(,makeinfo ,input)))
+-           (begin (remove-files (glob #"~|info|*.gz"))
+-                  (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
++      (and (do-process (make-cmd `(,makeinfo ,input))))))
+ 
+ (define (do-html input makeinfo)
+   (or (string-null? makeinfo)

diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.patch b/dev-scheme/gauche/files/gauche-rfc.tls.patch
new file mode 100644
index 00000000000..5eb3b991d3b
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-rfc.tls.patch
@@ -0,0 +1,10 @@
+--- a/ext/tls/ssltest-mod.scm
++++ b/ext/tls/ssltest-mod.scm
+@@ -87,6 +87,7 @@
+         #/\.\.\/ssl\// srcpath-replace
+         #/openssl /    kicker-replace
+         #/system\s*\(/      "safe_system("
++        #/(s_server) / "\\1 -4 "
+         )))
+ 
+   (p "#include <errno.h>"

diff --git a/dev-scheme/gauche/gauche-0.9.8.ebuild b/dev-scheme/gauche/gauche-0.9.8.ebuild
new file mode 100644
index 00000000000..64108c8c95b
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eapi7-ver
+
+MY_P="${P^g}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)7"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 libressl mbedtls test"
+
+RDEPEND="sys-libs/gdbm
+	mbedtls? ( net-libs/mbedtls:= )"
+DEPEND="${RDEPEND}
+	test? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl:0 )
+	)"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2021-01-26 14:47 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2021-01-26 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     291522a2c05ce4ed5418f02646b0358433de317e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 14:23:01 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 14:47:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291522a2

dev-scheme/gauche: drop old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/gauche/Manifest                         |  1 -
 dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch | 12 -----
 dev-scheme/gauche/gauche-0.9.6-r1.ebuild           | 60 ----------------------
 3 files changed, 73 deletions(-)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 7fbda97d0df..1e800470dbd 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,2 +1 @@
-DIST Gauche-0.9.6.tgz 6927530 BLAKE2B 9b32a0db4fc41e2b35331818850e7aa3c1ac5b1294c76caa053abe1ae2da20a0ac4424470ca94626108f996700d1b7e52f6f9e5c6f0a2326f7e6862880f48aa1 SHA512 1d8a7f56fd9ca183d6dce1dedadfaec7c7150c29540e5158f2a61977f7406d7d7a8ab753ef1912865a7d7e9a9e2fa845d86b2eb4c5e07a176f1c60276bc1908f
 DIST Gauche-0.9.9.tgz 7244347 BLAKE2B 843fe0c7341c7020ad9130edfc41f02eeda0bc2e1f8983f83faf443f69073e132a9a2f37e6a6260334ab9aacc3e976a2df68d4c43f17f6ea07531c14e783efec SHA512 ff6fdc80bd14c4a5dc57b5a6ac9558078a557cd30c2efe98146c3817a7830ef2b3f5bb6184ce6b8ac9b1b9cb636f041643fa761b2f99e6dd0602e13e7928e210

diff --git a/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch b/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
deleted file mode 100644
index cf570df0ed3..00000000000
--- a/dev-scheme/gauche/files/gauche-0.9.6-rfc.tls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/ext/tls/ssltest-mod.scm
-+++ b/ext/tls/ssltest-mod.scm
-@@ -53,7 +53,8 @@
-      ($ format #t "~a\n" $ regexp-replace-all* line
-         #/\.\.\/ssl\// srcpath-replace
-         #/openssl /    kicker-replace
--        #/system\s*\(/      "safe_system(")))
-+        #/system\s*\(/ "safe_system("
-+        #/(s_server) / "\\1 -4 ")))
- 
-   (p "#include <errno.h>"
-      "int safe_system(const char *commands)"

diff --git a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild b/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
deleted file mode 100644
index 072a1b05fc6..00000000000
--- a/dev-scheme/gauche/gauche-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eapi7-ver
-
-MY_P="${P^g}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 libressl mbedtls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/gdbm
-	mbedtls? ( net-libs/mbedtls:= )"
-DEPEND="${RDEPEND}
-	test? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl:0 )
-	)"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-xz-info.patch
-	"${FILESDIR}"/${P}-rfc.tls.patch
-)
-DOCS=( AUTHORS ChangeLog HACKING README )
-
-src_prepare() {
-	default
-	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--with-libatomic-ops=no \
-		--with-slib="${EPREFIX}"/usr/share/slib \
-		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-pkg install-doc
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2021-01-26 14:47 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2021-01-26 14:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f82ee5528fd2ca3e2eadf6c3cab627e54745f3ec
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 14:32:10 2021 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 14:47:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82ee552

dev-scheme/gauche: rename patch

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../gauche/files/{gauche-xz-info.patch => gauche-0.9.9-xz-info.patch}   | 0
 dev-scheme/gauche/gauche-0.9.9.ebuild                                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/gauche/files/gauche-xz-info.patch b/dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-xz-info.patch
rename to dev-scheme/gauche/files/gauche-0.9.9-xz-info.patch

diff --git a/dev-scheme/gauche/gauche-0.9.9.ebuild b/dev-scheme/gauche/gauche-0.9.9.ebuild
index 8c9eb46d082..89d9c6e2571 100644
--- a/dev-scheme/gauche/gauche-0.9.9.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.9.ebuild
@@ -31,7 +31,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gauche.m4.patch
 	"${FILESDIR}"/${PN}-info.patch
 	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${PN}-xz-info.patch
+	"${FILESDIR}"/${P}-xz-info.patch
 )
 DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2022-01-31 13:20 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2022-01-31 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     03ffc8e43b0db237776b79fd8131565cc57a1661
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 13:19:51 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 13:20:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ffc8e4

dev-scheme/gauche: new upstream release

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

 dev-scheme/gauche/Manifest                |  1 +
 dev-scheme/gauche/files/gauche-info.patch | 95 +++++++++++++++++++++++++++++++
 dev-scheme/gauche/gauche-0.9.11_p1.ebuild | 60 +++++++++++++++++++
 3 files changed, 156 insertions(+)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 0af80b0d20b6..f19612b1994b 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,2 +1,3 @@
 DIST Gauche-0.9.10.tgz 7701616 BLAKE2B ecffc8cbffdbbea53a52468bcc190c57eede51ade78ccafd323299458f333794cc613bbfa11090d261993908020ccf8d42c2142da5996e1e55188f28e03cc28b SHA512 f014ec00903fc91b90da8dbdaace04a64d12695c631e923d5cdca3574aaf6701374f5adbed20c395881b047bb5a448352614d4ce7f16b6e38f69382bf8e66ed0
+DIST Gauche-0.9.11-p1.tgz 8104827 BLAKE2B 5c35ced6f64296e294804add967045b8e5aca817b65648f7c6708c774b1c1e218676517f86c3d8c8eb11d983e0a6b396ed00de1f95ecdc5a4dd5eee157f58bea SHA512 51be78d7f9bb62987e76c9867006c367ecb27eaf444f022d93bb92010e51ffb6b922cfc39aaab51cc9edbc94d7f7bb21e021705abb1a8fabd0bdbc52d4c92ee8
 DIST gauche-0.9.10-sys-ctermid.patch.xz 10328 BLAKE2B f4cde73528624d07a8c7d820b8cf10a0b96e5f13394df3113b8d40ddb43996afc5e519a34fa1de72529e42e1fb6e1feec60213bbf5df97e7725f4c0cd2c621e3 SHA512 7d16a9e6097d458bcad9db68fbedd2f694afade681bf9b876e0a2f6c232be85fb58e3d7dca6b208117b300e2bf529027b736b381d8eca29c688628725c0466ed

diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-info.patch
new file mode 100644
index 000000000000..14aa58bc7e21
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -0,0 +1,95 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -382,7 +382,6 @@
+ AC_PROG_LN_S
+ AC_CHECK_TOOLS(AR, ar gar)
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ if test -z "$MAKEINFO" -o -z "$GZIP_PROGRAM"; then
+   build_doc="No (requires makeinfo and gzip to build documents)"
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -18,7 +18,6 @@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTDIR    = $(top_srcdir)/mkinstalldirs
+ MAKEINFO     = @MAKEINFO@
+-GZIP_PROGRAM = @GZIP_PROGRAM@
+ VERSION_INFO = @PACKAGE_STRING@
+ 
+ MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
+@@ -59,7 +58,7 @@
+ 	texi html htmls dvi pdf info \
+ 	clean distclean maintainer-clean
+ 
+-.SUFFIXES: .texi .html .info.gz .pdf .dvi
++.SUFFIXES: .texi .html .info .pdf .dvi
+ 
+ all: info
+ 
+@@ -67,7 +66,7 @@
+ 	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
+ 	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
+ 	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
+-	if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
++	if test -f gauche-refe.info -o -f gauche-refj.info; then \
+ 	  for info in *.info*; do \
+ 	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
+ 	  done; \
+@@ -98,8 +97,8 @@
+ %-draft/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "Development HEAD DRAFT"
+ 
+-%.info.gz : %.texi
+-	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
++%.info : %.texi
++	$(MAKEDOC) info $< "$(MAKEINFO)"
+ 
+ %.pdf : %.texi
+ 	$(MAKEDOC) pdf $< "$(MAKEINFO)"
+@@ -118,7 +117,7 @@
+ htmls-draft : gauche-refe-draft/index.html gauche-refj-draft/index.html
+ dvi : gauche-refe.dvi gauche-refj.dvi
+ pdf : gauche-refe.pdf gauche-refj.pdf
+-info : gauche-refe.info.gz gauche-refj.info.gz
++info : gauche-refe.info gauche-refj.info
+ 
+ gauche-refe.texi : $(TEXIS) extract.scm
+ 	$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
+--- a/doc/makedoc.scm
++++ b/doc/makedoc.scm
+@@ -16,7 +16,7 @@
+    [gauche.sys.setenv (sys-putenv "LANG=C")]
+    [else])
+   (if (match (cdr args)
+-        [("info" input makeinfo gzip)     (do-info input makeinfo gzip)]
++        [("info" input makeinfo)          (do-info input makeinfo)]
+         [("html" input makeinfo)          (do-html input makeinfo)]
+         [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
+         [("pdf" input makeinfo)           (do-pdf input makeinfo)]
+@@ -27,7 +27,7 @@
+ (define (usage)
+   (print "Usage: gosh makedoc.scm command args ...")
+   (print "Valid commands (and args):")
+-  (print "  info input MAKEINFO GZIP            - generate info doc")
++  (print "  info input MAKEINFO                 - generate info doc")
+   (print "  html input MAKEINFO                 - generate single html")
+   (print "  htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
+   (print "  pdf input MAKEINFO                  - generate pdf")
+@@ -55,14 +55,11 @@
+         (warn "makeinfo version ~a or greater is required, but ~a's \
+                version is ~a.  Skipping.\n" min-version makeinfo vers)))))
+ 
+-(define (do-info input makeinfo gzip)
++(define (do-info input makeinfo)
+   (define info (path-swap-extension input "info"))
+   (or (string-null? makeinfo)
+-      (string-null? gzip)
+       (not (check-makeinfo-version makeinfo "5.0"))
+-      (and (do-process (make-cmd `(,makeinfo ,input)))
+-           (begin (remove-files (glob #"~|info|*.gz"))
+-                  (do-process (make-cmd `(,gzip "-n" ,info ,@(glob #"~|info|-[0-9]*"))))))))
++      (and (do-process (make-cmd `(,makeinfo ,input))))))
+ 
+ (define (do-html input makeinfo)
+   (or (string-null? makeinfo)

diff --git a/dev-scheme/gauche/gauche-0.9.11_p1.ebuild b/dev-scheme/gauche/gauche-0.9.11_p1.ebuild
new file mode 100644
index 000000000000..f5bfcb4e1b79
--- /dev/null
+++ b/dev-scheme/gauche/gauche-0.9.11_p1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+MY_P="${P^g}"
+MY_P="${MY_P/_p/-p}"
+
+DESCRIPTION="A Unix system friendly Scheme Interpreter"
+HOMEPAGE="http://practical-scheme.net/gauche/"
+SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1-2)8"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 mbedtls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/gdbm
+	virtual/libcrypt:=
+	mbedtls? ( net-libs/mbedtls:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-ext-ldflags.patch
+	"${FILESDIR}"/${PN}-gauche.m4.patch
+	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${PN}-rfc.tls.patch
+	"${FILESDIR}"/${PN}-xz-info.patch
+)
+DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
+
+src_prepare() {
+	default
+	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		--with-libatomic-ops=no \
+		--with-slib="${EPREFIX}"/usr/share/slib \
+		--with-tls=axtls$(usex mbedtls ',mbedtls' '')
+}
+
+src_test() {
+	emake -j1 -s check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-pkg install-doc
+	einstalldocs
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2022-01-31 13:20 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2022-01-31 13:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4f70a248fe162fd21a13360e8dd88cf982183783
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 13:16:53 2022 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 13:20:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f70a248

dev-scheme/gauche: rename patch

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

 .../gauche/files/{gauche-info.patch => gauche-0.9.10-info.patch}  | 0
 dev-scheme/gauche/gauche-0.9.10-r1.ebuild                         | 8 +++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-0.9.10-info.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-info.patch
rename to dev-scheme/gauche/files/gauche-0.9.10-info.patch

diff --git a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
index 561857d35c8f..d76fcb55857d 100644
--- a/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -22,15 +22,13 @@ RDEPEND="sys-libs/gdbm
 	virtual/libcrypt:=
 	mbedtls? ( net-libs/mbedtls:= )"
 DEPEND="${RDEPEND}
-	test? (
-		dev-libs/openssl:0
-	)"
+	test? ( dev-libs/openssl:0 )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${P}-info.patch
 	"${FILESDIR}"/${PN}-rfc.tls.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
 	"${FILESDIR}"/${P}-srfi-134.patch


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2024-02-11  6:40 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2024-02-11  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     9280976d1289d3f36e97b19f7c504c04532d66ac
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 06:36:22 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 06:36:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9280976d

dev-scheme/gauche: rename patch

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 .../gauche/files/{gauche-info.patch => gauche-0.9.13-info.patch}      | 0
 dev-scheme/gauche/gauche-0.9.13.ebuild                                | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-0.9.13-info.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-info.patch
rename to dev-scheme/gauche/files/gauche-0.9.13-info.patch

diff --git a/dev-scheme/gauche/gauche-0.9.13.ebuild b/dev-scheme/gauche/gauche-0.9.13.ebuild
index 81ffd5cd6eba..65974bc518ee 100644
--- a/dev-scheme/gauche/gauche-0.9.13.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${P}-info.patch
 	"${FILESDIR}"/${PN}-rfc.tls.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
 )


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2024-03-24 13:10 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2024-03-24 13:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a4bc2749e82839770f21eff4985f611c4d1c40e1
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 13:09:10 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 13:09:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bc2749

dev-scheme/gauche: drop old

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/gauche/Manifest                       |  1 -
 dev-scheme/gauche/files/gauche-0.9.13-info.patch | 95 ------------------------
 dev-scheme/gauche/gauche-0.9.13.ebuild           | 59 ---------------
 3 files changed, 155 deletions(-)

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index f1d68e536976..f72e95e1fd56 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,2 +1 @@
-DIST Gauche-0.9.13.tgz 9389117 BLAKE2B dd2039971d4460d5841272927872cea5cb29992c51468882b26374234bd246cb7a202e7e5f71c0733abad0d18da527e51b3ee46c3836b3862f36d8eec42f7a9f SHA512 f593775d41055599e7b3e281df0b1efcb284a1ce3e2a36a53a609c98f57ca1f2d99246d8b0585c4606839e611cfb4e42ed4d23506617976af375ae39489678d3
 DIST Gauche-0.9.14.tgz 9352431 BLAKE2B cb747a16037167a95a543e324b53a48e3cb4dd372e9f6cc00603b7072b902c839248fbf3e9926360a2732fcf4bc0caa16a4ea1ad757e84d5d597ef4bdfa2592f SHA512 3dd9dc8627fe1c5e518731a17dd984120485b36d6c2bb2d0d54a8b5f6778f45efd02640abe4699466eec2eb18dd4474d9525848029468128974c13c615087662

diff --git a/dev-scheme/gauche/files/gauche-0.9.13-info.patch b/dev-scheme/gauche/files/gauche-0.9.13-info.patch
deleted file mode 100644
index 14aa58bc7e21..000000000000
--- a/dev-scheme/gauche/files/gauche-0.9.13-info.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -382,7 +382,6 @@
- AC_PROG_LN_S
- AC_CHECK_TOOLS(AR, ar gar)
- AC_CHECK_PROGS(MAKEINFO, makeinfo)
--AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
- 
- if test -z "$MAKEINFO" -o -z "$GZIP_PROGRAM"; then
-   build_doc="No (requires makeinfo and gzip to build documents)"
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -18,7 +18,6 @@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTDIR    = $(top_srcdir)/mkinstalldirs
- MAKEINFO     = @MAKEINFO@
--GZIP_PROGRAM = @GZIP_PROGRAM@
- VERSION_INFO = @PACKAGE_STRING@
- 
- MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
-@@ -59,7 +58,7 @@
- 	texi html htmls dvi pdf info \
- 	clean distclean maintainer-clean
- 
--.SUFFIXES: .texi .html .info.gz .pdf .dvi
-+.SUFFIXES: .texi .html .info .pdf .dvi
- 
- all: info
- 
-@@ -67,7 +66,7 @@
- 	if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
- 	$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
- 	if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
--	if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
-+	if test -f gauche-refe.info -o -f gauche-refj.info; then \
- 	  for info in *.info*; do \
- 	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
- 	  done; \
-@@ -98,8 +97,8 @@
- %-draft/index.html : %.texi
- 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "Development HEAD DRAFT"
- 
--%.info.gz : %.texi
--	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
-+%.info : %.texi
-+	$(MAKEDOC) info $< "$(MAKEINFO)"
- 
- %.pdf : %.texi
- 	$(MAKEDOC) pdf $< "$(MAKEINFO)"
-@@ -118,7 +117,7 @@
- htmls-draft : gauche-refe-draft/index.html gauche-refj-draft/index.html
- dvi : gauche-refe.dvi gauche-refj.dvi
- pdf : gauche-refe.pdf gauche-refj.pdf
--info : gauche-refe.info.gz gauche-refj.info.gz
-+info : gauche-refe.info gauche-refj.info
- 
- gauche-refe.texi : $(TEXIS) extract.scm
- 	$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
---- a/doc/makedoc.scm
-+++ b/doc/makedoc.scm
-@@ -16,7 +16,7 @@
-    [gauche.sys.setenv (sys-putenv "LANG=C")]
-    [else])
-   (if (match (cdr args)
--        [("info" input makeinfo gzip)     (do-info input makeinfo gzip)]
-+        [("info" input makeinfo)          (do-info input makeinfo)]
-         [("html" input makeinfo)          (do-html input makeinfo)]
-         [("htmls" input makeinfo version) (do-htmls input makeinfo version)]
-         [("pdf" input makeinfo)           (do-pdf input makeinfo)]
-@@ -27,7 +27,7 @@
- (define (usage)
-   (print "Usage: gosh makedoc.scm command args ...")
-   (print "Valid commands (and args):")
--  (print "  info input MAKEINFO GZIP            - generate info doc")
-+  (print "  info input MAKEINFO                 - generate info doc")
-   (print "  html input MAKEINFO                 - generate single html")
-   (print "  htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
-   (print "  pdf input MAKEINFO                  - generate pdf")
-@@ -55,14 +55,11 @@
-         (warn "makeinfo version ~a or greater is required, but ~a's \
-                version is ~a.  Skipping.\n" min-version makeinfo vers)))))
- 
--(define (do-info input makeinfo gzip)
-+(define (do-info input makeinfo)
-   (define info (path-swap-extension input "info"))
-   (or (string-null? makeinfo)
--      (string-null? gzip)
-       (not (check-makeinfo-version makeinfo "5.0"))
--      (and (do-process (make-cmd `(,makeinfo ,input)))
--           (begin (remove-files (glob #"~|info|*.gz"))
--                  (do-process (make-cmd `(,gzip "-n" ,info ,@(glob #"~|info|-[0-9]*"))))))))
-+      (and (do-process (make-cmd `(,makeinfo ,input))))))
- 
- (define (do-html input makeinfo)
-   (or (string-null? makeinfo)

diff --git a/dev-scheme/gauche/gauche-0.9.13.ebuild b/dev-scheme/gauche/gauche-0.9.13.ebuild
deleted file mode 100644
index 65974bc518ee..000000000000
--- a/dev-scheme/gauche/gauche-0.9.13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools
-
-MY_P="${P^g}"
-MY_P="${MY_P/_p/-p}"
-
-DESCRIPTION="A Unix system friendly Scheme Interpreter"
-HOMEPAGE="http://practical-scheme.net/gauche/"
-SRC_URI="https://github.com/shirok/${PN^g}/releases/download/release${PV//./_}/${MY_P}.tgz"
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-2)8"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 +mbedtls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/gdbm
-	virtual/libcrypt:=
-	mbedtls? ( net-libs/mbedtls:= )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/openssl:0 )"
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-ext-ldflags.patch
-	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${P}-info.patch
-	"${FILESDIR}"/${PN}-rfc.tls.patch
-	"${FILESDIR}"/${PN}-xz-info.patch
-)
-DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )
-
-src_prepare() {
-	default
-	use ipv6 && sed -i "s/ -4//" ext/tls/ssltest-mod.scm
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable ipv6) \
-		--with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
-		--with-slib="${EPREFIX}"/usr/share/slib \
-		--with-tls=$(usex mbedtls mbedtls axtls)
-}
-
-src_test() {
-	emake -j1 -s check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-pkg install-doc
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/
@ 2024-05-12  6:29 Akinori Hattori
  0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori @ 2024-05-12  6:29 UTC (permalink / raw
  To: gentoo-commits

commit:     420554edf748f2a561e6b691f207fa95affb6fad
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 06:23:41 2024 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun May 12 06:23:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420554ed

dev-scheme/gauche: rename patch

Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>

 dev-scheme/gauche/files/{gauche-info.patch => gauche-0.9.14-info.patch} | 0
 dev-scheme/gauche/gauche-0.9.14-r1.ebuild                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-scheme/gauche/files/gauche-info.patch b/dev-scheme/gauche/files/gauche-0.9.14-info.patch
similarity index 100%
rename from dev-scheme/gauche/files/gauche-info.patch
rename to dev-scheme/gauche/files/gauche-0.9.14-info.patch

diff --git a/dev-scheme/gauche/gauche-0.9.14-r1.ebuild b/dev-scheme/gauche/gauche-0.9.14-r1.ebuild
index f2441b774c98..6151e01fabcd 100644
--- a/dev-scheme/gauche/gauche-0.9.14-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.14-r1.ebuild
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-ext-ldflags.patch
 	"${FILESDIR}"/${PN}-gauche.m4.patch
-	"${FILESDIR}"/${PN}-info.patch
+	"${FILESDIR}"/${P}-info.patch
 	"${FILESDIR}"/${PN}-xz-info.patch
 )
 DOCS=( AUTHORS ChangeLog HACKING.adoc README.adoc )


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-05-12  6:29 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-11  6:40 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/gauche/, dev-scheme/gauche/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2024-05-12  6:29 Akinori Hattori
2024-03-24 13:10 Akinori Hattori
2022-01-31 13:20 Akinori Hattori
2022-01-31 13:20 Akinori Hattori
2021-01-26 14:47 Akinori Hattori
2021-01-26 14:47 Akinori Hattori
2019-09-27 14:37 Akinori Hattori
2018-07-11 13:42 Akinori Hattori
2018-06-23  6:50 Akinori Hattori
2016-11-29 10:19 Akinori Hattori
2016-11-27  7:35 Akinori Hattori
2016-11-27  7:25 Akinori Hattori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox