dev-lang/gprolog: version bump

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Keri Harris <keri@gentoo.org>

4 files changed, 218 insertions, 0 deletions

diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch b/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch
new file mode 100644
index 000000000000..86719e1bdcb4
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch
@@ -0,0 +1,61 @@
+--- gprolog-1.5.0.orig/src/Makefile.in	2021-07-07 16:06:16.000000000 -0000
++++ gprolog-1.5.0/src/Makefile.in	2021-07-10 12:49:40.967172260 -0000
+@@ -85,13 +85,13 @@
+ # --- Links --- #
+ 
+ install-links: install-system uninstall-links
+-	if test $(LINKS_DIR) != none; then \
++	if test @LINKS_DIR@ != none; then \
+ 	   ./mkinstalldirs $(LINKS_DIR); \
+ 	   (cd $(LINKS_DIR) ; $(LN_S) $(wildcard $(INSTALL_DIR)/bin/*) .); \
+ 	fi
+ 
+ uninstall-links:
+-	-if test $(LINKS_DIR) != none; then \
++	-if test @LINKS_DIR@ != none; then \
+ 	   (cd $(LINKS_DIR) 2>/dev/null && rm -f $(BIN_FILES)); \
+ 	   rmdir $(LINKS_DIR) 2>/dev/null; \
+ 	fi || exit 0;
+@@ -100,14 +100,14 @@
+ # --- Documentation --- #
+ 
+ install-doc:
+-	if test $(DOC_DIR) != none; then \
++	if test @DOC_DIR@ != none; then \
+ 	   ./mkinstalldirs $(DOC_DIR); \
+ 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
+ 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
+ 	fi
+ 
+ uninstall-doc:
+-	-if test $(DOC_DIR) != none; then \
++	-if test @DOC_DIR@ != none; then \
+ 	   (cd $(DOC_DIR); rm -f $(DOC_FILES)); \
+ 	   rmdir $(DOC_DIR) 2>/dev/null; \
+ 	fi || exit 0;
+@@ -116,14 +116,14 @@
+ # --- HTML --- #
+ 
+ install-html:
+-	if test $(HTML_DIR) != none; then \
++	if test @HTML_DIR@ != none; then \
+ 	   ./mkinstalldirs $(HTML_DIR); \
+ 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
+ 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
+ 	fi
+ 
+ uninstall-html:
+-	-if test $(HTML_DIR) != none; then \
++	-if test @HTML_DIR@ != none; then \
+ 	   (cd $(HTML_DIR); rm -f $(HTML_FILES)); \
+ 	   rmdir $(HTML_DIR) 2>/dev/null; \
+ 	fi || exit 0;
+@@ -132,7 +132,7 @@
+ # --- Examples --- #
+ 
+ install-examples:
+-	if test $(EXAMPLES_DIR) != none; then \
++	if test @EXAMPLES_DIR@ != none; then \
+ 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
+ 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
+ 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.5.0-ldflags.patch
new file mode 100644
index 000000000000..5d53a69a657b
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-ldflags.patch
@@ -0,0 +1,104 @@
+diff -ur gprolog-1.5.0.orig/src/EnginePl/Makefile.in gprolog-1.5.0/src/EnginePl/Makefile.in
+--- gprolog-1.5.0.orig/src/EnginePl/Makefile.in	2021-07-10 10:13:23.046564472 -0000
++++ gprolog-1.5.0/src/EnginePl/Makefile.in	2021-07-10 10:41:59.585492681 -0000
+@@ -2,6 +2,7 @@
+ GPLC          = @GPLC@
+ CC            = @CC@ @CFLAGS_MACHINE@
+ CFLAGS        = @CFLAGS@
++LDFLAGS       = @LDFLAGS@
+ AR_RC         = @AR_RC@
+ RANLIB        = @RANLIB@
+ 
+@@ -35,7 +36,7 @@
+ config: pl_config@EXE_SUFFIX@ wam_regs.h
+ 
+ pl_config@EXE_SUFFIX@: pl_config.c gp_config.h machine.h stacks_sigsegv.h wam_archi.def
+-	$(CC) $(CFLAGS) $(LFLAGS) @CC_EXE_NAME_OPT@pl_config@EXE_SUFFIX@ pl_config.c
++	$(CC) $(CFLAGS) $(LDFLAGS) @CC_EXE_NAME_OPT@pl_config@EXE_SUFFIX@ pl_config.c
+ 
+ 
+ wam_regs.h: pl_config@EXE_SUFFIX@ machine.h stacks_sigsegv.h wam_archi.def
+@@ -49,10 +50,10 @@
+ 
+ 
+ cpp_headers@EXE_SUFFIX@: cpp_headers.c
+-	$(CC) $(CFLAGS) $(LFLAGS) @CC_EXE_NAME_OPT@cpp_headers@EXE_SUFFIX@ cpp_headers.c
++	$(CC) $(CFLAGS) $(LDFLAGS) @CC_EXE_NAME_OPT@cpp_headers@EXE_SUFFIX@ cpp_headers.c
+ 
+ try_sigaction@EXE_SUFFIX@: try_sigaction.c
+-	$(CC) $(CFLAGS) $(LFLAGS) @CC_EXE_NAME_OPT@try_sigaction@EXE_SUFFIX@ try_sigaction.c
++	$(CC) $(CFLAGS) $(LDFLAGS) @CC_EXE_NAME_OPT@try_sigaction@EXE_SUFFIX@ try_sigaction.c
+ 
+ 
+ 
+diff -ur gprolog-1.5.0.orig/src/Ma2Asm/Makefile.in gprolog-1.5.0/src/Ma2Asm/Makefile.in
+--- gprolog-1.5.0.orig/src/Ma2Asm/Makefile.in	2021-07-07 10:13:02.000000000 -0000
++++ gprolog-1.5.0/src/Ma2Asm/Makefile.in	2021-07-10 10:40:22.683496734 -0000
+@@ -1,7 +1,8 @@
+-GPLC   = @GPLC@
+-CC     = @CC@ @CFLAGS_MACHINE@
+-CFLAGS = @CFLAGS@
+-LDLIBS = @LDLIBS@
++GPLC    = @GPLC@
++CC      = @CC@ @CFLAGS_MACHINE@
++CFLAGS  = @CFLAGS@
++LDFLAGS = @LDFLAGS@
++LDLIBS  = @LDLIBS@
+ 
+ # set by mappers.sh
+ FORCE_MAP =
+@@ -25,7 +26,7 @@
+ 
+ ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
+                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
+-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
++	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
+ 
+ 
+ clean:
+diff -ur gprolog-1.5.0.orig/src/TopComp/Makefile.in gprolog-1.5.0/src/TopComp/Makefile.in
+--- gprolog-1.5.0.orig/src/TopComp/Makefile.in	2021-07-07 10:13:02.000000000 -0000
++++ gprolog-1.5.0/src/TopComp/Makefile.in	2021-07-10 10:41:31.081493873 -0000
+@@ -4,7 +4,7 @@
+ CFLAGS          = @CFLAGS@
+ HEXGPLC         = @HEXGPLC@
+ CC              = @CC@ @CFLAGS_MACHINE@
+-CFLAGS          = @CFLAGS@
++LDFLAGS         = @LDFLAGS@
+ LDLIBS          = @LDLIBS@
+ TOP_LEVEL_LIBS  = @TOP_LEVEL_LIBS@
+ 
+@@ -24,10 +24,10 @@
+ 
+ $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
+          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
+-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
+ 
+ $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
+-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
++	$(CC) $(CFLAGS) $(LDFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
+ 
+ 
+ 
+diff -ur gprolog-1.5.0.orig/src/Wam2Ma/Makefile.in gprolog-1.5.0/src/Wam2Ma/Makefile.in
+--- gprolog-1.5.0.orig/src/Wam2Ma/Makefile.in	2021-05-03 13:55:34.000000000 -0000
++++ gprolog-1.5.0/src/Wam2Ma/Makefile.in	2021-07-10 10:40:30.134496422 -0000
+@@ -1,5 +1,6 @@
+-CC     = @CC@ @CFLAGS_MACHINE@
+-CFLAGS = @CFLAGS@
++CC      = @CC@ @CFLAGS_MACHINE@
++CFLAGS  = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ 
+ 
+ all: wam2ma@EXE_SUFFIX@
+@@ -12,7 +13,7 @@
+ 	$(CC) $(CFLAGS) -c wam2ma.c
+ 
+ wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
+-	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
++	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
+ 
+ 
+ clean:
diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-links.patch b/dev-lang/gprolog/files/gprolog-1.5.0-links.patch
new file mode 100644
index 000000000000..e1f673156e46
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-links.patch
@@ -0,0 +1,15 @@
+--- gprolog-1.5.0.orig/src/Makefile.in	2021-07-07 16:06:16.000000000 -0000
++++ gprolog-1.5.0/src/Makefile.in	2021-07-10 11:30:29.130370996 -0000
+@@ -84,10 +84,10 @@
+ 
+ # --- Links --- #
+ 
+-install-links: uninstall-links
++install-links: install-system uninstall-links
+ 	if test $(LINKS_DIR) != none; then \
+ 	   ./mkinstalldirs $(LINKS_DIR); \
+-	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
++	   (cd $(LINKS_DIR) ; $(LN_S) $(wildcard $(INSTALL_DIR)/bin/*) .); \
+ 	fi
+ 
+ uninstall-links:
diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-llvm-as.patch b/dev-lang/gprolog/files/gprolog-1.5.0-llvm-as.patch
new file mode 100644
index 000000000000..f3fa81ce13e8
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-llvm-as.patch
@@ -0,0 +1,38 @@
+--- gprolog-1.5.0.orig/src/configure.in	2021-07-08 09:34:44.000000000 -0000
++++ gprolog-1.5.0/src/configure.in	2021-07-10 16:25:44.397630093 -0000
+@@ -342,15 +342,26 @@
+ dnl we use AS0 instead of AS else AC_CHECK_TOOL does not work 
+ dnl (instead of testing a prefix like x86_64-w64-mingw32- it will
+ dnl think the user wants to override the test)
+-    AS0=as
+-    case "$host" in
+-        sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
+-        i*86*darwin1*)   ASFLAGS='-arch i686';;
+-        i*86*linux*)     ASFLAGS='--32';;
+-        x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
+-        x86_64*darwin*)  ASFLAGS='-arch x86_64';;
+-        x86_64*linux*)   ASFLAGS='--64';;
+-        *)               if test "$with_gas" = yes; then AS0=gas; fi;;
++    case "$CC" in
++        *cc)
++            AS0=as
++            case "$host" in
++                sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
++                i*86*darwin1*)   ASFLAGS='-arch i686';;
++                i*86*linux*)     ASFLAGS='--32';;
++                x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
++                x86_64*darwin*)  ASFLAGS='-arch x86_64';;
++                x86_64*linux*)   ASFLAGS='--64';;
++                *)               if test "$with_gas" = yes; then AS0=gas; fi;;
++            esac
++            ;;
++        *clang)
++            AS0=$CC
++            ASFLAGS='-c'
++            ;;
++        *)
++            AC_MSG_ERROR([unsupported compiler $CC])
++            ;;
+     esac
+     AC_CHECK_TOOL([AS],[$AS0])
+     AC_PROG_RANLIB