Version bump

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

9 files changed, 606 insertions, 3 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index bd58088a0155..f264c6d68a4b 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/yap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.31 2009/12/10 05:24:03 keri Exp $
+# 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 $
+
+*yap-6.0.1 (03 Mar 2010)
+
+  03 Mar 2010; <keri@gentoo.org> +yap-6.0.1.ebuild,
+  +files/yap-6.0.1-bootfile.patch, +files/yap-6.0.1-dynamic-lib.patch,
+  +files/yap-6.0.1-mpi-include.patch, +files/yap-6.0.1-multilib.patch,
+  +files/yap-6.0.1-myddas-include.patch, +files/yap-6.0.1-yapsharedir.patch:
+  Version bump
 
   10 Dec 2009; <keri@gentoo.org> -yap-5.1.1.ebuild,
   -files/yap-5.1.1-SONAME.patch, -files/yap-5.1.1-analyst.patch,
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index c745421e85c5..50301d2667b2 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -9,7 +9,15 @@ AUX yap-5.1.3-fortify_sources-ubuntu.patch 910 RMD160 00518b6ffbe4a3119821799f86
 AUX yap-5.1.3-multilib.patch 10161 RMD160 d19b31c8b9a7b4c71165f6397076be3ed75d1112 SHA1 0225e01a9fb1b27b0f5e4df62e3c6251e62c4d78 SHA256 5a07da0160c8e5d56e2902e162a5bb4eb1e1027f7e78f8ff041fa025770ce06e
 AUX yap-5.1.3-parallel-make.patch 6384 RMD160 b5f107a748b4d13832dfc9f7f1446f4b90e6317c SHA1 d7a0b16cbd0a843a5c96bd6dcee901f383d92db0 SHA256 99edc0a21ccb7354437c43b66dea6b264c3764c3c748b6c441d70112b885414b
 AUX yap-5.1.3-tkyap.patch 695 RMD160 a723ec3962b2072b64fd045f424d3c7a1b1f0b03 SHA1 e04ea927dab423b358e025c563fcc7179fdf7cc5 SHA256 58f6b3314b7091f3abbf9f378dc65018390c91a6e3578d4a7826c7b49c5eb319
+AUX yap-6.0.1-bootfile.patch 1390 RMD160 16364d2e4df4c9274225fcb177e0b300eaee6ee4 SHA1 50b16a55cd78744d7507adff35688a6da9f4c09e SHA256 d7822fa6d5e53a64b3be7ff80467988e5f3715ab4dca001f5e9c4c18bba4c12b
+AUX yap-6.0.1-dynamic-lib.patch 359 RMD160 976053f9655510a5037a57f46a411aa35e35b613 SHA1 0d8b2237b67cc88b50978aedff477cd2bcdfe896 SHA256 b1fe461133ff58aba8856e3854488e14ecfdd8cf45144484e7b3690cfec34368
+AUX yap-6.0.1-mpi-include.patch 301 RMD160 6ec4079e391b71e2439db134dfdc6314d155fa7e SHA1 c3c53822893050e7721365549cb2065560d2af71 SHA256 ef4fe7438bab61566a642a2401cc2f02133417f06061861d2f661abcd1e71384
+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
 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
 EBUILD yap-5.1.3-r2.ebuild 2484 RMD160 bf366226c2bb9443d67a6a75e8103ff4677b2d1a SHA1 25f4113498ae52c7ba7bbbdceed58f4b0f73f5e3 SHA256 2fc47953ca86da7ae4a0459df2356be3a2eb45b9efcb59a6686fdfea68c388a3
-MISC ChangeLog 5852 RMD160 1590351496dcc653c1cb49ff5c6a33b65b445ac9 SHA1 67a01a219ce6cb4c2b13d105ed6c867ef1cf3dd8 SHA256 96d7c2ed1ca361eaa69962eb476720e871df338310b4e7943e572c778347386f
+EBUILD yap-6.0.1.ebuild 2437 RMD160 5ebc3452fb389cd963686ec8bf2183c3213ac7f5 SHA1 79f8a10f95a3253d48b67952faba87e00f9cc11e SHA256 66468e95ab2c7d6cacd97bc08a7a005eb4e75ff56227dac7c40138bb3012a12b
+MISC ChangeLog 6165 RMD160 17294bfecdf161100d42717e9ecfaf53328fea00 SHA1 f5cdbf43e8967cee253b3213daf0af30fdb697a1 SHA256 c5ee3789a968a73e59962fc53caa0002fac89621bf4a32969cd16ff679e4071f
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/yap/files/yap-6.0.1-bootfile.patch b/dev-lang/yap/files/yap-6.0.1-bootfile.patch
new file mode 100644
index 000000000000..72ffcdadf5a8
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-bootfile.patch
@@ -0,0 +1,57 @@
+--- yap-6.0.1.orig/C/c_interface.c	2010-03-01 21:59:16.000000000 +1300
++++ yap-6.0.1/C/c_interface.c	2010-03-03 21:10:11.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.1-dynamic-lib.patch b/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch
new file mode 100644
index 000000000000..853a77a0a0e4
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch
@@ -0,0 +1,11 @@
+--- yap-6.0.1.orig/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/Makefile.in	2010-03-03 20:04:45.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.1-mpi-include.patch b/dev-lang/yap/files/yap-6.0.1-mpi-include.patch
new file mode 100644
index 000000000000..1cdd06a8c68c
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-mpi-include.patch
@@ -0,0 +1,12 @@
+--- yap-6.0.1.orig/library/mpi/mpi.c	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/mpi/mpi.c	2010-03-02 20:57:43.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.1-multilib.patch b/dev-lang/yap/files/yap-6.0.1-multilib.patch
new file mode 100644
index 000000000000..9c6282ac0adf
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-multilib.patch
@@ -0,0 +1,375 @@
+diff -ur yap-6.0.1.orig/CLPQR/Makefile.in yap-6.0.1/CLPQR/Makefile.in
+--- yap-6.0.1.orig/CLPQR/Makefile.in	2010-03-01 21:59:16.000000000 +1300
++++ yap-6.0.1/CLPQR/Makefile.in	2010-03-03 19:58:06.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.1.orig/GPL/Makefile.in yap-6.0.1/GPL/Makefile.in
+--- yap-6.0.1.orig/GPL/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/GPL/Makefile.in	2010-03-03 19:58:06.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.1.orig/LGPL/Makefile.in yap-6.0.1/LGPL/Makefile.in
+--- yap-6.0.1.orig/LGPL/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/LGPL/Makefile.in	2010-03-03 19:58:06.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.1.orig/LGPL/clp/Makefile.in yap-6.0.1/LGPL/clp/Makefile.in
+--- yap-6.0.1.orig/LGPL/clp/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/LGPL/clp/Makefile.in	2010-03-03 19:58:06.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.1.orig/LGPL/swi_console/Makefile.in yap-6.0.1/LGPL/swi_console/Makefile.in
+--- yap-6.0.1.orig/LGPL/swi_console/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/LGPL/swi_console/Makefile.in	2010-03-03 19:58:06.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.1.orig/Makefile.in yap-6.0.1/Makefile.in
+--- yap-6.0.1.orig/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/Makefile.in yap-6.0.1/library/Makefile.in
+--- yap-6.0.1.orig/library/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/lammpi/Makefile.in yap-6.0.1/library/lammpi/Makefile.in
+--- yap-6.0.1.orig/library/lammpi/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/lammpi/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/matlab/Makefile.in yap-6.0.1/library/matlab/Makefile.in
+--- yap-6.0.1.orig/library/matlab/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/matlab/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/matrices/Makefile.in yap-6.0.1/library/matrices/Makefile.in
+--- yap-6.0.1.orig/library/matrices/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/matrices/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/matrix/Makefile.in yap-6.0.1/library/matrix/Makefile.in
+--- yap-6.0.1.orig/library/matrix/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/matrix/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/mpi/Makefile.in yap-6.0.1/library/mpi/Makefile.in
+--- yap-6.0.1.orig/library/mpi/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/mpi/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/random/Makefile.in yap-6.0.1/library/random/Makefile.in
+--- yap-6.0.1.orig/library/random/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/random/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/regex/Makefile.in yap-6.0.1/library/regex/Makefile.in
+--- yap-6.0.1.orig/library/regex/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/regex/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/rltree/Makefile.in yap-6.0.1/library/rltree/Makefile.in
+--- yap-6.0.1.orig/library/rltree/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/rltree/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/system/Makefile.in yap-6.0.1/library/system/Makefile.in
+--- yap-6.0.1.orig/library/system/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/system/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/tries/Makefile.in yap-6.0.1/library/tries/Makefile.in
+--- yap-6.0.1.orig/library/tries/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/tries/Makefile.in	2010-03-03 19:58:06.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.1.orig/library/yap2swi/Makefile.in yap-6.0.1/library/yap2swi/Makefile.in
+--- yap-6.0.1.orig/library/yap2swi/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/library/yap2swi/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/CLPBN/Makefile.in yap-6.0.1/packages/CLPBN/Makefile.in
+--- yap-6.0.1.orig/packages/CLPBN/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/CLPBN/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/PLStream/Makefile.in yap-6.0.1/packages/PLStream/Makefile.in
+--- yap-6.0.1.orig/packages/PLStream/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/PLStream/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/ProbLog/Makefile.in yap-6.0.1/packages/ProbLog/Makefile.in
+--- yap-6.0.1.orig/packages/ProbLog/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/ProbLog/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/ProbLog/simplecudd/Makefile.in yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in
+--- yap-6.0.1.orig/packages/ProbLog/simplecudd/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/ProbLog/simplecudd/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/chr/Makefile.in yap-6.0.1/packages/chr/Makefile.in
+--- yap-6.0.1.orig/packages/chr/Makefile.in	2010-03-01 21:59:37.000000000 +1300
++++ yap-6.0.1/packages/chr/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/clpqr/Makefile.in yap-6.0.1/packages/clpqr/Makefile.in
+--- yap-6.0.1.orig/packages/clpqr/Makefile.in	2010-03-01 21:59:38.000000000 +1300
++++ yap-6.0.1/packages/clpqr/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/cplint/Makefile.in yap-6.0.1/packages/cplint/Makefile.in
+--- yap-6.0.1.orig/packages/cplint/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/cplint/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/jpl/Makefile.in yap-6.0.1/packages/jpl/Makefile.in
+--- yap-6.0.1.orig/packages/jpl/Makefile.in	2010-03-01 21:59:39.000000000 +1300
++++ yap-6.0.1/packages/jpl/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/plunit/Makefile.in yap-6.0.1/packages/plunit/Makefile.in
+--- yap-6.0.1.orig/packages/plunit/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/plunit/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/sgml/Makefile.in yap-6.0.1/packages/sgml/Makefile.in
+--- yap-6.0.1.orig/packages/sgml/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/sgml/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/swi-minisat2/C/Makefile.in yap-6.0.1/packages/swi-minisat2/C/Makefile.in
+--- yap-6.0.1.orig/packages/swi-minisat2/C/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/swi-minisat2/C/Makefile.in	2010-03-03 19:58:06.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.1.orig/packages/swi-minisat2/Makefile.in yap-6.0.1/packages/swi-minisat2/Makefile.in
+--- yap-6.0.1.orig/packages/swi-minisat2/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/packages/swi-minisat2/Makefile.in	2010-03-03 19:58:06.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.1-myddas-include.patch b/dev-lang/yap/files/yap-6.0.1-myddas-include.patch
new file mode 100644
index 000000000000..b85447479d4a
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-myddas-include.patch
@@ -0,0 +1,11 @@
+--- yap-6.0.1.orig/Makefile.in	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/Makefile.in	2010-03-02 20:47:55.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.1-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch
new file mode 100644
index 000000000000..a3fe0362af76
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch
@@ -0,0 +1,17 @@
+--- yap-6.0.1.orig/pl/consult.yap	2010-03-01 21:59:17.000000000 +1300
++++ yap-6.0.1/pl/consult.yap	2010-03-03 19:13:57.000000000 +1300
+@@ -853,12 +853,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.1.ebuild b/dev-lang/yap/yap-6.0.1.ebuild
new file mode 100644
index 000000000000..2c3cb8ed4d72
--- /dev/null
+++ b/dev-lang/yap/yap-6.0.1.ebuild
@@ -0,0 +1,104 @@
+# 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.1.ebuild,v 1.1 2010/03/03 08:23:05 keri Exp $
+
+inherit eutils java-pkg-opt-2
+
+MY_P="Yap-${PV}"
+
+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.1.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
+}