Version bump.

Package-Manager: portage-2.1_pre7-r5

9 files changed, 400 insertions, 4 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 2b1a29678531..f18c72585475 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.2 2006/03/24 20:55:27 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.3 2006/04/24 08:13:26 keri Exp $
+
+*yap-5.1.1 (24 Apr 2006)
+
+  24 Apr 2006; Keri Harris <keri@gentoo.org> +files/yap-5.1.1-analyst.patch,
+  +files/yap-5.1.1-configure.patch, +files/yap-5.1.1-myddas.patch,
+  +files/yap-5.1.1-tabling.patch, +files/yap-5.1.1-tkyap.patch,
+  +yap-5.1.1.ebuild:
+  Version bump.
 
   24 Mar 2006; Keri Harris <keri@gentoo.org> yap-5.0.1.ebuild:
   Install info pages.
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 37a59294410b..19cd6703d7de 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,9 +1,12 @@
-MD5 6877b68e482a5e7f0e9e1868a0c65e3f ChangeLog 651
-RMD160 499201954c637604b3189593826f97a694af75c0 ChangeLog 651
-SHA256 bfc5bc1973aeaae0f60b808bfdfcc630634d02ae9f20d9f9930044fb7914618c ChangeLog 651
+MD5 f69a7cc4cb32f80ce1664e9d51a2117e ChangeLog 923
+RMD160 27f43dbe705e372388d17d6ffb901075ec60befe ChangeLog 923
+SHA256 7bd5cbd443e3406b5a8c6b0fb96ea895cbf0016ad33bfe0aa054324990714f82 ChangeLog 923
 MD5 84cc267d1369b377ebc9d839910a7da2 files/digest-yap-5.0.1 232
 RMD160 f5fecf7dd7ad32b05daf768843aa4c6c728481cd files/digest-yap-5.0.1 232
 SHA256 376653f3a11c73a09aa1cef554d2bc60b36517378a442982f6e082ba9bf92856 files/digest-yap-5.0.1 232
+MD5 b0b540f40f799d5ffa083e7ad192d780 files/digest-yap-5.1.1 232
+RMD160 87a39e5d5151641fdfb130a3807ba1418e044ca5 files/digest-yap-5.1.1 232
+SHA256 95b9fdecfe77131de6905b178604c3aacab6c5742396718554dc77ba6f4dbdf0 files/digest-yap-5.1.1 232
 MD5 4cc7f866af938319e13f03ca11b77411 files/yap-5.0.1-analyst.patch 412
 RMD160 9aef58ad8f5f1cfffabe7600ab078e292b28383d files/yap-5.0.1-analyst.patch 412
 SHA256 c28cbb5d3adda71b4d131e891d5172af6e9b585bb0372b515adf5ac6cf567b16 files/yap-5.0.1-analyst.patch 412
@@ -25,9 +28,27 @@ SHA256 23fafd401aa9acdd53e7cb2a97b621905c0148eb1aec71ce6f734ecf947b1998 files/ya
 MD5 20aa2c8490bfd72fcbc559bfee81ca55 files/yap-5.0.1-tkyap.patch 1259
 RMD160 50258dab9de41224314582d2bfc67ba2376f9afc files/yap-5.0.1-tkyap.patch 1259
 SHA256 3178561085f2f515a12e1feba360d1e77ddf92ce9edacb709928b83a78df1c76 files/yap-5.0.1-tkyap.patch 1259
+MD5 4cc7f866af938319e13f03ca11b77411 files/yap-5.1.1-analyst.patch 412
+RMD160 9aef58ad8f5f1cfffabe7600ab078e292b28383d files/yap-5.1.1-analyst.patch 412
+SHA256 c28cbb5d3adda71b4d131e891d5172af6e9b585bb0372b515adf5ac6cf567b16 files/yap-5.1.1-analyst.patch 412
+MD5 186e100798b1941a3562009d8c37d129 files/yap-5.1.1-configure.patch 4143
+RMD160 de01cd9358d76c614858003a6faa6142ad491170 files/yap-5.1.1-configure.patch 4143
+SHA256 ed0e866218c3d483920f1fdd8ce8be2fc003ec6c7e70642dbc7afa417c999f95 files/yap-5.1.1-configure.patch 4143
+MD5 f7008ced13cacf68156ef5dafde84425 files/yap-5.1.1-myddas.patch 551
+RMD160 2ccd790f0769f100fba842b4cf008880be6e4694 files/yap-5.1.1-myddas.patch 551
+SHA256 d8e0714fa03595b0ad8ba07e07c9dd0686855b258464e8fac7f856a8642e4095 files/yap-5.1.1-myddas.patch 551
+MD5 5f102998ed76f0b6de165a00b7259916 files/yap-5.1.1-tabling.patch 2022
+RMD160 3d684781288bbea32ea31d9f25cb0de7979d3589 files/yap-5.1.1-tabling.patch 2022
+SHA256 75ee095486517cecb40b580c4b5ff7b4dcc54a6684edf7b5cc694b47121e5c5e files/yap-5.1.1-tabling.patch 2022
+MD5 284f66d723b6bc3f64adbe656b54c6b0 files/yap-5.1.1-tkyap.patch 695
+RMD160 4be6c0e2c4552c73a007388cc513372e0fd6dc67 files/yap-5.1.1-tkyap.patch 695
+SHA256 451128b74a2627a2149e0629be32f3a4dc8708cb664d7a59df0e9924e9f8b28d files/yap-5.1.1-tkyap.patch 695
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata.xml 159
 MD5 5de8cfa231524805fa6493bb05bf1245 yap-5.0.1.ebuild 1935
 RMD160 a09c27f0c501c430673a79c48867baae6e799fb0 yap-5.0.1.ebuild 1935
 SHA256 822694c4fe94e246e215fcc3f6ca5a903f06e6521357c38e899ddcb028d7b217 yap-5.0.1.ebuild 1935
+MD5 007eb886571faf5e9f5ee256e033a038 yap-5.1.1.ebuild 2091
+RMD160 a33e72020c130ba292ce6cfc39f479cd19597cfc yap-5.1.1.ebuild 2091
+SHA256 c924949de5f0b195da586d718e7425a4d4f8df6f921b82953d1c7d6f32e2750c yap-5.1.1.ebuild 2091
diff --git a/dev-lang/yap/files/digest-yap-5.1.1 b/dev-lang/yap/files/digest-yap-5.1.1
new file mode 100644
index 000000000000..5e995c6fb910
--- /dev/null
+++ b/dev-lang/yap/files/digest-yap-5.1.1
@@ -0,0 +1,3 @@
+MD5 1f5c26642a27158c98f6c2fac56d3dad Yap-5.1.1.tar.gz 3429186
+RMD160 a32aec2f29e5964c302fa93fa54aa2d1dbe8defd Yap-5.1.1.tar.gz 3429186
+SHA256 cadb35cb3b7e469aa6bc6f7a819904f1f746b1e9c71f4a2af1ea254569ed522d Yap-5.1.1.tar.gz 3429186
diff --git a/dev-lang/yap/files/yap-5.1.1-analyst.patch b/dev-lang/yap/files/yap-5.1.1-analyst.patch
new file mode 100644
index 000000000000..d9d563fe962f
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-analyst.patch
@@ -0,0 +1,16 @@
+diff -ur Yap-5.0.1.orig/H/Yap.h Yap-5.0.1/H/Yap.h
+--- Yap-5.0.1.orig/H/Yap.h	2005-10-18 06:55:22.000000000 +1300
++++ Yap-5.0.1/H/Yap.h	2006-02-21 21:22:18.000000000 +1300
+@@ -53,12 +53,6 @@
+ #undef TRAILING_REQUIRES_BRANCH
+ #endif /* YAPOR || TABLING */
+ 
+-#if ANALYST
+-#ifdef USE_THREADED_CODE
+-#undef USE_THREADED_CODE
+-#endif
+-#endif
+-
+ #ifdef  COROUTINING
+ #ifndef TERM_EXTENSIONS
+ #define TERM_EXTENSIONS 1
diff --git a/dev-lang/yap/files/yap-5.1.1-configure.patch b/dev-lang/yap/files/yap-5.1.1-configure.patch
new file mode 100644
index 000000000000..b55a7309484e
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-configure.patch
@@ -0,0 +1,149 @@
+--- Yap-5.1.1.orig/configure.in	2006-03-21 07:51:42.000000000 +1200
++++ Yap-5.1.1/configure.in	2006-04-23 11:03:02.000000000 +1200
+@@ -50,7 +50,7 @@
+ 	[ --enable-threads           support system threads ],
+ 	threads="$enableval", threads=no)
+ AC_ARG_ENABLE(pthread-locking,
+-	[ --pthread-locking           use pthread locking primitives for internal locking (requires threads)  ],
++	[ --enable-pthread-locking   use pthread locking primitives for internal locking (requires threads)  ],
+ 	pthreadlocking="$enableval", pthreadlocking=no)
+ AC_ARG_ENABLE(max-performance,
+ 	[ --enable-max-performance   try using the best flags for specific architecture ],
+@@ -98,18 +98,31 @@
+ 	fi,
+ 	[yap_cv_gmp=yes])
+ 
+-AC_ARG_ENABLE(myddas,
+-	[ --enable-myddas         enable the MYDDAS library],
++AC_ARG_ENABLE(myddas-mysql,
++	[ --enable-myddas-mysql         enable the MYDDAS MySQL library],
+ 	if test "$enableval" = yes; then
+-		yap_cv_myddas=yes
++		yap_cv_myddas_mysql=yes
+ 	elif test "$enableval" = no; then
+-		yap_cv_myddas=no
++		yap_cv_myddas_mysql=no
+ 	else
+-		yap_cv_myddas=$enable_myddas
+-		LDFLAGS="$LDFLAGS -L${yap_cv_myddas}/lib"
+-		CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas}/include"
++		yap_cv_myddas_mysql=$enable_myddas_mysql
++		LDFLAGS="$LDFLAGS -L${yap_cv_myddas_mysql}/lib"
++		CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas_mysql}/include"
+ 	fi,
+-	[yap_cv_myddas=no])
++	[yap_cv_myddas_mysql=no])
++
++AC_ARG_ENABLE(myddas-odbc,
++	[ --enable-myddas-odbc         enable the MYDDAS ODBC library],
++	if test "$enableval" = yes; then
++		yap_cv_myddas_odbc=yes
++	elif test "$enableval" = no; then
++		yap_cv_myddas_odbc=no
++	else
++		yap_cv_myddas_odbc=$enable_myddas_odbc
++		LDFLAGS="$LDFLAGS -L${yap_cv_myddas_odbc}/lib"
++		CPPFLAGS="$CPPFLAGS -I${yap_cv_myddas_odbc}/include"
++	fi,
++	[yap_cv_myddas_odbc=no])
+ 
+ AC_ARG_ENABLE(myddas-stats,
+ 	[ --enable-myddas-stats     enable the MYDDAS library statistics support],
+@@ -123,8 +136,6 @@
+ 	[ --with-jpl=JAVA_HOME       use Java instalation in JAVA_HOME],
+ 	if test "$withval" = yes; then
+ 		yap_cv_jpl="$JAVA_HOME"
+-		dynamic_loading=yes
+-		maxmemory=yes
+ dnl		threads=yes
+ 	elif test "$withval" = no; then
+ 		yap_cv_jpl=no
+@@ -390,7 +401,7 @@
+   AC_CHECK_LIB(gmp,main)
+ fi
+ 
+-if test "$yap_cv_myddas" != "no"
++if test "$yap_cv_myddas_mysql" != "no"
+ then
+ 	dnl check for mysql
+ 	AC_MSG_CHECKING(for main in -lmysqlclient)
+@@ -409,7 +420,24 @@
+ 		YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
+ 		LIBS="$LIBS -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lc -lnss_files -lnss_dns -lresolv "
+ 	fi
+-	
++	if test "$yap_mysql" = no
++	then
++		echo "-------------------------------"
++	    	echo "--"
++	    	echo "--"
++	    	echo "--"
++	    	echo "-- There\'s no devel libraries for MySQL"
++	    	echo "--"
++	    	echo "--"
++	    	echo "--"
++	    	echo "-------------------------------"
++	    	exit
++	fi
++	cutc="yes"
++fi
++
++if test "$yap_cv_myddas_odbc" != "no"
++then
+ 	dnl check for odbc
+ 	AC_MSG_CHECKING(for main in -lodbc)
+ 	AC_CACHE_VAL(yap_odbc,[
+@@ -428,40 +456,21 @@
+ 		YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
+ 		LIBS="$LIBS -lodbc "
+ 	fi
+-	
+-	if test "$yap_mysql" = no -a "$yap_odbc" = no
++	if test "$yap_odbc" = no
+ 	then
+ 		echo "-------------------------------"
+ 	    	echo "--"
+ 	    	echo "--"
+ 	    	echo "--"
+-	    	echo "-- There\'s no devel libraries for MySQL or ODBC"
++	    	echo "-- There\'s no devel libraries for ODBC"
+ 	    	echo "--"
+ 	    	echo "--"
+ 	    	echo "--"
+ 	    	echo "-------------------------------"
+ 	    	exit
+ 	fi
+-
+-	if test "$cutc" = no
+-	then
+-		echo
+-		echo
+-		echo "********************************************************"
+-		echo
+-		echo
+-		echo "!!!!!! WARNING !!!!!!"
+-		echo "The MYDDAS interface makes no sense without cut-c"
+-		echo "Please contact tiagosoares@ncc.up.pt for help"
+-		echo 
+-		echo "Enabling cut-c"
+-		echo
+-		echo "********************************************************"
+-		echo
+-		echo
+-		cutc="yes"
+-	fi
+-fi	
++	cutc="yes"
++fi
+ 
+ if test "$myddasstats" = "yes"
+   then
+@@ -850,7 +859,7 @@
+ then
+   AC_CHECK_HEADERS(gmp.h)
+ fi
+-if test "$yap_cv_myddas" != "no"
++if test "$yap_cv_myddas_mysql" != "no"
+ then
+   AC_CHECK_HEADERS(mysql/mysql.h)
+ fi
diff --git a/dev-lang/yap/files/yap-5.1.1-myddas.patch b/dev-lang/yap/files/yap-5.1.1-myddas.patch
new file mode 100644
index 000000000000..6d7cb81c467c
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-myddas.patch
@@ -0,0 +1,12 @@
+--- Yap-5.1.1.orig/H/Yapproto.h	2006-03-21 07:51:44.000000000 +1200
++++ Yap-5.1.1/H/Yapproto.h	2006-04-23 16:07:20.000000000 +1200
+@@ -327,7 +327,9 @@
+ MYDDAS_GLOBAL          STD_PROTO(myddas_util_initialize_myddas,(void));
+ 
+ /* myddas_util.c */
++#ifdef MYDDAS_MYSQL
+ void                   STD_PROTO(myddas_util_table_write,(MYSQL_RES *));
++#endif
+ /* Returns the connection type (mysql -> 1  or odbc -> 2) */
+ Short                  STD_PROTO(myddas_util_connection_type,(void *));
+ /* Adds a connection identifier to the MYDDAS connections list*/
diff --git a/dev-lang/yap/files/yap-5.1.1-tabling.patch b/dev-lang/yap/files/yap-5.1.1-tabling.patch
new file mode 100644
index 000000000000..894a724a9ef4
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-tabling.patch
@@ -0,0 +1,74 @@
+--- Yap-5.1.1.orig/OPTYap/opt.init.c	2005-11-16 14:55:03.000000000 +1300
++++ Yap-5.1.1/OPTYap/opt.init.c	2006-04-20 20:46:57.000000000 +1200
+@@ -192,9 +192,11 @@
+ 
+ 
+ void init_local(void) {
++#if defined(YAPOR) || defined(THREADS)
++  LOCAL = REMOTE + worker_id;
++#endif
+ #ifdef YAPOR
+   /* local data related to or-parallelism */
+-  LOCAL = REMOTE + worker_id;
+   LOCAL_top_cp = B_BASE;
+   LOCAL_top_or_fr = GLOBAL_root_or_fr;
+   LOCAL_load = 0;
+--- Yap-5.1.1.orig/OPTYap/opt.structs.h	2005-11-04 14:17:17.000000000 +1300
++++ Yap-5.1.1/OPTYap/opt.structs.h	2006-04-20 20:37:44.000000000 +1200
+@@ -41,7 +41,7 @@
+ ** ---------------------- */
+ 
+ struct pages {
+-#ifdef YAPOR
++#if defined(YAPOR) || defined(THREADS)
+   lockvar lock;
+ #endif /* YAPOR */
+   volatile long pages_allocated;
+@@ -276,9 +276,11 @@
+ ** --------------------------- */
+ 
+ struct local_data{
++#if defined(YAPOR) || defined(THREADS)
++  lockvar lock;
++#endif
+ #ifdef YAPOR
+   /* local data related to or-parallelism */
+-  lockvar lock;
+   volatile int load;
+   choiceptr top_choice_point;
+   struct or_frame *top_or_frame;
+--- Yap-5.1.1.orig/OPTYap/tab.structs.h	2005-08-05 03:45:56.000000000 +1200
++++ Yap-5.1.1/OPTYap/tab.structs.h	2006-04-20 20:19:32.000000000 +1200
+@@ -50,7 +50,7 @@
+ ** ---------------------------- */
+ 
+ typedef struct table_entry {
+-#ifdef YAPOR
++#if defined(YAPOR) || defined(THREADS)
+   lockvar lock;
+ #endif /* YAPOR */
+   struct pred_entry *pred_entry;
+@@ -149,8 +149,10 @@
+ ** ------------------------------ */
+ 
+ typedef struct subgoal_frame {
+-#ifdef YAPOR
++#if defined(YAPOR) || defined(THREADS)
+   lockvar lock;
++#endif
++#ifdef YAPOR
+   int generator_worker;
+   struct or_frame *top_or_frame_on_generator_branch;
+ #endif /* YAPOR */
+@@ -225,8 +227,10 @@
+ ** --------------------------------- */
+ 
+ typedef struct dependency_frame {
+-#ifdef YAPOR
++#if defined(YAPOR) || defined(THREADS)
+   lockvar lock;
++#endif
++#ifdef YAPOR
+   int leader_dependency_is_on_stack;
+   struct or_frame *top_or_frame;
+ #ifdef TIMESTAMP_CHECK
diff --git a/dev-lang/yap/files/yap-5.1.1-tkyap.patch b/dev-lang/yap/files/yap-5.1.1-tkyap.patch
new file mode 100644
index 000000000000..59cb90c95714
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-tkyap.patch
@@ -0,0 +1,26 @@
+--- Yap-5.1.1.orig/misc/tkyap	2006-02-21 02:18:08.000000000 +1300
++++ Yap-5.1.1/misc/tkyap	2006-04-20 19:28:52.000000000 +1200
+@@ -33,19 +33,10 @@
+ #option add "*message*Font" $TextFont
+ #option add "*list*Font" $TextFont
+ 
+-if {[file exists /vmlinuz]} {
+-   set  TextFont "*6x10*"
+-   if {[file exists /home/luis/Yap94/linux]} {
+-	set homeyap /home/luis/Yap94/linux
+-   } else {
+-	set homeyap .
+-   }
+-   set PrologCommand "$homeyap/yap $homeyap/startup -c localhost $service $YapOptions"
+-   set SolarisBug 0
+-} else {
+-   set PrologCommand "ny -h8000 -s1000"
+-   set SolarisBug 1
+-}
++set  TextFont "*6x10*"
++
++set PrologCommand "yap -c localhost $service $YapOptions"
++set SolarisBug 0
+ 
+ 
+ 
diff --git a/dev-lang/yap/yap-5.1.1.ebuild b/dev-lang/yap/yap-5.1.1.ebuild
new file mode 100644
index 000000000000..58b8e421d5c7
--- /dev/null
+++ b/dev-lang/yap/yap-5.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.1 2006/04/24 08:13:26 keri Exp $
+
+inherit autotools eutils
+
+MY_P="Yap-${PV}"
+
+DESCRIPTION="YAP is a high-performance Prolog compiler."
+HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="debug doc gmp java mpi mysql odbc readline static tcltk threads"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	java? ( virtual/jdk )
+	mpi? ( virtual/mpi )
+	mysql? ( dev-db/mysql )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )"
+
+RDEPEND="${DEPEND}
+	tcltk? ( dev-lang/tk )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-analyst.patch
+	epatch "${FILESDIR}"/${P}-myddas.patch
+	epatch "${FILESDIR}"/${P}-tabling.patch
+	epatch "${FILESDIR}"/${P}-tkyap.patch
+}
+
+src_compile() {
+	eautoconf
+	econf \
+		--enable-low-level-tracer \
+		--enable-rational-trees \
+		--enable-coroutining \
+		--enable-myddas-stats \
+		--enable-tabling \
+		--disable-eam \
+		--disable-depth-limit \
+		--disable-or-parallelism \
+		$(use_enable threads) \
+		$(use_enable threads pthread-locking) \
+		$(use_enable threads use-malloc) \
+		$(use_enable !static dynamic-loading) \
+		$(use_enable debug debug-yap) \
+		$(use_enable debug wam-profile) \
+		$(use_enable mysql myddas-mysql) \
+		$(use_enable mysql myddas-top-level) \
+		$(use_enable odbc myddas-odbc) \
+		$(use_with gmp) \
+		$(use_with readline) \
+		$(use_with mpi) \
+		$(use_with mpi mpe) \
+		$(use_with java jpl) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed."
+
+	if use tcltk ; then
+		exeinto /usr/bin
+		doexe misc/tkyap
+	fi
+
+	if use doc ; then
+		dodoc docs/yap.html
+		docinto examples
+		dodoc CLPBN/clpbn/examples/cg.yap
+		dodoc CLPBN/clpbn/examples/School/*
+	fi
+
+	doinfo docs/*.info*
+	dodoc changes4.3.html INSTALL README
+}