Version bump.

(Portage version: 2.1_pre7-r5)

6 files changed, 280 insertions, 0 deletions

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
+ 
+ 
+