Bundle patches into tarballs; Closes #344013

(Portage version: 2.1.8.3/cvs/Linux x86_64)

44 files changed, 96 insertions, 2583 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 34dcf9a0a139..df974200cc67 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,30 @@
 # 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.47 2010/10/30 08:34:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.48 2010/11/05 22:01:24 keri Exp $
+
+  05 Nov 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,
+  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, yap-6.0.3.ebuild,
+  -files/yap-6.0.3-install-clause.patch, -files/yap-6.0.3-yapsharedir.patch,
+  yap-6.0.4.ebuild, -files/yap-6.0.4-JAVALIBPATH.patch,
+  -files/yap-6.0.4-chr-sublist.patch, -files/yap-6.0.4-yapsharedir.patch,
+  yap-6.0.5.ebuild, yap-6.0.5-r1.ebuild, -files/yap-6.0.5-JAVALIBPATH.patch,
+  -files/yap-6.0.5-chr-sublist.patch, -files/yap-6.0.5-ldflags.patch,
+  -files/yap-6.0.5-yapsharedir.patch, yap-6.0.6.ebuild,
+  -files/yap-6.0.6-DESTDIR.patch, -files/yap-6.0.6-chr-sublist.patch,
+  -files/yap-6.0.6-itries.patch, -files/yap-6.0.6-ldflags.patch,
+  -files/yap-6.0.6-runpath.patch, -files/yap-6.0.6-yapsharedir.patch,
+  yap-6.2.0.ebuild, yap-6.2.0-r1.ebuild, -files/yap-6.2.0-chr-sublist.patch,
+  -files/yap-6.2.0-have-config.patch,
+  -files/yap-6.2.0-ld-library-path.patch, -files/yap-6.2.0-ldflags.patch,
+  -files/yap-6.2.0-lib-soname.patch, -files/yap-6.2.0-parallel-make.patch,
+  -files/yap-6.2.0-yapsharedir.patch:
+  Bundle patches into tarballs; Closes #344013
 
   30 Oct 2010; <keri@gentoo.org> yap-6.2.0-r1.ebuild,
   +files/yap-6.2.0-lib-soname.patch:
diff --git a/dev-lang/yap/files/yap-6.0.1-bootfile.patch b/dev-lang/yap/files/yap-6.0.1-bootfile.patch
deleted file mode 100644
index 72ffcdadf5a8..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-bootfile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
deleted file mode 100644
index 853a77a0a0e4..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-dynamic-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 1cdd06a8c68c..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-mpi-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 9c6282ac0adf..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-multilib.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-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
deleted file mode 100644
index b85447479d4a..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-myddas-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a3fe0362af76..000000000000
--- a/dev-lang/yap/files/yap-6.0.1-yapsharedir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/yap-6.0.2-bootfile.patch b/dev-lang/yap/files/yap-6.0.2-bootfile.patch
deleted file mode 100644
index 84a041358d9f..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-bootfile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
deleted file mode 100644
index 7efa74b3077a..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-dynamic-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 60bcab738a0c..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-mpi-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index b6cd8aceb004..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-multilib.patch
+++ /dev/null
@@ -1,375 +0,0 @@
-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
deleted file mode 100644
index 4da9df0042bb..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-myddas-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e900bd3d497e..000000000000
--- a/dev-lang/yap/files/yap-6.0.2-yapsharedir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/yap-6.0.3-install-clause.patch b/dev-lang/yap/files/yap-6.0.3-install-clause.patch
deleted file mode 100644
index 2e2c9e8ce5e0..000000000000
--- a/dev-lang/yap/files/yap-6.0.3-install-clause.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- yap-6.0.3.orig/C/index.c	2010-03-16 03:45:20.000000000 +1300
-+++ yap-6.0.3/C/index.c	2010-04-10 12:02:06.000000000 +1200
-@@ -3475,10 +3475,6 @@
-       } else if (sp->pos) {
- 	UInt argno = -sp->pos;
- 	skip_to_arg(cls, ap, argno, FALSE);
--	if (ArityOfFunctor((Functor)RepAppl(sp[-1].val))
--	    != argno+1) {
--	  last_arg = FALSE;
--	}
-       }
-     }
-     sp++;
diff --git a/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch
deleted file mode 100644
index d4fec59472d7..000000000000
--- a/dev-lang/yap/files/yap-6.0.3-yapsharedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- yap-6.0.3.orig/pl/consult.yap	2010-03-16 03:45:21.000000000 +1300
-+++ yap-6.0.3/pl/consult.yap	2010-03-21 10:26:22.000000000 +1300
-@@ -877,9 +877,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/files/yap-6.0.4-JAVALIBPATH.patch b/dev-lang/yap/files/yap-6.0.4-JAVALIBPATH.patch
deleted file mode 100644
index 25c9da06720f..000000000000
--- a/dev-lang/yap/files/yap-6.0.4-JAVALIBPATH.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- yap-6.0.4.orig/configure	2010-05-01 04:53:07.000000000 +1200
-+++ yap-6.0.4/configure	2010-05-16 08:58:27.000000000 +1200
-@@ -6504,7 +6504,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
-@@ -6512,7 +6512,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.4-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.4-chr-sublist.patch
deleted file mode 100644
index 84795b4d18ba..000000000000
--- a/dev-lang/yap/files/yap-6.0.4-chr-sublist.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- yap-6.0.4.orig/library/dialect/hprolog.yap	2010-05-01 04:53:07.000000000 +1200
-+++ yap-6.0.4/library/dialect/hprolog.yap	2010-05-16 09:10:46.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)).
- 
- /** <module> 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.4-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.4-yapsharedir.patch
deleted file mode 100644
index b600ff4b7b79..000000000000
--- a/dev-lang/yap/files/yap-6.0.4-yapsharedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- yap-6.0.4.orig/pl/consult.yap	2010-05-01 04:53:07.000000000 +1200
-+++ yap-6.0.4/pl/consult.yap	2010-05-16 07:27:41.000000000 +1200
-@@ -875,9 +875,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/files/yap-6.0.5-JAVALIBPATH.patch b/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch
deleted file mode 100644
index acf5e0ae1945..000000000000
--- a/dev-lang/yap/files/yap-6.0.5-JAVALIBPATH.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 5ff93ccdd3c6..000000000000
--- a/dev-lang/yap/files/yap-6.0.5-chr-sublist.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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)).
- 
- /** <module> 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-ldflags.patch b/dev-lang/yap/files/yap-6.0.5-ldflags.patch
deleted file mode 100644
index d2142e6c75b5..000000000000
--- a/dev-lang/yap/files/yap-6.0.5-ldflags.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
---- yap-6.orig/library/matrix/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/matrix/Makefile.in	2010-09-12 12:24:04.000000000 +1200
-@@ -19,6 +19,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/matrix.c -o matrix.o
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@matrix@SHLIB_SUFFIX@: matrix.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o matrix@SHLIB_SUFFIX@ matrix.o $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
---- yap-6.orig/library/random/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/random/Makefile.in	2010-09-12 12:22:00.000000000 +1200
-@@ -19,6 +19,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/random.c -o random.o
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@random@SHLIB_SUFFIX@: random.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o random@SHLIB_SUFFIX@ random.o $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
---- yap-6.orig/library/regex/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/regex/Makefile.in	2010-09-12 12:29:26.000000000 +1200
-@@ -19,6 +19,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -59,22 +60,22 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/regexec.c -o regexec.o
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@regexp@SHLIB_SUFFIX@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexp@SHLIB_SUFFIX@ regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
- 
- @DO_SECOND_LD@regcomp@SHLIB_SUFFIX@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regcomp@SHLIB_SUFFIX@ regcomp.o @MERGE_DLL_OBJS@ regfree.o
- 
- @DO_SECOND_LD@regerror@SHLIB_SUFFIX@: regerror.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o regerror@SHLIB_SUFFIX@ regerror.o $(LDFLAGS)
- 
- @DO_SECOND_LD@regfree@SHLIB_SUFFIX@: regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o regfree@SHLIB_SUFFIX@ regfree.o $(LDFLAGS)
- 
- @DO_SECOND_LD@regexec@SHLIB_SUFFIX@: regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o regexec@SHLIB_SUFFIX@ regexec.o $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
---- yap-6.orig/library/rltree/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/rltree/Makefile.in	2010-09-12 12:26:05.000000000 +1200
-@@ -24,6 +24,7 @@
- CC=@CC@
- MPI_CC=mpicc
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -52,10 +53,10 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@yap_rl@SHLIB_SUFFIX@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@  -o yap_rl@SHLIB_SUFFIX@ $(OBJS)
-+@DO_SECOND_LD@	@SHLIB_LD@  -o yap_rl@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS)
- 
- install: all
- 	@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR); fi
-diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
---- yap-6.orig/library/system/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/system/Makefile.in	2010-09-12 12:23:01.000000000 +1200
-@@ -19,6 +19,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/sys.c -o sys.o
- 
- @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@sys@SHLIB_SUFFIX@: sys.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o sys@SHLIB_SUFFIX@ sys.o $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
---- yap-6.orig/library/tries/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/tries/Makefile.in	2010-09-12 12:23:36.000000000 +1200
-@@ -19,6 +19,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -59,13 +60,13 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@tries@SHLIB_SUFFIX@: core_tries.o base_tries.o tries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o tries@SHLIB_SUFFIX@ core_tries.o base_tries.o tries.o $(LDFLAGS)
- 
- @DO_SECOND_LD@itries@SHLIB_SUFFIX@: core_tries.o base_itries.o itries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o
-+@DO_SECOND_LD@	@SHLIB_LD@ -o itries@SHLIB_SUFFIX@ core_tries.o base_itries.o itries.o $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/library/yap2swi/Makefile.in yap-6/library/yap2swi/Makefile.in
---- yap-6.orig/library/yap2swi/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/library/yap2swi/Makefile.in	2010-09-12 12:22:37.000000000 +1200
-@@ -18,6 +18,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -48,10 +49,10 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/yap2swi.c -o yap2swi.o
- 
- @DO_SECOND_LD@@DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@yap2swi@SHLIB_SUFFIX@: yap2swi.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @
-+@DO_SECOND_LD@	@SHLIB_LD@ -o yap2swi@SHLIB_SUFFIX@ yap2swi.o @ $(LDFLAGS)
- 
- install: 
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
---- yap-6.orig/packages/PLStream/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/packages/PLStream/Makefile.in	2010-09-12 12:25:31.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -77,10 +78,10 @@
- 	$(CC) -c $(CFLAGS)  $(SHLIB_CFLAGS) $< -o $@
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<
-+@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< $(LDFLAGS)
- 
- @DO_SECOND_LD@plstream@SHLIB_SUFFIX@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ -o plstream@SHLIB_SUFFIX@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@ $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
-diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
---- yap-6.orig/packages/jpl/Makefile.in	2010-05-12 01:53:40.000000000 +1200
-+++ yap-6/packages/jpl/Makefile.in	2010-09-12 12:44:26.000000000 +1200
-@@ -35,6 +35,7 @@
- #
- CC=@CC@
- CFLAGS= @CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @JAVAINCPATH@
-+LDFLAGS=@LDFLAGS@
- MKINDEX=true
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
-@@ -97,7 +98,7 @@
- 
- 
- @DO_SECOND_LD@%@SHLIB_SUFFIX@: %.o
--		@DO_SECOND_LD@	@SHLIB_LD@ @JAVALIBPATH@ -o $@ $< @JAVALIBS@
-+		@DO_SECOND_LD@	@SHLIB_LD@ @JAVALIBPATH@ $(LDFLAGS) -o $@ $< @JAVALIBS@
- 		if [ -r libjpl.dylib ]; then \
- 		  rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
- 		fi
-diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
---- yap-6.orig/packages/sgml/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/packages/sgml/Makefile.in	2010-09-12 12:10:18.000000000 +1200
-@@ -72,7 +72,7 @@
- CMFLAGS=@CMFLAGS@
- CIFLAGS=-I. -I@PLINCL@
- CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
--LDFLAGS=$(COFLAGS)
-+LDFLAGS=@LDFLAGS@
- 
- LDSOFLAGS=@LDSOFLAGS@
- 
-@@ -114,7 +114,7 @@
- 	$(CC) $(CFLAGS) $(SHLIB_CFLAGS)  -o $@ -c $<
- 
- @DO_SECOND_LD@sgml2pl@SHLIB_SUFFIX@: $(PLOBJ)
--@DO_SECOND_LD@	@SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ)
-+@DO_SECOND_LD@	@SHLIB_SWI_LD@ -o sgml2pl@SHLIB_SUFFIX@ $(PLOBJ) $(LDFLAGS)
- 
- all:		$(TARGETS) $(PROGRAMS)
- 
-diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
---- yap-6.orig/packages/swi-minisat2/C/Makefile.in	2010-05-12 01:53:25.000000000 +1200
-+++ yap-6/packages/swi-minisat2/C/Makefile.in	2010-09-12 12:24:57.000000000 +1200
-@@ -21,6 +21,7 @@
- CC=@CC@
- CXX=@CXX@
- CXXFLAGS= @CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -69,7 +70,7 @@
- 	$(CXX) -c $(CXXFLAGS)  $(SHLIB_CFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
- 
- @DO_SECOND_LD@pl-minisat@SHLIB_SUFFIX@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS)
-+@DO_SECOND_LD@	@SHLIB_LOWER_CXX_LD@ -o pl-minisat@SHLIB_SUFFIX@ $(OBJS) $(LDFLAGS)
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(LIBDIR)
diff --git a/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch
deleted file mode 100644
index 487a939962e6..000000000000
--- a/dev-lang/yap/files/yap-6.0.5-yapsharedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/yap-6.0.6-DESTDIR.patch b/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch
deleted file mode 100644
index 5460c7727a30..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- yap-6.orig/packages/http/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/http/Makefile.in	2010-08-08 10:00:13.000000000 +1200
-@@ -110,7 +110,7 @@
- 		$(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
- 		mkdir -p $(PLTARGET)
- 		mkdir -p $(PLTARGET)/web/icons
--		mkdir -p $(LIBDIR)/web/css
-+		mkdir -p $(DESTDIR)$(LIBDIR)/web/css
- 		$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
- 		$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
- 		$(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons
---- yap-6.orig/packages/zlib/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/zlib/Makefile.in	2010-08-08 10:06:17.000000000 +1200
-@@ -107,7 +107,7 @@
- 		$(LD) $(LDFLAGS) -o $@ $(ZOBJ) $(LIBS)
- 
- install:	$(TARGETS) $(LIBPL)
--		mkdir -p $(DESTDIR)$(BINTARGET)
-+		mkdir -p $(BINTARGET)
- 		for f in $(TARGETS); do \
- 		  $(INSTALL_PROGRAM) $$f $(BINTARGET); \
- 		done
diff --git a/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch b/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch
deleted file mode 100644
index 5ff93ccdd3c6..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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)).
- 
- /** <module> 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.6-itries.patch b/dev-lang/yap/files/yap-6.0.6-itries.patch
deleted file mode 100644
index 023e11209250..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-itries.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- yap-6.orig/library/tries/itries.c	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/tries/itries.c	2010-09-12 17:20:09.000000000 +1200
-@@ -620,7 +620,7 @@
-   /* check args */
-   if (!YAP_IsVarTerm(arg_itrie)) 
-     return FALSE;
--  if (!(file = (FILE*) Yap_FileDescriptorFromStream(arg_stream)))
-+  if (!(file = (FILE*) YAP_FileDescriptorFromStream(arg_stream)))
-     return FALSE;
- 
-   /* load itrie */
diff --git a/dev-lang/yap/files/yap-6.0.6-ldflags.patch b/dev-lang/yap/files/yap-6.0.6-ldflags.patch
deleted file mode 100644
index 4e70af50a3e7..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-ldflags.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
---- yap-6.orig/library/matrix/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/matrix/Makefile.in	2010-09-12 17:50:42.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@matrix.@SO@: matrix.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
---- yap-6.orig/library/random/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/random/Makefile.in	2010-09-12 18:02:50.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@yap_random.@SO@: yap_random.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
---- yap-6.orig/library/regex/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/regex/Makefile.in	2010-09-12 18:02:16.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -59,22 +60,22 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
- 
- @DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regerror.@SO@: regerror.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regfree.@SO@: regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regexec.@SO@: regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
---- yap-6.orig/library/rltree/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/rltree/Makefile.in	2010-09-12 18:01:14.000000000 +1200
-@@ -25,6 +25,7 @@
- CC=@CC@
- MPI_CC=mpicc
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -52,10 +53,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@  -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
-diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
---- yap-6.orig/library/system/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/system/Makefile.in	2010-09-12 17:51:44.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o
- 
- @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@sys.@SO@: sys.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
---- yap-6.orig/library/tries/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/library/tries/Makefile.in	2010-09-12 17:50:07.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -60,13 +61,13 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
---- yap-6.orig/packages/PLStream/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/PLStream/Makefile.in	2010-09-12 18:07:41.000000000 +1200
-@@ -21,6 +21,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -77,10 +78,10 @@
- 	$(CC) -c $(CFLAGS) $< -o $@
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@libplstream.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in
---- yap-6.orig/packages/clib/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/clib/Makefile.in	2010-09-12 17:57:39.000000000 +1200
-@@ -37,7 +37,7 @@
- CRYPTLIBS=@CLIB_CRYPTLIBS@
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
-diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in
---- yap-6.orig/packages/http/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/http/Makefile.in	2010-09-12 18:04:08.000000000 +1200
-@@ -38,7 +38,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)/http
-diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
---- yap-6.orig/packages/jpl/Makefile.in	2010-08-05 05:36:46.000000000 +1200
-+++ yap-6/packages/jpl/Makefile.in	2010-09-12 17:54:10.000000000 +1200
-@@ -34,6 +34,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@  @JAVAINCPATH@
-+LDFLAGS=@LDFLAGS@
- MKINDEX=true
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
-@@ -96,7 +97,7 @@
- 
- 
- @DO_SECOND_LD@%.@SO@: %.o
--		@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
-+		@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
- 		if [ -r libjpl.dylib ]; then \
- 		  rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
- 		fi
-diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
---- yap-6.orig/packages/semweb/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/semweb/Makefile.in	2010-09-12 18:07:04.000000000 +1200
-@@ -47,7 +47,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb
-diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
---- yap-6.orig/packages/sgml/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/sgml/Makefile.in	2010-09-12 17:53:23.000000000 +1200
-@@ -30,6 +30,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- MKINDEX=true
- 
- LD=$(CC)
-@@ -116,7 +117,7 @@
- 	$(CC) $(CFLAGS)  -o $@ -c $<
- 
- @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ)
--@DO_SECOND_LD@	@SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
- 
- all:		$(TARGETS) $(PROGRAMS)
- 
-diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
---- yap-6.orig/packages/swi-minisat2/C/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/swi-minisat2/C/Makefile.in	2010-09-12 18:10:07.000000000 +1200
-@@ -22,6 +22,7 @@
- CC=@CC@
- CXX=@CXX@
- CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -69,7 +70,7 @@
- 	$(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
- 
- @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in
---- yap-6.orig/packages/tai/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/tai/Makefile.in	2010-09-12 17:52:34.000000000 +1200
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -48,7 +49,7 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
- 
- @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in
---- yap-6.orig/packages/zlib/Makefile.in	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/packages/zlib/Makefile.in	2010-09-12 18:06:07.000000000 +1200
-@@ -45,7 +45,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
diff --git a/dev-lang/yap/files/yap-6.0.6-runpath.patch b/dev-lang/yap/files/yap-6.0.6-runpath.patch
deleted file mode 100644
index 6201dc01cd94..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-runpath.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- yap-6.orig/configure	2010-08-05 05:36:28.000000000 +1200
-+++ yap-6/configure	2010-09-12 18:26:08.000000000 +1200
-@@ -6820,17 +6820,17 @@
- 	 then
- 	 LIBS="$LIBS -lnsl"
-         fi
--	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
-+	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
-         DYNYAPLIB=libYap."$SO"
-         if test "$dynamic_loading" = "yes"
-         then
-            YAPLIB_LD="\$(CC) -shared"
--           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
-+           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-            INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-            PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
-         else
-            YAPLIB_LD="\$(CC)"
--           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
-+           EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
-            INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
-            PRE_INSTALL_ENV=""
-         fi
diff --git a/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch b/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch
deleted file mode 100644
index 487a939962e6..000000000000
--- a/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/yap-6.2.0-chr-sublist.patch b/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch
deleted file mode 100644
index 06582131ad28..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-chr-sublist.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- yap-6.orig/library/dialect/hprolog.yap	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/dialect/hprolog.yap	2010-10-19 19:38:17.000000000 +1300
-@@ -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)).
- 
- /** <module> 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.2.0-have-config.patch b/dev-lang/yap/files/yap-6.2.0-have-config.patch
deleted file mode 100644
index 56433d6bf551..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-have-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
---- yap-6.orig/packages/PLStream/Makefile.in	2010-10-19 20:40:59.000000000 +1300
-+++ yap-6/packages/PLStream/Makefile.in	2010-10-19 20:40:04.000000000 +1300
-@@ -20,7 +20,7 @@
- #
- #
- CC=@CC@
--CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
-+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
- LDFLAGS=@LDFLAGS@
- #
- #
-diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
---- yap-6.orig/packages/semweb/Makefile.in	2010-10-19 20:40:59.000000000 +1300
-+++ yap-6/packages/semweb/Makefile.in	2010-10-19 20:40:24.000000000 +1300
-@@ -37,7 +37,7 @@
- #
- #
- CC=@CC@
--CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
-+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
- MKINDEX=true
- 
- 
-diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
---- yap-6.orig/packages/sgml/Makefile.in	2010-10-19 20:40:59.000000000 +1300
-+++ yap-6/packages/sgml/Makefile.in	2010-10-19 20:40:45.000000000 +1300
-@@ -29,7 +29,7 @@
- #
- #
- CC=@CC@
--CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
-+CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
- LDFLAGS=@LDFLAGS@
- MKINDEX=true
- 
diff --git a/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch b/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch
deleted file mode 100644
index be934296655a..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-ld-library-path.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- yap-6.orig/configure.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/configure.in	2010-10-30 10:02:49.000000000 +1300
-@@ -924,7 +924,7 @@
-         then 

-            YAPLIB_LD="\$(CC) -shared"

-            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

--           INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+           INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-            PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         else

-            YAPLIB_LD="\$(CC)"

-@@ -946,7 +946,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *hpux*)

- 	#do not use the first memory quadrant

-@@ -985,7 +985,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *aix*)

- 	# To actually use dlls in AIX I'd need to build YAP as a DLL first.

-@@ -998,7 +998,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *osf*)

-         if ${use_condor} = no

-@@ -1016,7 +1016,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *irix6*)

- 	SHLIB_CFLAGS="$CFLAGS"

-@@ -1030,7 +1030,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *darwin*)

- 	if test ${use_dlcompat} = yes

-@@ -1051,7 +1051,7 @@
- 	   SHLIB_LD="$CC  -dynamiclib"

-            SHLIB_CXX_LD="$CXX  -dynamiclib"

-            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap   -Wl,-install_name,\$(YAPLIBDIR)/\$@"

--           INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+           INSTALL_ENV="DYLD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-         else

- 	   SHLIB_LD="$CC  -dynamiclib -Wl,-undefined,dynamic_lookup"

-            SHLIB_CXX_LD="$CXX  -dynamiclib -Wl,-undefined,dynamic_lookup"

-@@ -1091,7 +1091,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

-       *solaris*)

-        #an elf system

-@@ -1110,7 +1110,7 @@
-            YAPLIB_LD="\$(CC)"

-            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-            PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--           INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+           INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-         else

-            EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-            PRE_INSTALL_ENV=""

-@@ -1165,7 +1165,7 @@
-         DYNYAPLIB=libYap."$SO"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

--        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-+        INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

- 	;;

- esac

- 

diff --git a/dev-lang/yap/files/yap-6.2.0-ldflags.patch b/dev-lang/yap/files/yap-6.2.0-ldflags.patch
deleted file mode 100644
index 942e174d2d7b..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-ldflags.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
---- yap-6.orig/library/matrix/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/matrix/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@matrix.@SO@: matrix.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o  @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
---- yap-6.orig/library/random/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/random/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@yap_random.@SO@: yap_random.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
---- yap-6.orig/library/regex/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/regex/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -59,22 +60,22 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o  @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o 
- 
- @DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regerror.@SO@: regerror.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regfree.@SO@: regfree.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@regexec.@SO@: regexec.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
---- yap-6.orig/library/rltree/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/rltree/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -25,6 +25,7 @@
- CC=@CC@
- MPI_CC=mpicc
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -52,10 +53,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@  -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
-diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
---- yap-6.orig/library/system/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/system/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -47,10 +48,10 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o
- 
- @DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@sys.@SO@: sys.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
---- yap-6.orig/library/tries/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/library/tries/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -60,13 +61,13 @@
- 	$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
---- yap-6.orig/packages/PLStream/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/packages/PLStream/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -21,6 +21,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include  @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -77,10 +78,10 @@
- 	$(CC) -c $(CFLAGS) $< -o $@
- 
- @DO_SECOND_LD@%.@SO@: %.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $<  @EXTRA_LIBS_FOR_DLLS@
- 
- @DO_SECOND_LD@libplstream.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in
---- yap-6.orig/packages/clib/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/packages/clib/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -37,7 +37,7 @@
- CRYPTLIBS=@CLIB_CRYPTLIBS@
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
-diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in
---- yap-6.orig/packages/http/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/http/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -38,7 +38,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)/http
-diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
---- yap-6.orig/packages/jpl/Makefile.in	2010-10-18 21:48:36.000000000 +1300
-+++ yap-6/packages/jpl/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -34,6 +34,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@  @JAVAINCPATH@
-+LDFLAGS=@LDFLAGS@
- MKINDEX=true
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
-@@ -96,7 +97,7 @@
- 
- 
- @DO_SECOND_LD@%.@SO@: %.o
--		@DO_SECOND_LD@	@SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
-+		@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
- 		if [ -r libjpl.dylib ]; then \
- 		  rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
- 		fi
-diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
---- yap-6.orig/packages/semweb/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/semweb/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -47,7 +47,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb
-diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
---- yap-6.orig/packages/sgml/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/sgml/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -30,6 +30,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- MKINDEX=true
- 
- LD=$(CC)
-@@ -116,7 +117,7 @@
- 	$(CC) $(CFLAGS)  -o $@ -c $<
- 
- @DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ)
--@DO_SECOND_LD@	@SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
- 
- all:		$(TARGETS) $(PROGRAMS)
- 
-diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
---- yap-6.orig/packages/swi-minisat2/C/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/swi-minisat2/C/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -22,6 +22,7 @@
- CC=@CC@
- CXX=@CXX@
- CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS)  -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include  @CPPFLAGS@
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -69,7 +70,7 @@
- 	$(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
- 
- @DO_SECOND_LD@pl-minisat.@SO@: $(OBJS)
--@DO_SECOND_LD@	@SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in
---- yap-6.orig/packages/tai/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/tai/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -20,6 +20,7 @@
- #
- CC=@CC@
- CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
-+LDFLAGS=@LDFLAGS@
- #
- #
- # You shouldn't need to change what follows.
-@@ -48,7 +49,7 @@
- 	$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
- 
- @DO_SECOND_LD@pl-tai.@SO@: pl-tai.o
--@DO_SECOND_LD@	@SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
-+@DO_SECOND_LD@	@SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
- 
- install: all
- 	$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
-diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in
---- yap-6.orig/packages/zlib/Makefile.in	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/packages/zlib/Makefile.in	2010-10-19 19:44:05.000000000 +1300
-@@ -45,7 +45,7 @@
- #
- 
- LD=@DO_SECOND_LD@	@SHLIB_LD@
--LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
-+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
- 
- BINTARGET=$(DESTDIR)$(YAPLIBDIR)
- PLTARGET=$(DESTDIR)$(SHAREDIR)
diff --git a/dev-lang/yap/files/yap-6.2.0-lib-soname.patch b/dev-lang/yap/files/yap-6.2.0-lib-soname.patch
deleted file mode 100644
index c8d42198b976..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-lib-soname.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -ur yap-6.orig/Makefile.in yap-6/Makefile.in
---- yap-6.orig/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/Makefile.in	2010-10-30 21:27:55.000000000 +1300
-@@ -96,6 +96,7 @@
- TEXI2HTML=texi2html
- TEXI2PDF=texi2pdf
- YAPLIB=@YAPLIB@
-+SONAMEFLAG=@SONAMEFLAG@
- 
- #4.1VPATH=@srcdir@:@srcdir@/OPTYap
- CWD=$(PWD)
-@@ -531,7 +532,7 @@
- 	$(RANLIB) libYap.a
- 
- @DYNYAPLIB@: $(LIB_OBJECTS)
--	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS)
-+	@YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG)
- 
- install: install_bin install_data
- 
-diff -ur yap-6.orig/configure.in yap-6/configure.in
---- yap-6.orig/configure.in	2010-10-30 21:28:41.000000000 +1300
-+++ yap-6/configure.in	2010-10-30 21:27:06.000000000 +1300
-@@ -915,6 +915,7 @@
-           fi

- 	  LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-           DYNYAPLIB=libYap."$SO"

-+	  SONAMEFLAG="-Wl,-soname=$DYNYAPLIB"

-         fi

-         if test "$have_nsl" = yes

- 	 then

-@@ -944,6 +945,7 @@
- 	INSTALL_DLLS=""

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -983,6 +985,7 @@
- 	fi

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -996,6 +999,7 @@
- 	#INSTALL_DLLS=""

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -1014,6 +1018,7 @@
-         fi

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -1028,6 +1033,7 @@
- 	INSTALL_DLLS=""

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -1066,6 +1072,7 @@
-         fi

-         CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib"

-         PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)"

- 	;;

-@@ -1089,6 +1096,7 @@
-         fi

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -1105,6 +1113,7 @@
- 	INSTALL_DLLS=""

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG="-Wl,--soname=$DYNYAPLIB"

-         if test "$dynamic_loading" = "yes"

-         then 

-            YAPLIB_LD="\$(CC)"

-@@ -1123,6 +1132,7 @@
-         # and -fomit-frame-point -DBP_FREE

- 	YAPLIB="yap.dll"

- 	DYNYAPLIB="yap.dll"

-+	SONAMEFLAG=""

- 	SHLIB_CFLAGS="$CFLAGS"

- 	SHLIB_CXXFLAGS="$CXXFLAGS"

-         if test "$target_win64" = no

-@@ -1163,6 +1173,7 @@
-         fi

- 	LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"

-         DYNYAPLIB=libYap."$SO"

-+	SONAMEFLAG=""

-         EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"

-         PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"

-         INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"

-@@ -1469,6 +1480,7 @@
- AC_SUBST(YAPLIB)

- AC_SUBST(DYNYAPLIB)

- AC_SUBST(LDFLAGS)

-+AC_SUBST(SONAMEFLAG)

- dnl install_info

- AC_SUBST(INSTALL_INFO)

- dnl let YAP_EXTRAS fall through configure, from the env into Makefile

diff --git a/dev-lang/yap/files/yap-6.2.0-parallel-make.patch b/dev-lang/yap/files/yap-6.2.0-parallel-make.patch
deleted file mode 100644
index d7e09fb66738..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-parallel-make.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- yap-6.orig/Makefile.in	2010-10-18 21:48:20.000000000 +1300
-+++ yap-6/Makefile.in	2010-10-24 17:51:34.000000000 +1300
-@@ -517,6 +517,7 @@ all: startup.yss
- 	@ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE))
- 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE))
- 	@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE))
-+	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
- 
- startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES)
- 	-rm -f startup.yss
-@@ -568,7 +569,6 @@ install_unix: startup.yss libYap.a
- 	@INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
- 	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
- 	@INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install)
--	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE))
- 	@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install)
- 	#@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install)
- 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
-@@ -619,6 +619,7 @@ install_win32: startup.yss
- 	(cd packages/sgml; $(MAKE) install)
- 	(cd packages/semweb; $(MAKE) install)
- 	(cd packages/zlib; $(MAKE) @ZLIB_INSTALL@)
-+	@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
- 	@USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install)
- 	@ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install)
- 	@USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install)
-@@ -632,7 +633,6 @@ install_data:
- 	(cd packages/swi-minisat2; $(MAKE) install)
- 	(cd LGPL ; $(MAKE) install)
- 	(cd GPL ; $(MAKE) install)
--	@ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install)
- 	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/
- 	$(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/
- 	@INSTALLCLP@(cd LGPL/clp ; $(MAKE) install)
diff --git a/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch b/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch
deleted file mode 100644
index 59f15c54d39f..000000000000
--- a/dev-lang/yap/files/yap-6.2.0-yapsharedir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- yap-6.orig/pl/consult.yap	2010-10-18 21:48:21.000000000 +1300
-+++ yap-6/pl/consult.yap	2010-10-19 19:40:31.000000000 +1300
-@@ -886,9 +886,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.1.ebuild b/dev-lang/yap/yap-6.0.1.ebuild
index 2c3cb8ed4d72..8b94f1825911 100644
--- a/dev-lang/yap/yap-6.0.1.ebuild
+++ b/dev-lang/yap/yap-6.0.1.ebuild
@@ -1,14 +1,16 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.1.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.1.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -30,12 +32,9 @@ 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
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.2.ebuild b/dev-lang/yap/yap-6.0.2.ebuild
index 1f9888a12188..7bd91417bee3 100644
--- a/dev-lang/yap/yap-6.0.2.ebuild
+++ b/dev-lang/yap/yap-6.0.2.ebuild
@@ -1,12 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.2.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.2.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -28,12 +31,9 @@ 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
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.3.ebuild b/dev-lang/yap/yap-6.0.3.ebuild
index b0d362302520..631486c82373 100644
--- a/dev-lang/yap/yap-6.0.3.ebuild
+++ b/dev-lang/yap/yap-6.0.3.ebuild
@@ -1,12 +1,15 @@
 # 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.3.ebuild,v 1.2 2010/04/10 00:10:30 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.3.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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.3.tar.gz"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.3.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -28,8 +31,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-install-clause.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.4.ebuild b/dev-lang/yap/yap-6.0.4.ebuild
index 73427bcb4e6c..741f5d6a99a0 100644
--- a/dev-lang/yap/yap-6.0.4.ebuild
+++ b/dev-lang/yap/yap-6.0.4.ebuild
@@ -1,12 +1,15 @@
 # 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.4.ebuild,v 1.1 2010/05/15 21:18:26 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.4.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/yap-6.0.4.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -28,9 +31,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.5-r1.ebuild b/dev-lang/yap/yap-6.0.5-r1.ebuild
index 3a19429fac84..fcb7b3eaadcf 100644
--- a/dev-lang/yap/yap-6.0.5-r1.ebuild
+++ b/dev-lang/yap/yap-6.0.5-r1.ebuild
@@ -1,12 +1,15 @@
 # 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-r1.ebuild,v 1.1 2010/09/12 02:31:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5-r1.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -30,10 +33,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.5.ebuild b/dev-lang/yap/yap-6.0.5.ebuild
index 9f354d382f64..b8f936a3aef9 100644
--- a/dev-lang/yap/yap-6.0.5.ebuild
+++ b/dev-lang/yap/yap-6.0.5.ebuild
@@ -1,12 +1,15 @@
 # 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.2 2010/08/07 22:30:23 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.5.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -30,9 +33,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-JAVALIBPATH.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.0.6.ebuild b/dev-lang/yap/yap-6.0.6.ebuild
index da113caacc5f..3a256a808ee7 100644
--- a/dev-lang/yap/yap-6.0.6.ebuild
+++ b/dev-lang/yap/yap-6.0.6.ebuild
@@ -1,12 +1,15 @@
 # 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.6.ebuild,v 1.1 2010/09/12 06:43:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.0.6.ebuild,v 1.2 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -31,12 +34,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-runpath.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
-	epatch "${FILESDIR}"/${P}-itries.patch
-	epatch "${FILESDIR}"/${P}-DESTDIR.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {
diff --git a/dev-lang/yap/yap-6.2.0-r1.ebuild b/dev-lang/yap/yap-6.2.0-r1.ebuild
index f6e492f497dc..57039b0e6976 100644
--- a/dev-lang/yap/yap-6.2.0-r1.ebuild
+++ b/dev-lang/yap/yap-6.2.0-r1.ebuild
@@ -1,12 +1,15 @@
 # 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.2.0-r1.ebuild,v 1.5 2010/10/30 08:34:24 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0-r1.ebuild,v 1.6 2010/11/05 22:01:24 keri Exp $
 
 inherit autotools eutils flag-o-matic java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -28,13 +31,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-ld-library-path.patch
-	epatch "${FILESDIR}"/${P}-lib-soname.patch
-	epatch "${FILESDIR}"/${P}-have-config.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 
 	eautoconf
 }
diff --git a/dev-lang/yap/yap-6.2.0.ebuild b/dev-lang/yap/yap-6.2.0.ebuild
index 95074786b5e9..a71d61b60b17 100644
--- a/dev-lang/yap/yap-6.2.0.ebuild
+++ b/dev-lang/yap/yap-6.2.0.ebuild
@@ -1,12 +1,15 @@
 # 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.2.0.ebuild,v 1.2 2010/10/23 20:55:08 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.3 2010/11/05 22:01:24 keri Exp $
 
 inherit eutils flag-o-matic java-pkg-opt-2
 
+PATCHSET_VER="0"
+
 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"
+SRC_URI="http://www.ncc.up.pt/~vsc/Yap/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="Artistic LGPL-2"
 SLOT="0"
@@ -31,10 +34,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-yapsharedir.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-have-config.patch
-	epatch "${FILESDIR}"/${P}-chr-sublist.patch
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
 }
 
 src_compile() {