gentoo resync : 02.02.2022

2 files changed, 109 insertions, 14 deletions

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)