Version bump

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

9 files changed, 603 insertions, 2 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index f264c6d68a4b..cdbca2f970a5 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,14 @@
 # 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.32 2010/03/03 08:23:05 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.33 2010/03/05 08:58:04 keri Exp $
+
+*yap-6.0.2 (05 Mar 2010)
+
+  05 Mar 2010; <keri@gentoo.org> +yap-6.0.2.ebuild,
+  +files/yap-6.0.2-bootfile.patch, +files/yap-6.0.2-dynamic-lib.patch,
+  +files/yap-6.0.2-mpi-include.patch, +files/yap-6.0.2-multilib.patch,
+  +files/yap-6.0.2-myddas-include.patch, +files/yap-6.0.2-yapsharedir.patch:
+  Version bump
 
 *yap-6.0.1 (03 Mar 2010)
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 50301d2667b2..5fbaa25c7c27 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -15,9 +15,17 @@ AUX yap-6.0.1-mpi-include.patch 301 RMD160 6ec4079e391b71e2439db134dfdc6314d155f
 AUX yap-6.0.1-multilib.patch 12454 RMD160 0b509f4597458e825e51026dd3d4d4b8b3c53a7f SHA1 fdbacbfbf72c26447bad9c262a1ade431d32d263 SHA256 49fa168a1cfcc824459c566003431c4654b7fd4cdde2b099001aaacef911d150
 AUX yap-6.0.1-myddas-include.patch 583 RMD160 8dcb400961cf1c3eb80245e04153e575c10cecab SHA1 3243e8d2ab9f5f41957513e3631de446dad5f874 SHA256 5fd4f7db00d2917433fa414101f2b117bbf9a71b3f8d4e33fc4a4c52dc3c7d2a
 AUX yap-6.0.1-yapsharedir.patch 569 RMD160 7b1a1017f3a5014e0d1b2691d0ea5753684d522d SHA1 3d450b01332c96cbb43be1a78adf27678748fbb8 SHA256 4f9739c1c396b6b45272c754270bedb90173818bcee44fffa0b4a5d58b6a98d7
+AUX yap-6.0.2-bootfile.patch 1390 RMD160 40363ef6afbc44e2202c8cf7b18e9b0a64168157 SHA1 b3cbcfd052fe75164fa3c6c35a56ded97cc065e5 SHA256 907da2ce1cefae20b891db75f23af100637a0bed8e4a11843803e8273ec3395e
+AUX yap-6.0.2-dynamic-lib.patch 359 RMD160 65de367470793eb5127c905f816fbb88641c9675 SHA1 84a505fee05e8eced7761a3e7c76a34dbac2a045 SHA256 17532220d4ec6db2a6127f947a305afb3e882153c57e29cdd1c7d97a6cffe2fd
+AUX yap-6.0.2-mpi-include.patch 301 RMD160 04c779a7cbc61d98d762cf63d4f3dd2bb64c3f27 SHA1 35fafd8b3144c5a10457d3ce984338a268001579 SHA256 a15ee91980df0cf36125241491f0458231a2674367fbb5eb9ad1da3554464770
+AUX yap-6.0.2-multilib.patch 12454 RMD160 5191c4ec8e75bfc2ebf53e6848e1b78b16c65335 SHA1 2fa40faa799039432da03c85ce5342e4651362b4 SHA256 7ea723eedae1acb7ca4340cdceff82d1accd6b0d93a445327ea207da0de2e148
+AUX yap-6.0.2-myddas-include.patch 583 RMD160 90f54ecc28e8dac64edd7544358f356abc9ef9a4 SHA1 e40fb124b45fd59c4c504f63158ce0ef4d60e604 SHA256 e3c0de4e7cbcca60b02d8955969e48ec40615afa5ac812863f367aebd02393d2
+AUX yap-6.0.2-yapsharedir.patch 569 RMD160 547981acfd2793c2bd96f3551b373a372ced403c SHA1 61288eb0707a455b0429e7aa2dc76edaa1241bb1 SHA256 f02aa21276cb953f939dd020ab1656b05027af3334ac2352e8a05b38ac6e840d
 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
 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
-MISC ChangeLog 6165 RMD160 17294bfecdf161100d42717e9ecfaf53328fea00 SHA1 f5cdbf43e8967cee253b3213daf0af30fdb697a1 SHA256 c5ee3789a968a73e59962fc53caa0002fac89621bf4a32969cd16ff679e4071f
+EBUILD yap-6.0.2.ebuild 2419 RMD160 9814f93f6acd6431642bb84387dd317400370100 SHA1 49b8dc7f65bc037968a36484fea96ba5426eeadf SHA256 d8a0e9959e6921c11dd5b8f505d2521384bafe461dcf6750ec58ca62289eab3d
+MISC ChangeLog 6478 RMD160 30e61eb158099e0f3555f03448d827bbd2ed1176 SHA1 353549cb4ecd4c2402a6faf5d7ca928cf76a1f46 SHA256 4920686acfbb40cebf9bfdc2ff890bc27f7434ca4704218110ba7f0349a8a38c
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.0.2-bootfile.patch b/dev-lang/yap/files/yap-6.0.2-bootfile.patch
new file mode 100644
index 000000000000..84a041358d9f
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-bootfile.patch
@@ -0,0 +1,57 @@
+--- yap-6.0.2.orig/C/c_interface.c	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/C/c_interface.c	2010-03-05 21:41:19.000000000 +1300
+@@ -2170,6 +2170,7 @@
+ static int eof_found = FALSE;
+ static int yap_lineno = 0;
+ 
++static char *BootFileDir = NULL;
+ static FILE *bootfile;
+ 
+ static char InitFile[] = "init.yap";
+@@ -2489,11 +2490,21 @@
+ 
+     /* read the bootfile */
+     if (!do_bootstrap) {
++      BootFileDir = getenv("YAPBOOTDIR");
++      if (BootFileDir) {
+ #if HAVE_STRNCAT
+-      strncpy(boot_file, YAP_PL_SRCDIR, 256);
++	strncpy(boot_file, BootFileDir, 256);
+ #else
+-      strcpy(boot_file, YAP_PL_SRCDIR);
++	strcpy(boot_file, BootFileDir);
+ #endif
++      }
++      else {
++#if HAVE_STRNCAT
++	strncpy(boot_file, YAP_PL_SRCDIR, 256);
++#else
++	strcpy(boot_file, YAP_PL_SRCDIR);
++#endif	
++      }
+ #if HAVE_STRNCAT
+       strncat(boot_file, "/", 255);
+ #else
+@@ -2513,11 +2524,20 @@
+       Atom atfile;
+       Functor fgoal;
+       YAP_Term goal, as[2];
++      if (BootFileDir) {
+ #if HAVE_STRNCAT
+-      strncpy(init_file, YAP_PL_SRCDIR, 256);
++	strncpy(init_file, BootFileDir, 256);
+ #else
+-      strcpy(init_file, YAP_PL_SRCDIR);
++	strcpy(init_file, BootFileDir);
+ #endif
++      }
++      else {
++#if HAVE_STRNCAT
++	strncpy(init_file, YAP_PL_SRCDIR, 256);
++#else
++	strcpy(init_file, YAP_PL_SRCDIR);
++#endif
++      }
+ #if HAVE_STRNCAT
+       strncat(init_file, "/", 255);
+ #else
diff --git a/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch b/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch
new file mode 100644
index 000000000000..7efa74b3077a
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch
@@ -0,0 +1,11 @@
+--- yap-6.0.2.orig/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/Makefile.in	2010-03-05 21:42:36.000000000 +1300
+@@ -499,7 +499,7 @@
+ 	$(RANLIB) libYap.a
+ 
+ @DYNYAPLIB@: $(LIB_OBJECTS)
+-	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLGS)
++	@DYNLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
+ 
+ install: install_bin install_data
+ 
diff --git a/dev-lang/yap/files/yap-6.0.2-mpi-include.patch b/dev-lang/yap/files/yap-6.0.2-mpi-include.patch
new file mode 100644
index 000000000000..60bcab738a0c
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-mpi-include.patch
@@ -0,0 +1,12 @@
+--- yap-6.0.2.orig/library/mpi/mpi.c	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/mpi/mpi.c	2010-03-05 21:43:55.000000000 +1300
+@@ -26,9 +26,6 @@
+ #include "Yatom.h"
+ #include "yapio.h"
+ 
+-/* for AtomEof */
+-#include "Heap.h"
+-
+ #include <stdlib.h>
+ #include <string.h>
+ #include <mpi.h>
diff --git a/dev-lang/yap/files/yap-6.0.2-multilib.patch b/dev-lang/yap/files/yap-6.0.2-multilib.patch
new file mode 100644
index 000000000000..b6cd8aceb004
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-multilib.patch
@@ -0,0 +1,375 @@
+diff -ur yap-6.0.2.orig/CLPQR/Makefile.in yap-6.0.2/CLPQR/Makefile.in
+--- yap-6.0.2.orig/CLPQR/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/CLPQR/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/GPL/Makefile.in yap-6.0.2/GPL/Makefile.in
+--- yap-6.0.2.orig/GPL/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/GPL/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/LGPL/Makefile.in yap-6.0.2/LGPL/Makefile.in
+--- yap-6.0.2.orig/LGPL/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/LGPL/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/LGPL/clp/Makefile.in yap-6.0.2/LGPL/clp/Makefile.in
+--- yap-6.0.2.orig/LGPL/clp/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/LGPL/clp/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/LGPL/swi_console/Makefile.in yap-6.0.2/LGPL/swi_console/Makefile.in
+--- yap-6.0.2.orig/LGPL/swi_console/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/LGPL/swi_console/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -8,7 +8,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/Makefile.in yap-6.0.2/Makefile.in
+--- yap-6.0.2.orig/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -12,8 +12,8 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/library/Makefile.in yap-6.0.2/library/Makefile.in
+--- yap-6.0.2.orig/library/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/library/lammpi/Makefile.in yap-6.0.2/library/lammpi/Makefile.in
+--- yap-6.0.2.orig/library/lammpi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/lammpi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -17,7 +17,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/matlab/Makefile.in yap-6.0.2/library/matlab/Makefile.in
+--- yap-6.0.2.orig/library/matlab/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/matlab/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/matrices/Makefile.in yap-6.0.2/library/matrices/Makefile.in
+--- yap-6.0.2.orig/library/matrices/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/matrices/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/matrix/Makefile.in yap-6.0.2/library/matrix/Makefile.in
+--- yap-6.0.2.orig/library/matrix/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/matrix/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/mpi/Makefile.in yap-6.0.2/library/mpi/Makefile.in
+--- yap-6.0.2.orig/library/mpi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/mpi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -21,8 +21,8 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/library/random/Makefile.in yap-6.0.2/library/random/Makefile.in
+--- yap-6.0.2.orig/library/random/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/random/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/regex/Makefile.in yap-6.0.2/library/regex/Makefile.in
+--- yap-6.0.2.orig/library/regex/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/regex/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/rltree/Makefile.in yap-6.0.2/library/rltree/Makefile.in
+--- yap-6.0.2.orig/library/rltree/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/rltree/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -17,7 +17,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/system/Makefile.in yap-6.0.2/library/system/Makefile.in
+--- yap-6.0.2.orig/library/system/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/system/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/tries/Makefile.in yap-6.0.2/library/tries/Makefile.in
+--- yap-6.0.2.orig/library/tries/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/tries/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/library/yap2swi/Makefile.in yap-6.0.2/library/yap2swi/Makefile.in
+--- yap-6.0.2.orig/library/yap2swi/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/library/yap2swi/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/packages/CLPBN/Makefile.in yap-6.0.2/packages/CLPBN/Makefile.in
+--- yap-6.0.2.orig/packages/CLPBN/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/CLPBN/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/packages/PLStream/Makefile.in yap-6.0.2/packages/PLStream/Makefile.in
+--- yap-6.0.2.orig/packages/PLStream/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/PLStream/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -14,7 +14,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/packages/ProbLog/Makefile.in yap-6.0.2/packages/ProbLog/Makefile.in
+--- yap-6.0.2.orig/packages/ProbLog/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/ProbLog/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in
+--- yap-6.0.2.orig/packages/ProbLog/simplecudd/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/ProbLog/simplecudd/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -13,7 +13,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/packages/chr/Makefile.in yap-6.0.2/packages/chr/Makefile.in
+--- yap-6.0.2.orig/packages/chr/Makefile.in	2010-03-04 13:57:48.000000000 +1300
++++ yap-6.0.2/packages/chr/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -15,8 +15,8 @@
+ srcdir=@srcdir@
+ 
+ BINDIR = $(EROOTDIR)/bin
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ SHAREDIR=$(ROOTDIR)/share/Yap
+ 
+ SHELL=@SHELL@
+diff -ur yap-6.0.2.orig/packages/clpqr/Makefile.in yap-6.0.2/packages/clpqr/Makefile.in
+--- yap-6.0.2.orig/packages/clpqr/Makefile.in	2010-03-04 13:57:49.000000000 +1300
++++ yap-6.0.2/packages/clpqr/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -18,8 +18,8 @@
+ ROOTDIR = $(prefix)
+ EROOTDIR = @exec_prefix@
+ BINDIR = $(EROOTDIR)/bin
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ SHAREDIR=$(ROOTDIR)/share/Yap
+ CLPDIR=$(SHAREDIR)
+ else
+diff -ur yap-6.0.2.orig/packages/cplint/Makefile.in yap-6.0.2/packages/cplint/Makefile.in
+--- yap-6.0.2.orig/packages/cplint/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/cplint/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -12,7 +12,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
+diff -ur yap-6.0.2.orig/packages/jpl/Makefile.in yap-6.0.2/packages/jpl/Makefile.in
+--- yap-6.0.2.orig/packages/jpl/Makefile.in	2010-03-04 13:57:50.000000000 +1300
++++ yap-6.0.2/packages/jpl/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -22,8 +22,8 @@
+ srcdir=@srcdir@
+ 
+ BINDIR = $(EROOTDIR)/bin
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ SHAREDIR=$(ROOTDIR)/share/Yap
+ SHLIB_CFLAGS=@SHLIB_CFLAGS@
+ 
+diff -ur yap-6.0.2.orig/packages/plunit/Makefile.in yap-6.0.2/packages/plunit/Makefile.in
+--- yap-6.0.2.orig/packages/plunit/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/plunit/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -17,9 +17,9 @@
+ srcdir=@srcdir@
+ 
+ BINDIR = $(EROOTDIR)/bin
+-LIBDIR=$(EROOTDIR)/lib
++LIBDIR=@libdir@
+ SHAREDIR=$(EROOTDIR)/share/Yap
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++YAPLIBDIR=@libdir@/Yap
+ 
+ PL=@EXTEND_DYNLOADER_PATH@ $(DESTDIR)$(BINDIR)/yap $(DESTDIR)$(YAPLIBDIR)/startup.yss
+ LN_S=@LN_S@
+diff -ur yap-6.0.2.orig/packages/sgml/Makefile.in yap-6.0.2/packages/sgml/Makefile.in
+--- yap-6.0.2.orig/packages/sgml/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/sgml/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -16,8 +16,8 @@
+ srcdir=@srcdir@
+ 
+ BINDIR = $(EROOTDIR)/bin
+-LIBDIR=$(EROOTDIR)/lib
+-YAPLIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@
++YAPLIBDIR=@libdir@/Yap
+ SHAREDIR=$(ROOTDIR)/share/Yap
+ 
+ SHELL=@SHELL@
+diff -ur yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.2/packages/swi-minisat2/C/Makefile.in
+--- yap-6.0.2.orig/packages/swi-minisat2/C/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/swi-minisat2/C/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -14,7 +14,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur yap-6.0.2.orig/packages/swi-minisat2/Makefile.in yap-6.0.2/packages/swi-minisat2/Makefile.in
+--- yap-6.0.2.orig/packages/swi-minisat2/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/packages/swi-minisat2/Makefile.in	2010-03-05 21:45:24.000000000 +1300
+@@ -9,7 +9,7 @@
+ #
+ # where YAP should look for binary libraries
+ #
+-LIBDIR=$(ROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ # where YAP should look for architecture-independent Prolog libraries
+ #
diff --git a/dev-lang/yap/files/yap-6.0.2-myddas-include.patch b/dev-lang/yap/files/yap-6.0.2-myddas-include.patch
new file mode 100644
index 000000000000..4da9df0042bb
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-myddas-include.patch
@@ -0,0 +1,11 @@
+--- yap-6.0.2.orig/Makefile.in	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/Makefile.in	2010-03-05 21:51:44.000000000 +1300
+@@ -59,7 +59,7 @@
+ #
+ CC=@CC@
+ MPI_CC=@MPI_CC@
+-CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/packages/MYDDAS
++CPPFLAGS=@CPPFLAGS@  -I. -I$(srcdir)/H -I$(srcdir)/OPTYap -I$(srcdir)/BEAM -I$(srcdir)/MYDDAS
+ CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
+ C_INTERF_FLAGS= @C_INTERF_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS) -I$(srcdir)/include
+ C_PARSER_FLAGS= @C_PARSER_FLAGS@ $(YAP_EXTRAS) $(DEFS) $(CPPFLAGS)
diff --git a/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch
new file mode 100644
index 000000000000..e900bd3d497e
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch
@@ -0,0 +1,17 @@
+--- yap-6.0.2.orig/pl/consult.yap	2010-03-04 13:57:29.000000000 +1300
++++ yap-6.0.2/pl/consult.yap	2010-03-05 21:46:18.000000000 +1300
+@@ -877,12 +877,12 @@
+ 	atom_concat([Path,File],PFile).
+ 
+ '$system_library_directories'(Dir) :-
+-	getenv('YAPSHAREDIR', Dir).
++	getenv('YAPSHAREDIR', Dir), !.
+ '$system_library_directories'(Dir) :-
+ 	get_value(system_library_directory,Dir).
+ 
+ '$system_library_directories'(Dir) :-
+-	getenv('YAPCOMMONSDIR', Dir).
++	getenv('YAPCOMMONSDIR', Dir), !.
+ '$system_library_directories'(Dir) :-
+ 	get_value(prolog_commons_directory,Dir).
+ 
diff --git a/dev-lang/yap/yap-6.0.2.ebuild b/dev-lang/yap/yap-6.0.2.ebuild
new file mode 100644
index 000000000000..1f9888a12188
--- /dev/null
+++ b/dev-lang/yap/yap-6.0.2.ebuild
@@ -0,0 +1,102 @@
+# 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.2.ebuild,v 1.1 2010/03/05 08:58:04 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/yap-6.0.2.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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-bootfile.patch
+	epatch "${FILESDIR}"/${P}-dynamic-lib.patch
+	epatch "${FILESDIR}"/${P}-mpi-include.patch
+	epatch "${FILESDIR}"/${P}-myddas-include.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
+	epatch "${FILESDIR}"/${P}-yapsharedir.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
+}