dev-lang/gprolog: version bump

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
index 21c9d2712f937447444cae5ff5c14e5e72191877..0f280a843b7ae11b003f0e652756516b0ee511ab 100644 (file)
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@@ -1 +1,2 @@
 DIST gprolog-1.4.4.tar.gz 3538152 BLAKE2B 159cf58e6d7f33662a6bd11f284abd9e52be0f82cafe180263148d13002e66987253e9dcd7db232b33470ddb685570efe3615c7029af96be44bb556bd9c2d261 SHA512 b6227a06794d31162f2c790a025f7372a6676c1891a76e880d2152aeab6322d3341aeab85e11d9be6d97ff1c69801bee73fa3ea6b0659af61f55990a455dc212
+DIST gprolog-1.4.5.tar.gz 3587361 BLAKE2B c0c73ce249d7c26b914a3f831c6ac93aeb884bded6c5ebbe51223f0685de0be2e746533aade1633a953b93e88a30796fa52ecd5e609d05bc051363cbf34e0477 SHA512 425103bc9e5bdbdb4ae331f5be0cf49524fbdb4f5e2809fb973360de9e7ad9935c1b28f3603e0be696a647153d9f0d3dacdc87251098ac99faf7d0b3c652fc60

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch
new file mode 100644 (file)
index 0000000..05bdb8e
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch
@@ -0,0 +1,40 @@
+diff -urN gprolog-1.4.5.orig/src/Ma2Asm/Makefile.in gprolog-1.4.5/src/Ma2Asm/Makefile.in
+--- gprolog-1.4.5.orig/src/Ma2Asm/Makefile.in  2015-01-13 19:00:19.000000000 +0100
++++ gprolog-1.4.5/src/Ma2Asm/Makefile.in       2018-07-22 11:20:29.622236171 +0200
+@@ -19,7 +19,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 -urN gprolog-1.4.5.orig/src/TopComp/Makefile.in gprolog-1.4.5/src/TopComp/Makefile.in
+--- gprolog-1.4.5.orig/src/TopComp/Makefile.in 2018-07-14 10:19:12.000000000 +0200
++++ gprolog-1.4.5/src/TopComp/Makefile.in      2018-07-22 11:20:29.622236171 +0200
+@@ -23,10 +23,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) $(LDFLAGS) $(CFLAGS) @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) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
+ 
+ 
+ 
+diff -urN gprolog-1.4.5.orig/src/Wam2Ma/Makefile.in gprolog-1.4.5/src/Wam2Ma/Makefile.in
+--- gprolog-1.4.5.orig/src/Wam2Ma/Makefile.in  2015-01-05 11:11:29.000000000 +0100
++++ gprolog-1.4.5/src/Wam2Ma/Makefile.in       2018-07-22 11:20:29.622236171 +0200
+@@ -12,7 +12,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.4.5-links.patch b/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
new file mode 100644 (file)
index 0000000..c39a1cf
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
@@ -0,0 +1,15 @@
+--- gprolog-1.4.5.orig/src/Makefile.in 2018-07-14 10:19:12.000000000 +0200
++++ gprolog-1.4.5/src/Makefile.in      2018-07-22 11:41:15.762184054 +0200
+@@ -81,10 +81,10 @@
+ 
+ # --- Links --- #
+ 
+-install-links: uninstall-links
++install-links:
+       if test $(LINKS_DIR) != none; then \
+          ./mkinstalldirs $(LINKS_DIR); \
+-         (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
++         (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
+       fi
+ 
+ uninstall-links:

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch
new file mode 100644 (file)
index 0000000..c5c517b
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch
@@ -0,0 +1,29 @@
+--- gprolog-1.4.5.orig/src/Makefile.in 2018-07-14 10:19:12.000000000 +0200
++++ gprolog-1.4.5/src/Makefile.in      2018-07-22 11:59:54.877137249 +0200
+@@ -97,7 +97,7 @@
+ # --- Documentation --- #
+ 
+ install-doc:
+-      if test $(DOC_DIR) != none; then \
++      if test $(DOC_DIR) != $(DESTDIR)none; then \
+          ./mkinstalldirs $(DOC_DIR); \
+          (F=`cd ../doc; echo $(DOC_FILES)`; \
+          for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
+@@ -113,7 +113,7 @@
+ # --- HTML --- #
+ 
+ install-html:
+-      if test $(HTML_DIR) != none; then \
++      if test $(HTML_DIR) != $(DESTDIR)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); \
+@@ -129,7 +129,7 @@
+ # --- Examples --- #
+ 
+ install-examples:
+-      if test $(EXAMPLES_DIR) != none; then \
++      if test $(EXAMPLES_DIR) != $(DESTDIR)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.4.5-txt-file.patch b/dev-lang/gprolog/files/gprolog-1.4.5-txt-file.patch
new file mode 100644 (file)
index 0000000..e385e94
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-txt-file.patch
@@ -0,0 +1,10 @@
+--- gprolog-1.4.5.orig/src/Makefile.in 2018-07-14 10:19:12.000000000 +0200
++++ gprolog-1.4.5/src/Makefile.in      2018-07-22 11:56:09.247146686 +0200
+@@ -60,7 +60,6 @@
+ install-system:
+       ./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
+       $(INSTALL_DIR)/include $(INSTALL_DIR)/lib
+-      for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
+       for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
+       for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
+       for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done

diff --git a/dev-lang/gprolog/gprolog-1.4.5.ebuild b/dev-lang/gprolog/gprolog-1.4.5.ebuild
new file mode 100644 (file)
index 0000000..b158b38
--- /dev/null
+++ b/dev-lang/gprolog/gprolog-1.4.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)"
+HOMEPAGE="http://www.gprolog.org/"
+SRC_URI="http://www.gprolog.org/${P}.tar.gz"
+S="${WORKDIR}"/${P}
+
+LICENSE="|| ( GPL-2+ LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="debug doc examples"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-ldflags.patch
+       epatch "${FILESDIR}"/${P}-links.patch
+       epatch "${FILESDIR}"/${P}-nodocs.patch
+       epatch "${FILESDIR}"/${P}-txt-file.patch
+
+       eapply_user
+}
+
+src_configure() {
+       CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
+
+       append-flags -fno-strict-aliasing
+       use debug && append-flags -DDEBUG
+
+       cd "${S}"/src
+       econf \
+               CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
+               --with-c-flags="${CFLAGS}" \
+               --with-install-dir="${EPREFIX}"/usr/$(get_libdir)/${P} \
+               --with-links-dir="${EPREFIX}"/usr/bin \
+               $(use_with doc doc-dir "${EPREFIX}"/usr/share/doc/${PF}) \
+               $(use_with doc html-dir "${EPREFIX}"/usr/share/doc/${PF}/html) \
+               $(use_with examples examples-dir "${EPREFIX}"/usr/share/doc/${PF}/examples)
+}
+
+src_compile() {
+       cd "${S}"/src
+       # gprolog is compiled using gplc which cannot be run in parallel
+       emake -j1
+}
+
+src_test() {
+       cd "${S}"/src
+       emake -j1 check
+}
+
+src_install() {
+       cd "${S}"/src
+       emake DESTDIR="${D}" install
+
+       cd "${S}"
+       dodoc ChangeLog NEWS PROBLEMS README
+}