From 74825ce8d8091e41d75810de365389cfdc9fbf01 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Tue, 18 May 2010 08:05:44 +0000 Subject: Version bump (Portage version: 2.1.8.3/cvs/Linux x86_64) --- dev-lang/yap/ChangeLog | 9 ++- dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch | 20 +++++ dev-lang/yap/files/yap-6.0.5-chr-sublist.patch | 48 ++++++++++++ dev-lang/yap/files/yap-6.0.5-yapsharedir.patch | 14 ++++ dev-lang/yap/yap-6.0.5.ebuild | 101 +++++++++++++++++++++++++ 5 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch create mode 100644 dev-lang/yap/files/yap-6.0.5-chr-sublist.patch create mode 100644 dev-lang/yap/files/yap-6.0.5-yapsharedir.patch create mode 100644 dev-lang/yap/yap-6.0.5.ebuild (limited to 'dev-lang') diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog index e71fa35ab837..ebf76e81443b 100644 --- a/dev-lang/yap/ChangeLog +++ b/dev-lang/yap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/yap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.36 2010/05/15 21:18:26 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.37 2010/05/18 08:05:44 keri Exp $ + +*yap-6.0.5 (18 May 2010) + + 18 May 2010; +yap-6.0.5.ebuild, + +files/yap-6.0.5-JAVALIBPATH.patch, +files/yap-6.0.5-chr-sublist.patch, + +files/yap-6.0.5-yapsharedir.patch: + Version bump *yap-6.0.4 (15 May 2010) diff --git a/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch b/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch new file mode 100644 index 000000000000..acf5e0ae1945 --- /dev/null +++ b/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch @@ -0,0 +1,20 @@ +--- yap-6.orig/configure 2010-05-12 01:53:25.000000000 +1200 ++++ yap-6/configure 2010-05-16 09:24:44.000000000 +1200 +@@ -6590,7 +6590,7 @@ + LDFLAGS="-dynamic $LDFLAGS" + ;; + x86*) +- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" ++ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS -L$JAVA_HOME/jre/lib/amd64 -L$JAVA_HOME/jre/lib/amd64/client -L$JAVA_HOME/jre/lib/amd64/server" + JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + if test "$CC" != "lcc" + then +@@ -6598,7 +6598,7 @@ + fi + ;; + *) +- JAVALIBPATH="\$(LIBDIR)/libYap.so \$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" ++ JAVALIBPATH="\$(DESTDIR)\$(LIBDIR)/libYap.so \$(DESTDIR)\$(YAPLIBDIR)/plstream.so $LIBS $LIBS -L$JAVA_HOME/jre/lib/i386 -L$JAVA_HOME/jre/lib/i386/client -L$JAVA_HOME/jre/lib/i386/server" + JAVAINCPATH="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" + if test "$CC" != "lcc" + then diff --git a/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch new file mode 100644 index 000000000000..5ff93ccdd3c6 --- /dev/null +++ b/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch @@ -0,0 +1,48 @@ +--- yap-6.orig/library/dialect/hprolog.yap 2010-05-12 01:53:25.000000000 +1200 ++++ yap-6/library/dialect/hprolog.yap 2010-05-16 09:25:26.000000000 +1200 +@@ -38,7 +38,7 @@ + split_at/4, % +N, +List, -FirstElements, -LastElements + max_go_list/2, % +List, -Max + or_list/2, % +ListOfInts, -BitwiseOr +- sublist/2, % ?Sublist, +List ++ chr_sublist/2, % ?Sublist, +List + bounded_sublist/3, % ?Sublist, +List, +Bound + chr_delete/3, + init_store/2, +@@ -55,9 +55,9 @@ + % lookup_ht1/4 + ]). + +-:- reexport('../lists',[sublist/2]). ++%:- reexport('../lists',[sublist/2]). + +-%:- use_module(library(lists)). ++:- use_module(library(lists)). + :- use_module(library(assoc)). + + /** hProlog compatibility library +@@ -213,15 +213,15 @@ + % + % True if all elements of Sub appear in List in the same order. + +-%sublist(L, L). +-%sublist(Sub, [H|T]) :- +-% '$sublist1'(T, H, Sub). +- +-%'$sublist1'(Sub, _, Sub). +-%'$sublist1'([H|T], _, Sub) :- +-% '$sublist1'(T, H, Sub). +-%'$sublist1'([H|T], X, [X|Sub]) :- +-% '$sublist1'(T, H, Sub). ++chr_sublist(L, L). ++chr_sublist(Sub, [H|T]) :- ++ '$sublist1'(T, H, Sub). ++ ++'$sublist1'(Sub, _, Sub). ++'$sublist1'([H|T], _, Sub) :- ++ '$sublist1'(T, H, Sub). ++'$sublist1'([H|T], X, [X|Sub]) :- ++ '$sublist1'(T, H, Sub). + + %% bounded_sublist(?Sub, +List, +Bound:integer) + % diff --git a/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch new file mode 100644 index 000000000000..487a939962e6 --- /dev/null +++ b/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch @@ -0,0 +1,14 @@ +--- yap-6.orig/pl/consult.yap 2010-05-12 01:53:25.000000000 +1200 ++++ yap-6/pl/consult.yap 2010-05-16 09:26:41.000000000 +1200 +@@ -872,9 +872,9 @@ + atom_concat([Path,File],PFile). + + '$system_library_directories'(Dir) :- +- getenv('YAPSHAREDIR', Dir). ++ getenv('YAPSHAREDIR', Dir), !. + '$system_library_directories'(Dir) :- +- getenv('YAPCOMMONSDIR', Dir). ++ getenv('YAPCOMMONSDIR', Dir), !. + '$system_library_directories'(Dir) :- + get_value(system_library_directory,Dir). + '$system_library_directories'(Dir) :- diff --git a/dev-lang/yap/yap-6.0.5.ebuild b/dev-lang/yap/yap-6.0.5.ebuild new file mode 100644 index 000000000000..4abf3e17cf26 --- /dev/null +++ b/dev-lang/yap/yap-6.0.5.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5.ebuild,v 1.1 2010/05/18 08:05:44 keri Exp $ + +inherit eutils java-pkg-opt-2 + +DESCRIPTION="YAP is a high-performance Prolog compiler." +HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/" +SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz" + +LICENSE="Artistic LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc examples gmp java mpi mysql odbc readline static tk threads" + +DEPEND="gmp? ( dev-libs/gmp ) + java? ( >=virtual/jdk-1.4 ) + mpi? ( virtual/mpi ) + mysql? ( virtual/mysql ) + odbc? ( dev-db/unixODBC ) + readline? ( sys-libs/readline ) + doc? ( app-text/texi2html )" + +RDEPEND="${DEPEND} + tk? ( dev-lang/tk )" + +S="${WORKDIR}"/${PN}-6 + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-yapsharedir.patch + epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch + epatch "${FILESDIR}"/${P}-chr-sublist.patch +} + +src_compile() { + local myddas_conf + if use mysql || use odbc; then + myddas_conf="--enable-myddas \ + --enable-myddas-stats \ + --enable-myddas-top-level" + else + myddas_conf="--disable-myddas" + fi + + econf \ + --libdir=/usr/$(get_libdir) \ + --enable-cut-c \ + $(use_enable !static dynamic-loading) \ + $(use_enable threads) \ + $(use_enable threads pthread-locking) \ + $(use_enable debug debug-yap) \ + $(use_enable debug low-level-tracer) \ + $(use_with gmp) \ + $(use_with readline) \ + $(use_with mpi) \ + $(use_with mpi mpe) \ + $(use_with java jpl) \ + ${myddas_conf} \ + || die "econf failed" + + emake || die "emake failed" + + if use doc ; then + emake html || die "emake html failed" + fi +} + +src_install() { + emake DESTDIR="${D}" -j1 install || die "make install failed." + + if use tk ; then + exeinto /usr/bin + doexe misc/tkyap + fi + + dodoc changes*.html README + + if use doc ; then + dodoc yap.html + fi + + if use examples ; then + docinto examples/chr + dodoc packages/chr/Examples/*.{chr,pl} + docinto examples/plunit + dodoc packages/plunit/examples/*.pl + if use java ; then + docinto examples/jpl/prolog + dodoc packages/jpl/examples/prolog/*.pl + docinto examples/jpl/java + dodoc packages/jpl/examples/java/*/*.java + fi + if use mpi ; then + docinto examples/mpi + dodoc library/mpi/examples/*.pl + fi + fi +} -- cgit v1.2.3-65-gdbad