Version bump

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

7 files changed, 179 insertions, 5 deletions

diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog
index ea650d38e226..bfc1dca3f525 100644
--- a/dev-lang/gprolog/ChangeLog
+++ b/dev-lang/gprolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gprolog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.56 2012/06/06 03:08:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.57 2012/07/02 11:52:49 keri Exp $
+
+*gprolog-1.4.1 (02 Jul 2012)
+
+  02 Jul 2012; <keri@gentoo.org> +gprolog-1.4.1.ebuild,
+  +files/gprolog-1.4.1-ldflags.patch, +files/gprolog-1.4.1-links.patch,
+  +files/gprolog-1.4.1-nodocs.patch, +files/gprolog-1.4.1-txt-file.patch:
+  Version bump
 
   06 Jun 2012; Zac Medico <zmedico@gentoo.org> gprolog-1.4.0.ebuild:
   inherit multilib for get_libdir
diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
index 32e35c0fc0da..d1d4e76f607d 100644
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@@ -5,14 +5,20 @@ AUX gprolog-1.4.0-ldflags.patch 2015 RMD160 f4a4f480d3fcd018f895d9d4b370b2e40120
 AUX gprolog-1.4.0-ma2asm-pllong.patch 4840 RMD160 ae3f3ae0b9c4d354e5c9bc4103f678894de330b5 SHA1 529c1b84b2268721669ca41148b0ba2dc5eb1fa5 SHA256 973b40c153e1b0974178c69519c8b4a2f3ecad3900fd02b48f58c2b77cbfbfd4
 AUX gprolog-1.4.0-nodocs.patch 1377 RMD160 8d063bdf7a7b177a2cb80d3e85cd03ac01867b77 SHA1 1fef593c253a30a7769838f094d6196674772d87 SHA256 a1f8321638e021585604e65faad5668e9fd110e8a2d2472ea2d6906506b92a54
 AUX gprolog-1.4.0-txt-file.patch 578 RMD160 cede7c3dfe3b9a0f203116ce52390029612049c9 SHA1 8fcc34357d9850dec8cb4131d2a1aaad2dc8a19f SHA256 0d449f9fe9403cb7cbead26cc32cd4b3e25ceec959c4bf99fff128f15f4140fb
+AUX gprolog-1.4.1-ldflags.patch 2015 RMD160 17a9cc71aed31cd1f32159e01b0a10a12686f0f1 SHA1 2999b2ff73c7ac51602b284b721b0b8658537767 SHA256 66e82d8249209c9018f706b730bdf474b7ee16dff59e2340cd6856203d047f92
+AUX gprolog-1.4.1-links.patch 488 RMD160 861d8a83bc64ca537deb2f7bbf7c8f08fe5aab16 SHA1 04123457e181cf48517869027718da5a4afdfa9b SHA256 934df6a1c0396d0a868ad968c87666b9d9bcc9cc9f09dfaab3364cf81fe3daf7
+AUX gprolog-1.4.1-nodocs.patch 1117 RMD160 3c7898a62b45a7c7c1cde5640a2f85f03268c6bc SHA1 0f0cbe9941cd01c340546c0a025661d8bbeecdb7 SHA256 c32b7fbf84e3bfe520b822832995464b8dfdf1203b2f4e9a0045254e2326d037
+AUX gprolog-1.4.1-txt-file.patch 578 RMD160 405f31260280e858d421c346149f3dd0e2c54519 SHA1 5c5b90a6bb24f114c6cb98d10c25c7bbb037647f SHA256 8a4416606ac6428c62968f1c39c41075e0fe74ac60e3db16094dead6e9fd5a83
 DIST gprolog-1.4.0.tar.gz 3239624 RMD160 9034f30db714306794350c459f80275186cc303f SHA1 a19a4c53939235beed11657eabaa7a407869fbe9 SHA256 804a2fdd980d8ed9ba0b5e45e24aaad5e4ca08f67a532ea2b3813b9f8d99c6d0
+DIST gprolog-1.4.1.tar.gz 3273781 RMD160 f3e093868e7fc468ae81fc9cc4ebe21b22b0cd0a SHA1 f25e11dbef2467c8ea1bb16cfd20623fd2f4fad4 SHA256 e2819ed9c426138d3191e4d97ae5121cf97e132eecf102400f87f1e372a05b72
 EBUILD gprolog-1.4.0.ebuild 1705 RMD160 68e4275c1323d32aca9b35c97cdb00d0491a9445 SHA1 172777458dd8423da03045368a2af646e155075b SHA256 da3040b2d41fae1888bb5d8c11f65502637715e6948e0b6a7d420805a0ad04e0
-MISC ChangeLog 7611 RMD160 a09c37386d5f837d920fe01e3eb105bf37bdef03 SHA1 252a5c7387a2151cb333c583f314ec800c0003dd SHA256 4641ea2fbde2ec3368df6e1111a267d62a09b4893403f2e83935eb41ca71ca5a
+EBUILD gprolog-1.4.1.ebuild 1696 RMD160 6046562010f0f9d0d21c1ca2213aa338156ce28b SHA1 ec7dae82490707e5ae5fa4eb88091bd9e2ed6a52 SHA256 21ecf3f07a7616089afc0da424fa13d400ec80316ca130225a2541f39c3fb00e
+MISC ChangeLog 7856 RMD160 8a17c09fb2c1c0b7e7ba515b43f18fb6b78a24d9 SHA1 c7391bee2a5da4da492f5cdf9a684a30f5395e9a SHA256 621b25b5a2aa4a70bae30af56aed873dc3f0af7ebcf8d46c5c899268791fc287
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/OyaAACgkQ/ejvha5XGaPP2gCgw1vZlnnc13A+2IHTeIsB1p6G
-UIgAoOCUF8xrKbnjtSrmUkOaU+btAEiN
-=ga07
+iEYEARECAAYFAk/xi5wACgkQrwS/tqE49e1tzQCfTUJDhQwciWx4CpLxkcsV5p80
+QqoAoLASaxe/xKm/RyilcXardSbjDXpx
+=1ZkE
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch
new file mode 100644
index 000000000000..3972218b27f5
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch
@@ -0,0 +1,40 @@
+diff -ur gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in gprolog-1.4.1/src/Ma2Asm/Makefile.in
+--- gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in	2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.1/src/Ma2Asm/Makefile.in	2012-07-02 13:08:11.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.1.orig/src/TopComp/Makefile.in gprolog-1.4.1/src/TopComp/Makefile.in
+--- gprolog-1.4.1.orig/src/TopComp/Makefile.in	2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.1/src/TopComp/Makefile.in	2012-07-02 13:08:11.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.1.orig/src/Wam2Ma/Makefile.in gprolog-1.4.1/src/Wam2Ma/Makefile.in
+--- gprolog-1.4.1.orig/src/Wam2Ma/Makefile.in	2012-01-10 18:24:38.000000000 +0100
++++ gprolog-1.4.1/src/Wam2Ma/Makefile.in	2012-07-02 13:08:11.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.1-links.patch b/dev-lang/gprolog/files/gprolog-1.4.1-links.patch
new file mode 100644
index 000000000000..74de7cc24ff6
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-links.patch
@@ -0,0 +1,15 @@
+--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.1/src/Makefile.in	2012-07-02 13:38:49.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.1-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch
new file mode 100644
index 000000000000..1234de3f9757
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch
@@ -0,0 +1,29 @@
+--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.1/src/Makefile.in	2012-07-02 12:53:42.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.1-txt-file.patch b/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch
new file mode 100644
index 000000000000..853f2d4bce42
--- /dev/null
+++ b/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch
@@ -0,0 +1,10 @@
+--- gprolog-1.4.1.orig/src/Makefile.in	2012-01-10 18:24:39.000000000 +0100
++++ gprolog-1.4.1/src/Makefile.in	2012-07-02 12:55:39.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.1.ebuild b/dev-lang/gprolog/gprolog-1.4.1.ebuild
new file mode 100644
index 000000000000..48ed03fd14fe
--- /dev/null
+++ b/dev-lang/gprolog/gprolog-1.4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.4.1.ebuild,v 1.1 2012/07/02 11:52:49 keri Exp $
+
+EAPI=2
+
+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"
+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
+	emake || die "emake failed"
+}
+
+src_test() {
+	cd "${S}"/src
+	emake check || die "make check failed. See above for details."
+}
+
+src_install() {
+	cd "${S}"/src
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	cd "${S}"
+	dodoc ChangeLog NEWS PROBLEMS README VERSION || die "dodoc failed"
+}