gentoo resync : 02.02.2022

5 files changed, 177 insertions, 21 deletions

diff --git a/dev-scheme/gauche/Manifest b/dev-scheme/gauche/Manifest
index 5265f3f89d5a..a075fd3964ee 100644
--- a/dev-scheme/gauche/Manifest
+++ b/dev-scheme/gauche/Manifest
@@ -1,10 +1,13 @@
+AUX gauche-0.9.10-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
 AUX gauche-0.9.10-srfi-134.patch 2281 BLAKE2B 5854b345162f319092090578afa8899d129e865ed75e5902d3518cd736e7268453dc4f4043fbdac5d90073026e8fcd28e2a42b911021da0dc44047dfd7cd9e18 SHA512 797267d2276b90736c0824566b1c9218399d0e68e972fa53830dfb85ad6946b2a6ad2a19aaabbba9aa63c1c36b5628856318a4d3b328b1cbed0ca3ac5f73c8b5
 AUX gauche-ext-ldflags.patch 384 BLAKE2B 57b7463086c0763413b8fda3d7688c6a61bd4456b3209a80b6eabed088e0c71eb5ae4c53b18fb0e6b7468ac03fe33f7884f265ab1ea998e8457b0ef126e6e841 SHA512 df42c5f25adc5a67ad049ab78aeaa4f565d18818dd6dfff5a64a78e9e3101595a4279d72e8f946e4f7da7be30f9f11c089c7f4a65d2eb2135980414c3d6e9cbb
 AUX gauche-gauche.m4.patch 964 BLAKE2B f02f2a1fad5d2ce923d1f9a8af4506908afea5b24c65d30ac2dbc6402c826f1ee374bfbb0ac7e9896a980fa352620f7ef8d2d79fe1b0ccb4915e3ceb86dfd90d SHA512 81bd71285f9f7f7f6b310347905fa2b0c7b708a0bb8bfa33414b14591d5849f0b42d9a6f01f22abb307417778181c292d8ff7e42be259b7d4de09356ea1692ab
-AUX gauche-info.patch 3580 BLAKE2B e2563129f965c14c051f08ec5a2556b925cb0611f53a05b86a255f394be296db242ea77e7928947d5ecc56e34e22eebf45175f3bae51303d0dd8d341504cabef SHA512 393505178660b046971ba7090a57cce879561e2bd8d2005c771173e65d522bc8b9c7677a19cb49b3b5b94ba265dc0da6137d5999d743d6ae781eaa185ea86e89
+AUX gauche-info.patch 3633 BLAKE2B 70f3be628d369acca97524370cb66c08e24390434c1b8c92e02004548f168d2e6f999b87e6903de50212c22ba249f91ef79bf7ce9c2109c05f3a7d4f12a4f9bb SHA512 a6d3873d940bccf59fff486bbd26fd5f101281e88e65926634992cb72c8c17eb8d95046ae6f739e0757431a339b891637ba9149cb7396abb2f265b4cc2406e29
 AUX gauche-rfc.tls.patch 277 BLAKE2B 91e745207e64ba3c83a1252be6fa63c486a3ebf148149b5772720a862299fa9bbf122a75ed8a537a29b78d75cf785ccc72de3194969931c62b52a7c1b7007208 SHA512 6aceaf321a1593765c91a83b14e057b2ee514e768299fa43c71bbe5f04b8b60a0537fd68cb8b4b5a61b091d5c4f50dc227bde2637d6be33956089dc0e40ab968
 AUX gauche-xz-info.patch 1248 BLAKE2B 8c87339d3739da774da858f43345bb6063fe2fafdfda3e791a67aee7773be4c1312c11aa37f1532203a7e1d4805cf3fa0ec80ce28f52d05c43df8536efa199a2 SHA512 7cbbfc17ef28aaa29dffe03d2d8afa01cc92897f5c08c9ba1ddd7926d45207100a44ccb8efd745f2f98c8d9a83ca0ca20a6c611329c3a80dea5692002467c52b
 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
-EBUILD gauche-0.9.10-r1.ebuild 1457 BLAKE2B 7a48d9785d98db2a516235e463311a5f620345f2ddb1530dc62fae75acec14dcf1053158dd69d5ddf6323abf48e326deb13b41d2d6825706430f8ea8ce0ad842 SHA512 a4c370a394b7e2346cc384f0a0face23ae4cb8101b1bb52bfd75cbf80f9a53ccf20adc3f7ebf55313be89ab958174c10ef6b44fcb28395042cfd4bef4d265d18
+EBUILD gauche-0.9.10-r1.ebuild 1453 BLAKE2B 5f873039adc0c6aff74f3432926c572e3c644542a1092543635f04c13abb63244765191abe61c173bdcbc0751a08f5eb45266c489d3958a0d8cd4b6f2c5f2b34 SHA512 00b41696e8b9f40e497c0a9ba9365efe457e28f4b72f759c40c8685cc3d9b6a232c24466101499d4825a7a8852d3d21a6f9f958f1e33cca3d6922f5c50fe0872
+EBUILD gauche-0.9.11_p1.ebuild 1380 BLAKE2B 6bfc5a98ab744e1457e75ad6ade576dc87830051cbfe94e5b3e94537e8f401bc0462f71fced9eb7b4c704514e7f613be641656246f682b80255a138f8cbdeb3c SHA512 937017884c763b5f8a958952644f4ae5c1dd230c10dc146c57d2f8923d3604f34b30aea1bf7c71ed39b9b1773c1af7c54a7456e5c77236640fa7b347b742f987
 MISC metadata.xml 910 BLAKE2B e521ff4a434554441bb94b2c2246a02f5f1d976b77cde7fd8f8364108cb6c000c794f8413d636b8b13bbb89ec03b3042d3ccb0599a25c6894aef4e5282544c50 SHA512 6a3d126f858bd4b8eb9cf2475fb5d25f9f23c5caf62406941ef3646a5b36c7c8143f83d8dfabb6aa36abd2cce31e65a11a5451ec2f33964c3d51662e09bd37a0
diff --git a/dev-scheme/gauche/files/gauche-0.9.10-info.patch b/dev-scheme/gauche/files/gauche-0.9.10-info.patch
new file mode 100644
index 000000000000..f60f1f8a87d8
--- /dev/null
+++ b/dev-scheme/gauche/files/gauche-0.9.10-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-info.patch b/dev-scheme/gauche/files/gauche-info.patch
index f60f1f8a87d8..14aa58bc7e21 100644
--- a/dev-scheme/gauche/files/gauche-info.patch
+++ b/dev-scheme/gauche/files/gauche-info.patch
@@ -1,16 +1,16 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -417,7 +417,6 @@
- AC_CHECK_PROGS(AR, ar gar)
- AC_CHECK_PROGS(AS, as gas)
+@@ -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)
  
- dnl for cross build
- AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
+ 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
-@@ -16,7 +16,6 @@
+@@ -18,7 +18,6 @@
  INSTALL_DATA = @INSTALL_DATA@
  MKINSTDIR    = $(top_srcdir)/mkinstalldirs
  MAKEINFO     = @MAKEINFO@
@@ -18,7 +18,7 @@
  VERSION_INFO = @PACKAGE_STRING@
  
  MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
-@@ -58,7 +57,7 @@
+@@ -59,7 +58,7 @@
  	texi html htmls dvi pdf info \
  	clean distclean maintainer-clean
  
@@ -27,7 +27,7 @@
  
  all: info
  
-@@ -66,7 +65,7 @@
+@@ -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
@@ -36,9 +36,9 @@
  	  for info in *.info*; do \
  	    $(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
  	  done; \
-@@ -94,8 +93,8 @@
- %/index.html : %.texi
- 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
+@@ -98,8 +97,8 @@
+ %-draft/index.html : %.texi
+ 	$(MAKEDOC) htmls $< "$(MAKEINFO)" "Development HEAD DRAFT"
  
 -%.info.gz : %.texi
 -	$(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
@@ -47,8 +47,8 @@
  
  %.pdf : %.texi
  	$(MAKEDOC) pdf $< "$(MAKEINFO)"
-@@ -113,7 +112,7 @@
- htmls : gauche-refe/index.html gauche-refj/index.html
+@@ -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
@@ -88,7 +88,7 @@
        (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]*"))))))))
+-                  (do-process (make-cmd `(,gzip "-n" ,info ,@(glob #"~|info|-[0-9]*"))))))))
 +      (and (do-process (make-cmd `(,makeinfo ,input))))))
  
  (define (do-html input makeinfo)
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
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
+}