summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-scheme/gauche')
-rw-r--r--dev-scheme/gauche/Manifest2
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch11
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch19
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch12
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-rpath.patch10
-rw-r--r--dev-scheme/gauche/files/gauche-0.9-xz-info.patch31
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.3.3-file.util.patch21
-rw-r--r--dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch120
-rw-r--r--dev-scheme/gauche/gauche-0.9.3.3.ebuild52
-rw-r--r--dev-scheme/gauche/gauche-0.9.4-r1.ebuild56
10 files changed, 0 insertions, 334 deletions
diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 92711774c987..d8fb93ee2595 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 a9de4114d2bf..000000000000
--- 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 8c4d3180836a..000000000000
--- 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 0bce39ad9929..000000000000
--- 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 ca76cb831234..000000000000
--- 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 809879c4cbd8..000000000000
--- 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 1e4cd5d19521..000000000000
--- 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 a44ee75b8d1a..000000000000
--- 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 011ca66086e3..000000000000
--- 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 4cdcd5cc5d74..000000000000
--- 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
-}