[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 246c63d55b1fed5b17d04fc2faedd49f34e5da17 Author: Akinori Hattori gentoo org> AuthorDate: Fri Feb 16 13:39:41 2024 + Commit: Akinori Hattori gentoo org> CommitDate: Fri Feb 16 13:39:41 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246c63d5 dev-scheme/stklos: drop old Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-2.00.ebuild | 58 1 file changed, 58 deletions(-) diff --git a/dev-scheme/stklos/stklos-2.00.ebuild b/dev-scheme/stklos/stklos-2.00.ebuild deleted file mode 100644 index 90fa3ef0c997.. --- a/dev-scheme/stklos/stklos-2.00.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools toolchain-funcs - -DESCRIPTION="Fast and light Scheme implementation" -HOMEPAGE="https://stklos.net/; -SRC_URI="https://${PN}.net/download/${P}.tar.gz; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="threads" - -RDEPEND="dev-libs/boehm-gc[threads?] - dev-libs/gmp:= - dev-libs/libffi:= - dev-libs/libpcre2:=" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -DOCS=( AUTHORS ChangeLog NEWS.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS ) - -src_prepare() { - default - - if ! use threads; then - sed -i '/threads.adoc/d' doc/refman/${PN}.adoc - rm -f tests/srfis/2{16,30}.stk - fi - eautoreconf - export LD="$(tc-getCC)" - export STKLOS_CONFDIR="${T}"/.config/${PN} -} - -src_configure() { - econf \ - --enable-threads=$(usex threads pthreads none) \ - --without-provided-bignum \ - --without-provided-ffi \ - --without-provided-gc \ - --without-provided-regexp -} - -src_compile() { - emake -} - -src_test() { - emake -j1 check -} - -src_install() { - default - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 13c1cce1c4c5056913a04556ab91b7bb65a58bcc Author: Akinori Hattori gentoo org> AuthorDate: Fri Feb 16 13:38:38 2024 + Commit: Akinori Hattori gentoo org> CommitDate: Fri Feb 16 13:38:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c1cce1 dev-scheme/stklos: amd64/x86 stable Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-2.00-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-scheme/stklos/stklos-2.00-r1.ebuild b/dev-scheme/stklos/stklos-2.00-r1.ebuild index 99bdac6e81f2..9e29a396bca6 100644 --- a/dev-scheme/stklos/stklos-2.00-r1.ebuild +++ b/dev-scheme/stklos/stklos-2.00-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://${PN}.net/download/${P}.tar.gz; LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="threads" RDEPEND="dev-libs/boehm-gc[threads?]
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/, dev-scheme/stklos/files/
commit: ad4408b7e41fd10ef76f08481287e5438ae5389c Author: Akinori Hattori gentoo org> AuthorDate: Wed Jan 17 11:56:15 2024 + Commit: Akinori Hattori gentoo org> CommitDate: Wed Jan 17 11:56:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4408b7 dev-scheme/stklos: respect LDFLAGS Closes: https://bugs.gentoo.org/920928 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/files/stklos-2.00-ldflags.patch | 15 ++ dev-scheme/stklos/stklos-2.00-r1.ebuild | 61 +++ 2 files changed, 76 insertions(+) diff --git a/dev-scheme/stklos/files/stklos-2.00-ldflags.patch b/dev-scheme/stklos/files/stklos-2.00-ldflags.patch new file mode 100644 index ..9e695718e6b0 --- /dev/null +++ b/dev-scheme/stklos/files/stklos-2.00-ldflags.patch @@ -0,0 +1,15 @@ +--- a/lib/Makefile.am b/lib/Makefile.am +@@ -195,12 +195,6 @@ + lib/streams: lib + lib/srfi: lib/scheme lib/stklos lib/streams + +-readline-complete.@SH_SUFFIX@: readline-complete.c +- @CC@ @CFLAGS@ @STKCFLAGS@ @SH_COMP_FLAGS@ -I../src @GCINC@ \ +- -c -o $*.o $*.c +- @SH_LOADER@ @SH_LOAD_FLAGS@ -o $*.@SH_SUFFIX@ $*.o @DLLIBS@ @RDLINE@ +- /bin/rm -f $*.o +- + # + # SRFIs support + # diff --git a/dev-scheme/stklos/stklos-2.00-r1.ebuild b/dev-scheme/stklos/stklos-2.00-r1.ebuild new file mode 100644 index ..99bdac6e81f2 --- /dev/null +++ b/dev-scheme/stklos/stklos-2.00-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools toolchain-funcs + +DESCRIPTION="Fast and light Scheme implementation" +HOMEPAGE="https://stklos.net/; +SRC_URI="https://${PN}.net/download/${P}.tar.gz; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="threads" + +RDEPEND="dev-libs/boehm-gc[threads?] + dev-libs/gmp:= + dev-libs/libffi:= + dev-libs/libpcre2:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-ldflags.patch +) +DOCS=( AUTHORS ChangeLog NEWS.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS ) + +src_prepare() { + default + + if ! use threads; then + sed -i '/threads.adoc/d' doc/refman/${PN}.adoc + rm -f tests/srfis/2{16,30}.stk + fi + eautoreconf + export LD="$(tc-getCC)" + export STKLOS_CONFDIR="${T}"/.config/${PN} +} + +src_configure() { + econf \ + --enable-threads=$(usex threads pthreads none) \ + --without-provided-bignum \ + --without-provided-ffi \ + --without-provided-gc \ + --without-provided-regexp +} + +src_compile() { + emake +} + +src_test() { + emake -j1 check +} + +src_install() { + default + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/files/, dev-scheme/stklos/
commit: 5dc927ef918e708e24cdc908d15b8efc59c9090b Author: Akinori Hattori gentoo org> AuthorDate: Mon Oct 30 13:10:25 2023 + Commit: Akinori Hattori gentoo org> CommitDate: Mon Oct 30 13:10:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc927ef dev-scheme/stklos: drop old Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/Manifest | 1 - .../files/stklos-1.70-configure-clang16.patch | 15 - dev-scheme/stklos/files/stklos-1.70-gentoo.patch | 66 -- dev-scheme/stklos/stklos-1.70-r1.ebuild| 60 4 files changed, 142 deletions(-) diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest index c9c0d75a26cd..88e50b32a85c 100644 --- a/dev-scheme/stklos/Manifest +++ b/dev-scheme/stklos/Manifest @@ -1,2 +1 @@ -DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9d47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f DIST stklos-2.00.tar.gz 9661074 BLAKE2B c43918f182e8502d5ea4dd0a2d42ea4e788a573ca1184d4e3af792f3932b7a626280110c30bffa9771d73ed7fdc2a29db19bcd7ce8d5a219c1c0b9ef19195c6d SHA512 b98ad62713cb5e85d26378e73e2198d44676a0103c8e890cc555defc5b058652c514bdf3a27b0cc34c71b0b72d9f5fc440f260f6aa68064c5adda6571d5f diff --git a/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch b/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch deleted file mode 100644 index 51fa0842c032.. --- a/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/881693 a/configure.ac -+++ b/configure.ac -@@ -446,8 +446,9 @@ fi - ### - ### See in what direction the stack grows (code stolen from Sawfish) - ### --AC_RUN_IFELSE([AC_LANG_SOURCE([[ void inner (char *foo) { char bar; exit (!(foo >= )); } -- void main () { char foo; inner (); } ]])],[STACK_DIRECTION="DOWN"],[STACK_DIRECTION="UP"],[echo "Stack direction is not detected when cross compiling for now"]) -+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include -+ void inner (char *foo) { char bar; exit (!(foo >= )); } -+ int main (void) { char foo; inner (); } ]])],[STACK_DIRECTION="DOWN"],[STACK_DIRECTION="UP"],[echo "Stack direction is not detected when cross compiling for now"]) - - - diff --git a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch deleted file mode 100644 index c9baba3bf268.. --- a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch +++ /dev/null @@ -1,66 +0,0 @@ a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -21,7 +21,6 @@ - #Creation date: 11-Apr-2000 10:30 (eg) - # Last file update: 1-Jun-2021 19:13 (eg) - --mandir = $(prefix)/share/man - man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ - stklos-pkg.1 stklos-script.1 - EXTRA_DIST= $(man_MANS) -@@ -33,12 +32,10 @@ - schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ - scheme_DATA = DOCDB - --doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ -- --docpdfdir = $(doclocation)/pdf -+docpdfdir = $(pdfdir) - docpdf_DATA = pdf/stklos-ref.pdf - --dochtmldir = $(doclocation)/html -+dochtmldir = $(htmldir) - dochtml_DATA= html/index.html \ - html/stklos-ref.html \ - html/stklos-ref-1.html\ -@@ -59,7 +56,7 @@ - html/stklos-ref-16.html \ - html/doc-style.css - --docimgdir = $(doclocation)/html/images -+docimgdir = $(htmldir)/images - docimg_DATA = html/images/hierarchy.jpg - - a/lib/Lalr.d/Makefile.am -+++ b/lib/Lalr.d/Makefile.am -@@ -34,7 +34,7 @@ - all: lalr.ostk calc - - install-sources: install -- mkdir -p $(schemedir) -+ mkdir -p $(DESTDIR)/$(schemedir) - cp lalr.stk $(DESTDIR)/$(schemedir) - - uninstall-hook: a/src/Makefile.am -+++ b/src/Makefile.am -@@ -123,8 +123,6 @@ - - - install-exec-hook: -- @echo "STRIP command: $$STRIP" -- if test "X$$STRIP" != "Xno" ;then $(STRIP) $(DESTDIR)/$(bindir)/stklos; fi; - mv $(DESTDIR)/$(bindir)/stklos $(DESTDIR)/$(bindir)/stklos-@VERSION@ - ln -s stklos-@VERSION@ $(DESTDIR)/$(bindir)/stklos - a/utils/shlib-options -+++ b/utils/shlib-options -@@ -173,6 +173,6 @@ - - echo "os=\"$os\"; version=\"$version\"; machine=\"$machine\"; OS=\"$OS\"; \ - OS_FLAVOUR=\"$OS_FLAVOUR\";SH_COMP_FLAGS=\"$SH_COMP_FLAGS\"; \ --SH_LOAD_FLAGS=\"$SH_LOAD_FLAGS\"; \ -+SH_LOAD_FLAGS=\"$LDFLAGS $SH_LOAD_FLAGS\"; \ - SH_LOADER=\"$SH_LOADER\"; SH_SUFFIX=\"$SH_SUFFIX\"; \ - SH_LIB_SUFFIX=\"$SH_LIB_SUFFIX\"; SH_MAIN_LOAD_FLAGS=\"$SH_MAIN_LOAD_FLAGS\"" diff --git a/dev-scheme/stklos/stklos-1.70-r1.ebuild b/dev-scheme/stklos/stklos-1.70-r1.ebuild deleted file
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: b977c2ce6909bf7304cbb8f4b5771e849d8f6570 Author: Akinori Hattori gentoo org> AuthorDate: Mon Oct 30 13:09:32 2023 + Commit: Akinori Hattori gentoo org> CommitDate: Mon Oct 30 13:09:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b977c2ce dev-scheme/stklos: amd64/x86 stable Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-2.00.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-scheme/stklos/stklos-2.00.ebuild b/dev-scheme/stklos/stklos-2.00.ebuild index fad97e515254..90fa3ef0c997 100644 --- a/dev-scheme/stklos/stklos-2.00.ebuild +++ b/dev-scheme/stklos/stklos-2.00.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://${PN}.net/download/${P}.tar.gz; LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="threads" RDEPEND="dev-libs/boehm-gc[threads?]
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/, dev-scheme/stklos/files/
commit: 69ee0e0e5b6b36e9a826fa1bc866178719eeb33d Author: Akinori Hattori gentoo org> AuthorDate: Wed Sep 27 13:41:09 2023 + Commit: Akinori Hattori gentoo org> CommitDate: Wed Sep 27 13:42:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ee0e0e dev-scheme/stklos: new upstream release Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/Manifest | 1 + dev-scheme/stklos/files/stklos-2.00-gentoo.patch | 153 +++ dev-scheme/stklos/stklos-2.00.ebuild | 58 + 3 files changed, 212 insertions(+) diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest index d2bff207e1e5..c9c0d75a26cd 100644 --- a/dev-scheme/stklos/Manifest +++ b/dev-scheme/stklos/Manifest @@ -1 +1,2 @@ DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9d47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f +DIST stklos-2.00.tar.gz 9661074 BLAKE2B c43918f182e8502d5ea4dd0a2d42ea4e788a573ca1184d4e3af792f3932b7a626280110c30bffa9771d73ed7fdc2a29db19bcd7ce8d5a219c1c0b9ef19195c6d SHA512 b98ad62713cb5e85d26378e73e2198d44676a0103c8e890cc555defc5b058652c514bdf3a27b0cc34c71b0b72d9f5fc440f260f6aa68064c5adda6571d5f diff --git a/dev-scheme/stklos/files/stklos-2.00-gentoo.patch b/dev-scheme/stklos/files/stklos-2.00-gentoo.patch new file mode 100644 index ..83c33b8f0b2a --- /dev/null +++ b/dev-scheme/stklos/files/stklos-2.00-gentoo.patch @@ -0,0 +1,153 @@ +--- a/configure.ac b/configure.ac +@@ -143,28 +143,10 @@ +htmldir="${docdir}/html" + fi + +-# Manage standard options --libdir and --datadir +-# If the user doesn't specify these option, we fix +-# libdir to ${prefix}/lib/ +-# datadir to ${prefix}/share +-# Otherwise, we take the user provided values. +-# +-# In any case, we will place our files in the stklos/${VERSION} subdir +- +-if test "$LIBDIR" == "" ; then +- # user has not given a "--libdir" option. Use ${prefix}/lib/stklos/${VERSION} +- libdir="${prefix}/lib/${PACKAGE_TARNAME}/${VERSION}" +-fi +- +-if test "$DATADIR" == "" ; then +- # user has not given a "--datadir" option. Use ${prefix}/share/stklos/${VERSION} +- datadir="${prefix}/share/${PACKAGE_TARNAME}/${VERSION}" +-fi +- + ### Initialize the extra conf file in src + PREFIX=$prefix +-SCMDIR=$datadir +-EXECDIR=$libdir ++SCMDIR="${datadir}/${PACKAGE_TARNAME}/${VERSION}" ++EXECDIR="${libdir}/${PACKAGE_TARNAME}/${VERSION}" + + + ### Determine the kind of the machine which is running this script +--- a/lib/Lalr.d/Makefile.am b/lib/Lalr.d/Makefile.am +@@ -33,8 +33,8 @@ + all: lalr.ostk calc + + install-sources: install +- mkdir -p $(schemedir) +- cp lalr.stk $(DESTDIR)/$(schemedir) ++ mkdir -p $(DESTDIR)$(schemedir) ++ cp lalr.stk $(DESTDIR)$(schemedir) + + uninstall-hook: + rm -f $(DESTDIR)/$(schemedir)/lalr.stk +--- a/lib/Makefile.am b/lib/Makefile.am +@@ -174,7 +174,7 @@ + @for i in $(SUBDIRS) ;do \ + (cd $$i; $(MAKE) install-sources)\ + done +- cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)/$(schemedir) ++ cp $(SRC_STK) $(scheme_BOOT) $(DESTDIR)$(schemedir) + + + # Explicit some dependencies here +--- a/lib/SILex.d/Makefile.am b/lib/SILex.d/Makefile.am +@@ -25,8 +25,8 @@ + SRC= silex.scm multilex.scm + + install-sources: +- mkdir -p $(DESTDIR)/$(schemedir) +- cp $(SRC) $(DESTDIR)/$(schemedir) ++ mkdir -p $(DESTDIR)$(schemedir) ++ cp $(SRC) $(DESTDIR)$(schemedir) + + + uninstall-hook: +--- a/lib/scheme/Makefile.am b/lib/scheme/Makefile.am +@@ -189,7 +189,7 @@ + @for i in $(SUBDIRS) ;do \ + (cd $$i; $(MAKE) install-sources)\ + done +- cp $(scheme_sources) $(schemedir) ++ cp $(scheme_sources) $(DESTDIR)$(schemedir) + + clean: + (cd vector; $(MAKE) clean) +--- a/lib/scheme/vector/Makefile.am b/lib/scheme/vector/Makefile.am +@@ -130,8 +130,8 @@ + #== + + install-sources: +- mkdir -p $(srfidir) +- cp $(srfi_sources) $(srfi_interm) $(srfidir) ++ mkdir -p $(DESTDIR)$(srfidir) ++ cp $(srfi_sources) $(srfi_interm) $(DESTDIR)$(srfidir) + + # we also clean the TAG.stk files -- $(srfi-interm) --, which are NOT + # srfi_OBJS (should not be installed with other objects): +--- a/lib/srfi/160/Makefile.am b/lib/srfi/160/Makefile.am +@@ -140,8 +140,8 @@ + #== + + install-sources: +- mkdir -p $(srfidir) +- cp $(srfi_sources) $(srfidir) ++ mkdir -p $(DESTDIR)$(srfidir) ++ cp $(srfi_sources) $(DESTDIR)$(srfidir) + + clean: + rm -f $(srfi_OBJS) *-incl.c *~ +--- a/lib/srfi/Makefile.am
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 78447ce08717746b39b52a8198d8ef5b5f26a125 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 03:08:11 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 04:01:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78447ce0 dev-scheme/stklos: add github, gitlab upstream metadata Signed-off-by: Sam James gentoo.org> dev-scheme/stklos/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-scheme/stklos/metadata.xml b/dev-scheme/stklos/metadata.xml index aaf615253e8c..267080d36fd9 100644 --- a/dev-scheme/stklos/metadata.xml +++ b/dev-scheme/stklos/metadata.xml @@ -12,4 +12,8 @@ Virtual Machine. STklos can also be compiled as a library and embedded in an application. + + egallesio/STklos + Gallesio/STklos +
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/, dev-scheme/stklos/files/
commit: e5bc664a82ec2d232b2ed28c49ece09ffa91ba6f Author: Sam James gentoo org> AuthorDate: Thu Nov 17 20:36:53 2022 + Commit: Sam James gentoo org> CommitDate: Thu Nov 17 20:37:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5bc664a dev-scheme/stklos: fix configure w/ clang 16 Closes: https://bugs.gentoo.org/881693 Signed-off-by: Sam James gentoo.org> .../stklos/files/stklos-1.70-configure-clang16.patch | 15 +++ .../stklos/{stklos-1.70.ebuild => stklos-1.70-r1.ebuild} | 14 ++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch b/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch new file mode 100644 index ..51fa0842c032 --- /dev/null +++ b/dev-scheme/stklos/files/stklos-1.70-configure-clang16.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/881693 +--- a/configure.ac b/configure.ac +@@ -446,8 +446,9 @@ fi + ### + ### See in what direction the stack grows (code stolen from Sawfish) + ### +-AC_RUN_IFELSE([AC_LANG_SOURCE([[ void inner (char *foo) { char bar; exit (!(foo >= )); } +- void main () { char foo; inner (); } ]])],[STACK_DIRECTION="DOWN"],[STACK_DIRECTION="UP"],[echo "Stack direction is not detected when cross compiling for now"]) ++AC_RUN_IFELSE([AC_LANG_SOURCE([[#include ++ void inner (char *foo) { char bar; exit (!(foo >= )); } ++ int main (void) { char foo; inner (); } ]])],[STACK_DIRECTION="DOWN"],[STACK_DIRECTION="UP"],[echo "Stack direction is not detected when cross compiling for now"]) + + + diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70-r1.ebuild similarity index 86% rename from dev-scheme/stklos/stklos-1.70.ebuild rename to dev-scheme/stklos/stklos-1.70-r1.ebuild index d138654b1211..af8d4da1cbde 100644 --- a/dev-scheme/stklos/stklos-1.70.ebuild +++ b/dev-scheme/stklos/stklos-1.70-r1.ebuild @@ -5,7 +5,7 @@ EAPI="8" inherit autotools toolchain-funcs -DESCRIPTION="fast and light Scheme implementation" +DESCRIPTION="Fast and light Scheme implementation" HOMEPAGE="https://www.stklos.net/; SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; @@ -20,18 +20,24 @@ RDEPEND="dev-libs/boehm-gc[threads?] dev-libs/libpcre" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) DOCS=( AUTHORS ChangeLog {HACKING,NEWS}.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-configure-clang16.patch +) + src_prepare() { + default + use threads || rm -f tests/srfis/216.stk - default eautoreconf - export LD="$(tc-getCC)" } src_configure() { + export LD="$(tc-getCC)" + econf \ --enable-threads=$(usex threads pthreads none) \ --without-gmp-light \
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/files/, dev-scheme/stklos/
commit: 2ece76f94474ac1749a599bbe0707dc61360ffb7 Author: Akinori Hattori gentoo org> AuthorDate: Thu Mar 3 12:47:36 2022 + Commit: Akinori Hattori gentoo org> CommitDate: Thu Mar 3 12:47:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ece76f9 dev-scheme/stklos: drop old Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/Manifest | 1 - dev-scheme/stklos/files/stklos-1.10-gentoo.patch | 40 -- dev-scheme/stklos/stklos-1.10-r2.ebuild | 53 3 files changed, 94 deletions(-) diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest index c40762c851b0..d2bff207e1e5 100644 --- a/dev-scheme/stklos/Manifest +++ b/dev-scheme/stklos/Manifest @@ -1,2 +1 @@ -DIST stklos-1.10.tar.gz 6097807 BLAKE2B bfb957c54626d29cc1ecba553a0b982022b1ed0b89f333d763937e8c5f84b5c6b80ebc1e6531d968f4b33d72427a4f9957c010932308672907e105d37828ee50 SHA512 64877dec82b4c19bcaea95f6c60a4b9dff19c11bf11792fa5204d0ca3bb6f6962cc9250b35dcd5f01015e430b9a027add4f40c6a7169858893cab3e8c8df0bbb DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9d47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f diff --git a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch deleted file mode 100644 index 56f5440cf1dc.. --- a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch +++ /dev/null @@ -1,40 +0,0 @@ a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -4,7 +4,6 @@ - #Creation date: 11-Apr-2000 10:30 (eg) - # Last file update: 23-Oct-2010 11:52 (eg) - --mandir = $(prefix)/share/man - man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ - stklos-pkg.1 - EXTRA_DIST= $(man_MANS) -@@ -16,15 +16,13 @@ - schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ - scheme_DATA = DOCDB - --doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ -- --docpdfdir = $(doclocation)/pdf -+docpdfdir = $(pdfdir) - docpdf_DATA = pdf/stklos-ref.pdf - --dochtmldir = $(doclocation)/html -+dochtmldir = $(htmldir) - dochtml_DATA= $(wildcard html/stklos-ref*.html) $(wildcard html/*.css) - --docimgdir = $(doclocation)/html/images -+docimgdir = $(htmldir)/images - docimg_DATA = $(wildcard html/images/*) - - a/pkgman/Makefile.am -+++ b/pkgman/Makefile.am -@@ -4,7 +4,7 @@ - # Last file update: 4-Dec-2011 16:48 (eg) - - --makefiledir= $(prefix)/etc/stklos -+makefiledir= $(prefix)/share/@PACKAGE@/@VERSION@/etc - makefile_DATA= etc/Makefile-scmpkg.tmpl - - bin_SCRIPTS = stklos-pkg diff --git a/dev-scheme/stklos/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild deleted file mode 100644 index 72aa6c496083.. --- a/dev-scheme/stklos/stklos-1.10-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit autotools - -DESCRIPTION="fast and light Scheme implementation" -HOMEPAGE="https://www.stklos.net/; -SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="threads" - -RDEPEND="dev-libs/boehm-gc[threads?] - dev-libs/gmp:= - dev-libs/libffi:= - dev-libs/libpcre" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -DOCS=( AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS ) - -src_prepare() { - rm -rf {ffi,gc,gmp,pcre} - - default - eautoreconf -} - -src_configure() { - econf \ - --enable-threads=$(usex threads pthreads none) \ - --without-gmp-light \ - --without-provided-ffi \ - --without-provided-gc \ - --without-provided-regexp -} - -src_compile() { - emake -j1 -} - -src_test() { - emake -j1 check -} - -src_install() { - default - einstalldocs -}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 4c08b9e8940f49f989a64c24e9479c476042f312 Author: Akinori Hattori gentoo org> AuthorDate: Thu Mar 3 12:46:30 2022 + Commit: Akinori Hattori gentoo org> CommitDate: Thu Mar 3 12:46:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c08b9e8 dev-scheme/stklos: amd64/x86 stable Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-1.70.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70.ebuild index 74b2eb58dcf5..d138654b1211 100644 --- a/dev-scheme/stklos/stklos-1.70.ebuild +++ b/dev-scheme/stklos/stklos-1.70.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" @@ -11,7 +11,7 @@ SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="threads" RDEPEND="dev-libs/boehm-gc[threads?]
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/, dev-scheme/stklos/files/
commit: 82e7fd5a9995d2748ccd54ff0b5c3624a66c2c5d Author: Akinori Hattori gentoo org> AuthorDate: Mon Nov 29 13:24:42 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Mon Nov 29 13:24:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e7fd5a dev-scheme/stklos: respect LDFLAGS Closes: https://bugs.gentoo.org/827754 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/files/stklos-1.70-gentoo.patch | 10 ++ dev-scheme/stklos/stklos-1.70.ebuild | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch index 954b15a617b2..c9baba3bf268 100644 --- a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch +++ b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch @@ -54,3 +54,13 @@ mv $(DESTDIR)/$(bindir)/stklos $(DESTDIR)/$(bindir)/stklos-@VERSION@ ln -s stklos-@VERSION@ $(DESTDIR)/$(bindir)/stklos +--- a/utils/shlib-options b/utils/shlib-options +@@ -173,6 +173,6 @@ + + echo "os=\"$os\"; version=\"$version\"; machine=\"$machine\"; OS=\"$OS\"; \ + OS_FLAVOUR=\"$OS_FLAVOUR\";SH_COMP_FLAGS=\"$SH_COMP_FLAGS\"; \ +-SH_LOAD_FLAGS=\"$SH_LOAD_FLAGS\"; \ ++SH_LOAD_FLAGS=\"$LDFLAGS $SH_LOAD_FLAGS\"; \ + SH_LOADER=\"$SH_LOADER\"; SH_SUFFIX=\"$SH_SUFFIX\"; \ + SH_LIB_SUFFIX=\"$SH_LIB_SUFFIX\"; SH_MAIN_LOAD_FLAGS=\"$SH_MAIN_LOAD_FLAGS\"" diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70.ebuild index b3cc1f2b0cc6..74b2eb58dcf5 100644 --- a/dev-scheme/stklos/stklos-1.70.ebuild +++ b/dev-scheme/stklos/stklos-1.70.ebuild @@ -3,7 +3,7 @@ EAPI="8" -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="fast and light Scheme implementation" HOMEPAGE="https://www.stklos.net/; @@ -28,6 +28,7 @@ src_prepare() { default eautoreconf + export LD="$(tc-getCC)" } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/files/, dev-scheme/stklos/
commit: e645ec1b64380686ddcd772b5fdcb29cb2f7055c Author: Akinori Hattori gentoo org> AuthorDate: Sat Nov 27 06:38:15 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Nov 27 06:39:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e645ec1b dev-scheme/stklos: new upstream release Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/Manifest | 1 + dev-scheme/stklos/files/stklos-1.70-gentoo.patch | 56 dev-scheme/stklos/stklos-1.70.ebuild | 53 ++ 3 files changed, 110 insertions(+) diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest index 4074e491edc0..c40762c851b0 100644 --- a/dev-scheme/stklos/Manifest +++ b/dev-scheme/stklos/Manifest @@ -1 +1,2 @@ DIST stklos-1.10.tar.gz 6097807 BLAKE2B bfb957c54626d29cc1ecba553a0b982022b1ed0b89f333d763937e8c5f84b5c6b80ebc1e6531d968f4b33d72427a4f9957c010932308672907e105d37828ee50 SHA512 64877dec82b4c19bcaea95f6c60a4b9dff19c11bf11792fa5204d0ca3bb6f6962cc9250b35dcd5f01015e430b9a027add4f40c6a7169858893cab3e8c8df0bbb +DIST stklos-1.70.tar.gz 8767615 BLAKE2B 7cae5b5d0c9b2d9d47e78e70a562f2d1751de068668777441d29ee15be7f3c5c285b8297e367311cd8c9695c9a2d083ad7ea1d9c21c838cf1d819f7cb82c SHA512 64da09171b191688f750f10c29f10cd7393f326555d4324344faeac63547a2548407490e44a50f0afa348487bd9cc5106f3c344cab6935f3a3516b3c064a596f diff --git a/dev-scheme/stklos/files/stklos-1.70-gentoo.patch b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch new file mode 100644 index ..954b15a617b2 --- /dev/null +++ b/dev-scheme/stklos/files/stklos-1.70-gentoo.patch @@ -0,0 +1,56 @@ +--- a/doc/Makefile.am b/doc/Makefile.am +@@ -21,7 +21,6 @@ + #Creation date: 11-Apr-2000 10:30 (eg) + # Last file update: 1-Jun-2021 19:13 (eg) + +-mandir = $(prefix)/share/man + man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ + stklos-pkg.1 stklos-script.1 + EXTRA_DIST= $(man_MANS) +@@ -33,12 +32,10 @@ + schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ + scheme_DATA = DOCDB + +-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +- +-docpdfdir = $(doclocation)/pdf ++docpdfdir = $(pdfdir) + docpdf_DATA = pdf/stklos-ref.pdf + +-dochtmldir = $(doclocation)/html ++dochtmldir = $(htmldir) + dochtml_DATA= html/index.html \ + html/stklos-ref.html \ + html/stklos-ref-1.html\ +@@ -59,7 +56,7 @@ + html/stklos-ref-16.html \ + html/doc-style.css + +-docimgdir = $(doclocation)/html/images ++docimgdir = $(htmldir)/images + docimg_DATA = html/images/hierarchy.jpg + + +--- a/lib/Lalr.d/Makefile.am b/lib/Lalr.d/Makefile.am +@@ -34,7 +34,7 @@ + all: lalr.ostk calc + + install-sources: install +- mkdir -p $(schemedir) ++ mkdir -p $(DESTDIR)/$(schemedir) + cp lalr.stk $(DESTDIR)/$(schemedir) + + uninstall-hook: +--- a/src/Makefile.am b/src/Makefile.am +@@ -123,8 +123,6 @@ + + + install-exec-hook: +- @echo "STRIP command: $$STRIP" +- if test "X$$STRIP" != "Xno" ;then $(STRIP) $(DESTDIR)/$(bindir)/stklos; fi; + mv $(DESTDIR)/$(bindir)/stklos $(DESTDIR)/$(bindir)/stklos-@VERSION@ + ln -s stklos-@VERSION@ $(DESTDIR)/$(bindir)/stklos + diff --git a/dev-scheme/stklos/stklos-1.70.ebuild b/dev-scheme/stklos/stklos-1.70.ebuild new file mode 100644 index ..b3cc1f2b0cc6 --- /dev/null +++ b/dev-scheme/stklos/stklos-1.70.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools + +DESCRIPTION="fast and light Scheme implementation" +HOMEPAGE="https://www.stklos.net/; +SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="threads" + +RDEPEND="dev-libs/boehm-gc[threads?] + dev-libs/gmp:= + dev-libs/libffi:= + dev-libs/libpcre" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +DOCS=( AUTHORS ChangeLog {HACKING,NEWS}.md PACKAGES-USED {PORTING-NOTES,README}.md SUPPORTED-SRFIS ) + +src_prepare() { + use threads || rm -f tests/srfis/216.stk + + default + eautoreconf +} + +src_configure() { + econf \ + --enable-threads=$(usex threads pthreads none) \ + --without-gmp-light \ + --without-provided-ffi \ + --without-provided-gc \ + --without-provided-regexp +} + +src_compile() { + emake -j1 +} + +src_test() { + emake -j1 check +} + +src_install() { + default + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 9d703f43293f148219ceca108ab602083b417c03 Author: Akinori Hattori gentoo org> AuthorDate: Sat Nov 27 06:32:16 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Nov 27 06:39:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d703f43 dev-scheme/stklos: update to EAPI 8 Closes: https://bugs.gentoo.org/423823 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-1.10-r1.ebuild | 35 --- dev-scheme/stklos/stklos-1.10-r2.ebuild | 49 + 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild deleted file mode 100644 index e1342e7a0c12.. --- a/dev-scheme/stklos/stklos-1.10-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="fast and light Scheme implementation" -HOMEPAGE="https://www.stklos.net/; -SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; -LICENSE="GPL-2+" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="threads" -DEPEND="dev-libs/gmp:= dev-libs/libpcre dev-libs/libffi dev-libs/boehm-gc[threads?]" -RDEPEND="${DEPEND}" - -#parallel build failure reported upstream -MAKEOPTS=-j1 - -src_prepare() { - # kill bundled libs - rm -rf "${S}"/{ffi,gc,gmp,pcre} || die - default -} - -src_configure() { - econf --enable-threads=$(if use threads; then echo pthreads; else echo none; fi) \ - --without-gmp-light --without-provided-gc \ - --without-provided-regexp --without-provided-ffi -} - -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS -} diff --git a/dev-scheme/stklos/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild new file mode 100644 index ..6fd3a1acef34 --- /dev/null +++ b/dev-scheme/stklos/stklos-1.10-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="fast and light Scheme implementation" +HOMEPAGE="https://www.stklos.net/; +SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="threads" + +RDEPEND="dev-libs/boehm-gc[threads?] + dev-libs/gmp:= + dev-libs/libffi:= + dev-libs/libpcre" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS ) + +src_prepare() { + rm -rf {ffi,gc,gmp,pcre} + + default +} + +src_configure() { + econf \ + --enable-threads=$(usex threads pthreads none) \ + --without-gmp-light \ + --without-provided-ffi \ + --without-provided-gc \ + --without-provided-regexp +} + +src_compile() { + emake -j1 +} + +src_test() { + emake -j1 check +} + +src_install() { + default + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: f0d31d5d3976926b62468eb06173ca7e4be57110 Author: Akinori Hattori gentoo org> AuthorDate: Sat Nov 27 06:30:05 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Nov 27 06:39:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d31d5d dev-scheme/stklos: update LICENSE Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-1.10-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild index 4f940946cf2a..e1342e7a0c12 100644 --- a/dev-scheme/stklos/stklos-1.10-r1.ebuild +++ b/dev-scheme/stklos/stklos-1.10-r1.ebuild @@ -6,7 +6,7 @@ EAPI=6 DESCRIPTION="fast and light Scheme implementation" HOMEPAGE="https://www.stklos.net/; SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 39bf9ed0546581b90b3e614f674e3785ee4a1c52 Author: Akinori Hattori gentoo org> AuthorDate: Sat Nov 27 06:29:18 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Nov 27 06:39:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39bf9ed0 dev-scheme/stklos: update HOMEPAGE and SRC_URI Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/stklos-1.10-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild index 9a71d6c6b8bf..4f940946cf2a 100644 --- a/dev-scheme/stklos/stklos-1.10-r1.ebuild +++ b/dev-scheme/stklos/stklos-1.10-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DESCRIPTION="fast and light Scheme implementation" -HOMEPAGE="http://www.stklos.net; -SRC_URI="http://www.stklos.net/download/${P}.tar.gz; +HOMEPAGE="https://www.stklos.net/; +SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; LICENSE="GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/, dev-scheme/stklos/files/
commit: 62be5bffdc69157a8838a5699b09629fb465703b Author: Akinori Hattori gentoo org> AuthorDate: Sat Nov 27 06:34:46 2021 + Commit: Akinori Hattori gentoo org> CommitDate: Sat Nov 27 06:39:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62be5bff dev-scheme/stklos: fix installation paths Closes: https://bugs.gentoo.org/803914 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Akinori Hattori gentoo.org> dev-scheme/stklos/files/stklos-1.10-gentoo.patch | 40 dev-scheme/stklos/stklos-1.10-r2.ebuild | 4 +++ 2 files changed, 44 insertions(+) diff --git a/dev-scheme/stklos/files/stklos-1.10-gentoo.patch b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch new file mode 100644 index ..56f5440cf1dc --- /dev/null +++ b/dev-scheme/stklos/files/stklos-1.10-gentoo.patch @@ -0,0 +1,40 @@ +--- a/doc/Makefile.am b/doc/Makefile.am +@@ -4,7 +4,6 @@ + #Creation date: 11-Apr-2000 10:30 (eg) + # Last file update: 23-Oct-2010 11:52 (eg) + +-mandir = $(prefix)/share/man + man_MANS = stklos.1 stklos-config.1 stklos-compile.1 stklos-genlex.1 \ + stklos-pkg.1 + EXTRA_DIST= $(man_MANS) +@@ -16,15 +16,13 @@ + schemedir = $(prefix)/share/@PACKAGE@/@VERSION@ + scheme_DATA = DOCDB + +-doclocation = $(prefix)/share/doc/@PACKAGE@-@VERSION@ +- +-docpdfdir = $(doclocation)/pdf ++docpdfdir = $(pdfdir) + docpdf_DATA = pdf/stklos-ref.pdf + +-dochtmldir = $(doclocation)/html ++dochtmldir = $(htmldir) + dochtml_DATA= $(wildcard html/stklos-ref*.html) $(wildcard html/*.css) + +-docimgdir = $(doclocation)/html/images ++docimgdir = $(htmldir)/images + docimg_DATA = $(wildcard html/images/*) + + +--- a/pkgman/Makefile.am b/pkgman/Makefile.am +@@ -4,7 +4,7 @@ + # Last file update: 4-Dec-2011 16:48 (eg) + + +-makefiledir= $(prefix)/etc/stklos ++makefiledir= $(prefix)/share/@PACKAGE@/@VERSION@/etc + makefile_DATA= etc/Makefile-scmpkg.tmpl + + bin_SCRIPTS = stklos-pkg diff --git a/dev-scheme/stklos/stklos-1.10-r2.ebuild b/dev-scheme/stklos/stklos-1.10-r2.ebuild index 6fd3a1acef34..72aa6c496083 100644 --- a/dev-scheme/stklos/stklos-1.10-r2.ebuild +++ b/dev-scheme/stklos/stklos-1.10-r2.ebuild @@ -3,6 +3,8 @@ EAPI="8" +inherit autotools + DESCRIPTION="fast and light Scheme implementation" HOMEPAGE="https://www.stklos.net/; SRC_URI="https://www.${PN}.net/download/${P}.tar.gz; @@ -18,12 +20,14 @@ RDEPEND="dev-libs/boehm-gc[threads?] dev-libs/libpcre" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) DOCS=( AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS ) src_prepare() { rm -rf {ffi,gc,gmp,pcre} default + eautoreconf } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: 33c6c4a48fb0fea1d994d7b1d2ff45f78d073fba Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Nov 16 22:51:27 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Nov 16 22:53:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c6c4a4 dev-scheme/stklos: use dev-libs/libffi instead of virtual/libffi Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergei Trofimovich gentoo.org> dev-scheme/stklos/stklos-1.10-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-scheme/stklos/stklos-1.10-r1.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild index 16e52f98762..9a71d6c6b8b 100644 --- a/dev-scheme/stklos/stklos-1.10-r1.ebuild +++ b/dev-scheme/stklos/stklos-1.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="threads" -DEPEND="dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]" +DEPEND="dev-libs/gmp:= dev-libs/libpcre dev-libs/libffi dev-libs/boehm-gc[threads?]" RDEPEND="${DEPEND}" #parallel build failure reported upstream
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/stklos/
commit: ae9927335753a768f7f9c70558d6895d924d7a24 Author: Amy Liffey gentoo org> AuthorDate: Wed Aug 2 21:13:02 2017 + Commit: Amy Liffey gentoo org> CommitDate: Wed Aug 2 21:15:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae992733 dev-scheme/stklos: eapi bump to 6 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../stklos/{stklos-1.10.ebuild => stklos-1.10-r1.ebuild} | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-scheme/stklos/stklos-1.10.ebuild b/dev-scheme/stklos/stklos-1.10-r1.ebuild similarity index 71% rename from dev-scheme/stklos/stklos-1.10.ebuild rename to dev-scheme/stklos/stklos-1.10-r1.ebuild index 89f935812c6..16e52f98762 100644 --- a/dev-scheme/stklos/stklos-1.10.ebuild +++ b/dev-scheme/stklos/stklos-1.10-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="3" +EAPI=6 DESCRIPTION="fast and light Scheme implementation" HOMEPAGE="http://www.stklos.net; @@ -11,7 +11,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="threads" -DEPEND="dev-libs/gmp dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]" +DEPEND="dev-libs/gmp:= dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]" RDEPEND="${DEPEND}" #parallel build failure reported upstream @@ -19,7 +19,8 @@ MAKEOPTS=-j1 src_prepare() { # kill bundled libs - rm -rf "${S}"/{ffi,gc,gmp,pcre} + rm -rf "${S}"/{ffi,gc,gmp,pcre} || die + default } src_configure() { @@ -29,7 +30,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Install failed" - dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS \ - || die "dodocs failed" + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS }