Version bump

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A138F5ED)

6 files changed, 173 insertions, 1 deletions

diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog
index e7d911cc2968..09cea368a4d4 100644
--- a/dev-lang/gprolog/ChangeLog
+++ b/dev-lang/gprolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gprolog
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.69 2013/05/12 17:05:07 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.70 2013/05/15 15:08:34 keri Exp $
+
+*gprolog-1.4.4 (15 May 2013)
+
+  15 May 2013; <keri@gentoo.org> +gprolog-1.4.4.ebuild,
+  +files/gprolog-1.4.4-ldflags.patch, +files/gprolog-1.4.4-links.patch,
+  +files/gprolog-1.4.4-nodocs.patch, +files/gprolog-1.4.4-txt-file.patch:
+  Version bump
 
 *gprolog-1.4.3 (12 May 2013)
 
diff --git a/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch
new file mode 100644
index 000000000000..21f256bf71cb
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.4-ldflags.patch
@@ -0,0 +1,40 @@
+diff -ur gprolog-1.4.4.orig/src/Ma2Asm/Makefile.in gprolog-1.4.4/src/Ma2Asm/Makefile.in
+--- gprolog-1.4.4.orig/src/Ma2Asm/Makefile.in	2013-04-15 09:24:11.000000000 +0200
++++ gprolog-1.4.4/src/Ma2Asm/Makefile.in	2013-05-15 16:59:59.000000000 +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 -ur gprolog-1.4.4.orig/src/TopComp/Makefile.in gprolog-1.4.4/src/TopComp/Makefile.in
+--- gprolog-1.4.4.orig/src/TopComp/Makefile.in	2013-04-15 09:24:12.000000000 +0200
++++ gprolog-1.4.4/src/TopComp/Makefile.in	2013-05-15 16:59:59.000000000 +0200
+@@ -15,10 +15,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 -ur gprolog-1.4.4.orig/src/Wam2Ma/Makefile.in gprolog-1.4.4/src/Wam2Ma/Makefile.in
+--- gprolog-1.4.4.orig/src/Wam2Ma/Makefile.in	2013-04-15 09:24:11.000000000 +0200
++++ gprolog-1.4.4/src/Wam2Ma/Makefile.in	2013-05-15 16:59:59.000000000 +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.4-links.patch b/dev-lang/gprolog/files/gprolog-1.4.4-links.patch
new file mode 100644
index 000000000000..25044ac9fc36
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.4-links.patch
@@ -0,0 +1,16 @@
+diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
+--- gprolog-1.4.4.orig/src/Makefile.in	2013-04-23 16:56:44.000000000 +0200
++++ gprolog-1.4.4/src/Makefile.in	2013-05-15 17:00:58.000000000 +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.4-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch
new file mode 100644
index 000000000000..f5246e0302ad
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.4-nodocs.patch
@@ -0,0 +1,30 @@
+diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
+--- gprolog-1.4.4.orig/src/Makefile.in	2013-04-23 16:56:44.000000000 +0200
++++ gprolog-1.4.4/src/Makefile.in	2013-05-15 17:01:25.000000000 +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.4-txt-file.patch b/dev-lang/gprolog/files/gprolog-1.4.4-txt-file.patch
new file mode 100644
index 000000000000..adeb4428b582
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.4-txt-file.patch
@@ -0,0 +1,11 @@
+diff -ur gprolog-1.4.4.orig/src/Makefile.in gprolog-1.4.4/src/Makefile.in
+--- gprolog-1.4.4.orig/src/Makefile.in	2013-04-23 16:56:44.000000000 +0200
++++ gprolog-1.4.4/src/Makefile.in	2013-05-15 17:01:48.000000000 +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.4.ebuild b/dev-lang/gprolog/gprolog-1.4.4.ebuild
new file mode 100644
index 000000000000..c5adbe7b9bbd
--- /dev/null
+++ b/dev-lang/gprolog/gprolog-1.4.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.4.ebuild,v 1.1 2013/05/15 15:08:34 keri Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
+HOMEPAGE="http://www.gprolog.org/"
+SRC_URI="mirror://gnu/gprolog/${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
+}
+
+src_configure() {
+	CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
+
+	append-flags -fno-strict-aliasing
+	use debug && append-flags -DDEBUG
+
+	if gcc-specs-pie ; then
+		# gplc generates its own native ASM; disable PIE
+		append-ldflags -nopie
+	fi
+
+	cd "${S}"/src
+	econf \
+		CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
+		--with-c-flags="${CFLAGS}" \
+		--with-install-dir=/usr/$(get_libdir)/${P} \
+		--with-links-dir=/usr/bin \
+		$(use_with doc doc-dir /usr/share/doc/${PF}) \
+		$(use_with doc html-dir /usr/share/doc/${PF}/html) \
+		$(use_with examples examples-dir /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 VERSION
+}