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

2021-10-04 Thread Akinori Hattori
commit: 3a1fe8b0461de3ee551f5fedaa68063fa1a78f52
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon Oct  4 13:35:03 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon Oct  4 13:37:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1fe8b0

dev-scheme/gauche-gl: respect CFLAGS

Closes: https://bugs.gentoo.org/738818
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch | 11 +++
 dev-scheme/gauche-gl/gauche-gl-0.6.ebuild |  1 +
 2 files changed, 12 insertions(+)

diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch 
b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch
new file mode 100644
index 000..c5c12f97f06
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
 b/src/Makefile.in
+@@ -17,7 +17,7 @@
+ # These are set by configure
+ # NB: cc and various flags must match the ones used to compile Gauche,
+ # so the make invocator shouldn't casually override them.
+-CFLAGS   = @DEFS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@
++CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@
+ LDFLAGS  = @LDFLAGS@
+ OBJEXT   = @OBJEXT@
+ SOEXT= @SOEXT@

diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild 
b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 4e7df252b47..411db2ea004 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -27,6 +27,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${P}-simple.viewer.patch
+   "${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-cg.patch
 )
 



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

2021-10-04 Thread Akinori Hattori
commit: 48e0bbb80cefbdea16fa91aef39a4e0494c55242
Author: Akinori Hattori  gentoo  org>
AuthorDate: Mon Oct  4 13:37:12 2021 +
Commit: Akinori Hattori  gentoo  org>
CommitDate: Mon Oct  4 13:37:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48e0bbb8

dev-scheme/gauche-gl: do not compress info files

Closes: https://bugs.gentoo.org/738820
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori  gentoo.org>

 .../gauche-gl/files/gauche-gl-0.6-info.patch   | 66 ++
 dev-scheme/gauche-gl/gauche-gl-0.6.ebuild  |  1 +
 2 files changed, 67 insertions(+)

diff --git a/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch 
b/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch
new file mode 100644
index 000..663d6c17982
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-info.patch
@@ -0,0 +1,66 @@
+--- a/configure.ac
 b/configure.ac
+@@ -118,7 +118,6 @@
+ 
+ # Check for other programs.
+ AC_CHECK_PROGS(MAKEINFO, makeinfo)
+-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
+ 
+ # Check for libraries
+ 
+--- a/doc/Makefile.in
 b/doc/Makefile.in
+@@ -12,7 +12,6 @@
+ GAUCHE_CONFIG = "@GAUCHE_CONFIG@"
+ INSTALL   = "@GAUCHE_INSTALL@"
+ MAKEINFO  = "@MAKEINFO@"
+-GZIP_PROGRAM  = "@GZIP_PROGRAM@"
+ 
+ # Manual page destination.
+ mandir  = "$(DESTDIR)`$(GAUCHE_CONFIG) --mandir`"
+@@ -21,7 +20,7 @@
+ all: info
+ 
+ install: all
+-  if test -f gauche-gl-refe.info.gz -o -f gauche-gl-refj.info.gz; then \
++  if test -f gauche-gl-refe.info -o -f gauche-gl-refj.info; then \
+ for info in *.info*; do \
+   $(INSTALL) -m 444 -T $(infodir) $$info; \
+ done; \
+@@ -46,7 +45,7 @@
+ 
+ pdf : gauche-gl-refe.pdf
+ 
+-info : gauche-gl-refe.info.gz gauche-gl-refj.info.gz
++info : gauche-gl-refe.info gauche-gl-refj.info
+ 
+ gauche-gl-refe.html : gauche-gl-refe.texi
+   texi2html -number gauche-gl-refe.texi
+@@ -63,11 +62,9 @@
+ gauche-gl-refe.texi : gauche-gl-ref.texi extract
+   gosh ./extract -en -o gauche-gl-refe.texi gauche-gl-ref.texi
+ 
+-gauche-gl-refe.info.gz : gauche-gl-refe.texi
+-  if test "X$(MAKEINFO)" != X -a "X$(GZIP_PROGRAM)" != X; then \
++gauche-gl-refe.info : gauche-gl-refe.texi
++  if test "X$(MAKEINFO)" != X; then \
+ $(MAKEINFO) --no-warn gauche-gl-refe.texi; \
+-rm -rf gauche-gl-refe.info*.gz; \
+-$(GZIP_PROGRAM) gauche-gl-refe.info; \
+   fi
+ 
+ gauche-gl-refj.html : gauche-gl-refj.texi
+@@ -85,11 +82,9 @@
+ gauche-gl-refj.texi : gauche-gl-ref.texi extract
+   gosh ./extract -jp -o gauche-gl-refj.texi gauche-gl-ref.texi
+ 
+-gauche-gl-refj.info.gz : gauche-gl-refj.texi
+-  if test "X$(MAKEINFO)" != X -a "X$(GZIP_PROGRAM)" != X; then \
++gauche-gl-refj.info : gauche-gl-refj.texi
++  if test "X$(MAKEINFO)" != X; then \
+ $(MAKEINFO) --no-warn gauche-gl-refj.texi; \
+-rm -rf gauche-gl-refj.info*.gz; \
+-$(GZIP_PROGRAM) gauche-gl-refj.info ; \
+   fi
+ 
+ clean:

diff --git a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild 
b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
index 411db2ea004..840d7c95812 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${P}-simple.viewer.patch
"${FILESDIR}"/${P}-cflags.patch
"${FILESDIR}"/${P}-cg.patch
+   "${FILESDIR}"/${P}-info.patch
 )
 
 src_prepare() {