From 3b6e95400b826d69c955b5be2263fea6f7fd1dd2 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Tue, 18 May 2010 08:05:44 +0000 Subject: [PATCH] Version bump Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- dev-lang/yap/ChangeLog | 9 +- dev-lang/yap/Manifest | 7 +- .../yap/files/yap-6.0.5-JAVALIBPATH.patch | 20 ++++ .../yap/files/yap-6.0.5-chr-sublist.patch | 48 +++++++++ .../yap/files/yap-6.0.5-yapsharedir.patch | 14 +++ dev-lang/yap/yap-6.0.5.ebuild | 101 ++++++++++++++++++ 6 files changed, 197 insertions(+), 2 deletions(-) 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 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/Manifest b/dev-lang/yap/Manifest index 4c5f445dee21..1ead549a9dae 100644 --- a/dev-lang/yap/Manifest +++ b/dev-lang/yap/Manifest @@ -26,15 +26,20 @@ AUX yap-6.0.3-yapsharedir.patch 520 RMD160 65417f2cfc659192f051c31e9fe2b02f9ecb9 AUX yap-6.0.4-JAVALIBPATH.patch 1269 RMD160 7c123eae21c4487d6f09215c5ccfae5eb08a0a72 SHA1 79a7ebead473c809a39c646047a186bdab3d0cad SHA256 4c4fab906da364c2b4d7c6410927d526e95d2c1efdc045cb785fbcb9870e916a AUX yap-6.0.4-chr-sublist.patch 1351 RMD160 8766497eede000bb55cc8f6deb74aa37ff1e3b33 SHA1 b551c4a828196054a1f1ffc82d5321d63916e174 SHA256 e59142a58b8cb0fc2bdd9123c989189e2c8b60ef140a3863d200ffad179f6ea7 AUX yap-6.0.4-yapsharedir.patch 520 RMD160 e1442c81f3375179cdc96c5cf53403a6faa6a660 SHA1 73a8294e282377fa41b965a5d6fa9e3337cea669 SHA256 bba8b8e34f56362cdeaed778ad37489805c10a25358815e0643bc28868b91c46 +AUX yap-6.0.5-JAVALIBPATH.patch 1261 RMD160 ad4adf0ea06aec59fe7f752beb5b6682332683bd SHA1 cedbe29d06f7a081de19725064d87bcf526a519d SHA256 6a3704750cc6377d222ebdf1e68c3fb3274c3dd4ea4fc55da02abd416d6fa845 +AUX yap-6.0.5-chr-sublist.patch 1343 RMD160 3c10944127f1121d91b9117fa98831d68c4ed355 SHA1 3782420b45427189ae949b1788657764a695666d SHA256 ccbc8d574f9d71f3f625b244a3024dc72527858fba555ec311e4adce6a57bc5d +AUX yap-6.0.5-yapsharedir.patch 512 RMD160 fa77614a699b8ec7f766baf84a847393552e2159 SHA1 9cc44f3fa7a717bd263323194f541b4431c067a3 SHA256 15388a3a25bd62ec79afcb8cef0ca39f3ebe461e4358d31c9b75d7d09d39658d DIST Yap-5.1.3.tar.gz 3266063 RMD160 b2e1153c7a6853a4814a672992d2b8b3834796bc SHA1 76c84b32ad8fbe8324a1db370f8440be11398c34 SHA256 61a5827452f21a7077e2b51b530a7f1b91bfcef06b28d62df53c29d986032aa9 DIST yap-6.0.1.tar.gz 3816766 RMD160 cf113bbe1b8658530b464d40759b0a6320719142 SHA1 97eedc5ce82e87c48ae7c04d7c3364503528fa3d SHA256 91c95702ccb08ce13d9e34aa7d95eacafedb9c628482e91a4f003475036845b9 DIST yap-6.0.2.tar.gz 3818019 RMD160 31df9a3377f4c9aa43b930ad912b397bf67e0d6c SHA1 0f1f5470466f7e32e25019941e394efaee746814 SHA256 5e05d4b7b9bb5d10943b7df46a4da619855cfb9a5e2bf9c771902a87f1129c58 DIST yap-6.0.3.tar.gz 3890926 RMD160 f24a386ff57589796c7d912f336ca79872967b03 SHA1 85b2be539657da3b5ea2f41ae9df80c7f9604a5e SHA256 f3445b9343ebfcc58175738d69e54029b13b89eef31ac94dc6a23e923e4394a5 DIST yap-6.0.4.tar.gz 3783868 RMD160 dbda49255d85abc1a3495e073fa2734e582b9de3 SHA1 4910061d282695e1c2175542648f0075d8c09497 SHA256 c45ddc9201b1284cd371b509c9eff1637b686c65b887737f755a2938bee31836 +DIST yap-6.0.5.tar.gz 3744819 RMD160 b35264a7911c73d095426fb3790a104d41d44157 SHA1 1084b1630b48a430d60d6aee8e31914ecc6d5369 SHA256 3c6f40b9c265a891430defd35b82534decc22413e6b2b2dc7e9b6fd601c9cc93 EBUILD yap-5.1.3-r2.ebuild 2484 RMD160 bf366226c2bb9443d67a6a75e8103ff4677b2d1a SHA1 25f4113498ae52c7ba7bbbdceed58f4b0f73f5e3 SHA256 2fc47953ca86da7ae4a0459df2356be3a2eb45b9efcb59a6686fdfea68c388a3 EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA1 79f8a10f95a3253d48b67952faba87e00f9cc11e SHA256 66468e95ab2c7d6cacd97bc08a7a005eb4e75ff56227dac7c40138bb3012a12b EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d EBUILD yap-6.0.3.ebuild 2245 RMD160 797d6be7ec2451a20be613f17249914174d80531 SHA1 0112bf2a4d121a155041ea6d05bde7b005adfa0b SHA256 5bbdf1c9e6f958cd41b17c44c22eee59a743d51f98812ce37b1c59e736093a2c EBUILD yap-6.0.4.ebuild 2282 RMD160 35eb1455778246bca7ded06d51768ca3fa654855 SHA1 c519d907246aff3e7b67fe806c4bb33b14afee78 SHA256 bd9f2c07540dae18b7b1047d588ef3e2cf0c13c62af59e62a43dc255a779d236 -MISC ChangeLog 6965 RMD160 eab88fb531d58910d2ef89bea37206bf514bfa97 SHA1 c0876d14edafc5a6966172dcc96a06c53d2c3450 SHA256 130ba476f6b96bedf6a384a5e03feb2dae537feac6a05a97b72fec2fcda96592 +EBUILD yap-6.0.5.ebuild 2306 RMD160 98ff91f8f1cacb192eb4e51091732db78bb83adf SHA1 aa0479bbcaf110471857878a337b182d6b583294 SHA256 b8339ff00b57f54b78d144c03f8cadd15598ccba05cfacf2a3c370215b1c08e8 +MISC ChangeLog 7171 RMD160 e59a078f6b1d77c8e053b0ab732ea823a30d79ec SHA1 fdb5d37414d6eadae1b0d708229c4375a4067be0 SHA256 36c8a1c2c1fe3acd1bfb839b728e0f0de35c50c7d975daae9d1b839becbff9f1 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba 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 +} -- 2.26.2