gentoo resync : 08.10.2021

5 files changed, 144 insertions, 4 deletions

diff --git a/dev-scheme/gauche-gl/Manifest b/dev-scheme/gauche-gl/Manifest
index f9514b2ab6bc..b14a1466cdf3 100644
--- a/dev-scheme/gauche-gl/Manifest
+++ b/dev-scheme/gauche-gl/Manifest
@@ -1,4 +1,7 @@
+AUX gauche-gl-0.6-cflags.patch 411 BLAKE2B 2f480dd9da923449b5fcf57c17739302081692579ac286e6057db8c2f6f7158809e23757f54e238d1ccc81285a314929192b8f0d397d8fde0a342d05a07dbea0 SHA512 94e5c22c28da7e2c8dea5e9945ef3e6a8770307a4a25f42e6b4700d8b6e69104557efce15e7b868b3eb684b7573c298b61b21c5104e6f970d01abcd21529330a
+AUX gauche-gl-0.6-cg.patch 1168 BLAKE2B 27a0e4957e9148b97e95994fa037cb28bb5eaccaf27816dfbeed9b9a88640ec09c097f1981dd1633b68920164f6f9b5953c9de329b27e8bb3acee73224b7a0bc SHA512 2ae4aa08b9c542681a0a64478bf3c0a85ffd625cd40e5591822014743aab7a9d33f17c0b684968bbd13d40e321edd274e1d8cc113179d932c38c18803508788e
+AUX gauche-gl-0.6-info.patch 1954 BLAKE2B ed038d5214d8705901e4902848156084138c5ccfa75a40d12b8f473e2c77222271b954c0cb64ed0d973b0750b72dbd65a295dc3eb5e52985b67206273ecf6fb0 SHA512 de74c7bd0abf861c8b24b9166037543b6389d2ddf2118829e028aed8f511e23f90427e129e95b46145a2c4449d21d18ce060fd75f8d76df1244e6eac16ff5b3b
 AUX gauche-gl-0.6-simple.viewer.patch 806 BLAKE2B a2e3e35f704a108ec6bf7a809558db14daddb972487aa11dbbca01d894ba5752822ea4f2f869722a96043543fd3c794c2b92bcc2091184a957059b4c2f90afc4 SHA512 ed9d08b02e7035b5415cefb501b323a86e434389149f49ec3612e00a282c5b709da2f900768749577387537189f68e2ac32320ecae118dd32ec4fed5ea40407f
 DIST Gauche-gl-0.6.tgz 1369790 BLAKE2B b077eeee7a2d64908b36e1d279a1131eef40e98104a983e581856320529207682d17e2c9577ff892c873492f4b78631d86a4c642b1e4f8ecd364acb4ee41482e SHA512 60f763ba832048f9932cabd2e8ce8595ba2a1f0b86f1212b1f6919d6b9b8ba33ed1076f119e53059ceac7f6e46a6ead3ba0e23cce81af3097355cd97b3b4b673
-EBUILD gauche-gl-0.6.ebuild 984 BLAKE2B b84e05cf811681ae0785f602a16bb5eccb91f94d13d1cf22a2ae7175f0f45a7f1503d2c87cd04e11ab4b61af718b129a1d503ff27fd731d67fc9ab8cb28299f5 SHA512 20967e29a9c84c2322f222c3fd90d375d9868722eb90ecc61f072e24a5f9f38ec76f31bc7fc4445d3c405f17b6f0e4add501b3f01a953a0ebb4d65142ee48b16
+EBUILD gauche-gl-0.6.ebuild 1163 BLAKE2B 9b042c5657a152ffc589115c3068136b7e8ba45bdabb28361002f27d9ce3fac9db72de943236c8397c6e0a907bc31d9aa28119df8e9e2ecdd5ee28b61532ffce SHA512 572ca8b0293d53b2ba9e1b3488b92e8fb77ccffd9ff3f346ac5aa2691013328062f8369089c57954f3e69fd307b37ad7e16f06f0ef0cb50196eca6f913bddc65
 MISC metadata.xml 446 BLAKE2B 42e47b27a9698630c02789c6efcf119ff88e96da02f71733fc2c5b03d81c49d44452aaceaf9e593a1017ab3cbd4fb3d4de379c4131b96590bf4082bc977a6975 SHA512 ee955f6fb7eeca1e69f6fc70029f0cc06b3529015d03a67fba3614c4ed5308e3d9721a20eb2c4e421e2045031a56635cfaa3741e736b694393b7ea2a3f7d83e7
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 000000000000..c5c12f97f06f
--- /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/files/gauche-gl-0.6-cg.patch b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch
new file mode 100644
index 000000000000..3c2b6014a804
--- /dev/null
+++ b/dev-scheme/gauche-gl/files/gauche-gl-0.6-cg.patch
@@ -0,0 +1,47 @@
+--- a/cg/Makefile.in
++++ b/cg/Makefile.in
+@@ -17,8 +17,8 @@
+ # 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@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ -I../src
+-LDFLAGS  = -I../src @LDFLAGS@ 
++CFLAGS   = @DEFS@ @CFLAGS@ @X_CFLAGS@ @GLUT_INCDIR@ @CG_CFLAGS@ -I../src
++LDFLAGS  = @LDFLAGS@
+ OBJEXT   = @OBJEXT@
+ SOEXT    = @SOEXT@
+ OLIBS    = @LIBS@
+--- a/cg/cg-lib.stub
++++ b/cg/cg-lib.stub
+@@ -430,7 +430,6 @@
+ ;;
+ ;; Cg/cg_profiles.h
+ ;;
+-(define-enum CG_PROFILE_START)
+ (define-enum CG_PROFILE_UNKNOWN)
+ 
+ (define-enum CG_PROFILE_VS_1_1)
+@@ -443,8 +442,6 @@
+ (define-enum CG_PROFILE_PS_2_0)
+ (define-enum CG_PROFILE_PS_2_X)
+ 
+-(define-enum CG_PROFILE_MAX)
+-
+ ;;
+ ;; Cg/cg_errors.h
+ ;;
+--- a/configure.ac
++++ b/configure.ac
+@@ -46,10 +46,11 @@
+    AC_HELP_STRING([--enable-cg], [Enable NVidia's Cg binding.]), [
+    AC_DEFINE(HAVE_CG, 1)
+    ENABLE_CG=1
+-   CG_LIBS="-lCgGL -lCg"
++   PKG_CHECK_MODULES([CG], [nvidia-cg-toolkit-gl])
+    CG_SCM="cg/gl/cg.scm";
+ ])
+ AC_SUBST(ENABLE_CG)
++AC_SUBST(CG_CFLAGS)
+ AC_SUBST(CG_LIBS)
+ AC_SUBST(CG_SCM)
+ 
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 000000000000..663d6c17982c
--- /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 3d8aac3c5ebe..840d7c958120 100644
--- a/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
+++ b/dev-scheme/gauche-gl/gauche-gl-0.6.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
+
+inherit autotools
 
 MY_P="${P^g}"
 
@@ -20,9 +22,20 @@ RDEPEND=">=dev-scheme/gauche-0.9.4
 	x11-libs/libXmu
 	cg? ( media-gfx/nvidia-cg-toolkit )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-simple.viewer.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-simple.viewer.patch
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-cg.patch
+	"${FILESDIR}"/${P}-info.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf $(usex cg --enable-cg "")