Add multilib patch. Bug #147098.

(Portage version: 2.1.2_rc2-r3)

3 files changed, 167 insertions, 2 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 7d5b03b501b8..f98c05b56124 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.6 2006/11/23 16:35:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.7 2006/12/03 04:00:43 keri Exp $
+
+  03 Dec 2006; keri <keri@gentoo.org> +files/yap-5.1.1-multilib.patch,
+  yap-5.1.1.ebuild:
+  Add multilib patch. Bug #147098.
 
   23 Nov 2006; Francesco Riosa <vivo@gentoo.org> yap-5.1.1.ebuild:
   dev-db/mysql => virtual/mysql
diff --git a/dev-lang/yap/files/yap-5.1.1-multilib.patch b/dev-lang/yap/files/yap-5.1.1-multilib.patch
new file mode 100644
index 000000000000..a88c08c7ed53
--- /dev/null
+++ b/dev-lang/yap/files/yap-5.1.1-multilib.patch
@@ -0,0 +1,160 @@
+diff -ur Yap-5.1.1.orig/CLPBN/Makefile.in Yap-5.1.1/CLPBN/Makefile.in
+--- Yap-5.1.1.orig/CLPBN/Makefile.in	2006-01-18 03:45:28.000000000 +1300
++++ Yap-5.1.1/CLPBN/Makefile.in	2006-12-03 15:00:52.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-5.1.1.orig/LGPL/JPL/Makefile.in Yap-5.1.1/LGPL/JPL/Makefile.in
+--- Yap-5.1.1.orig/LGPL/JPL/Makefile.in	2005-03-13 19:26:11.000000000 +1300
++++ Yap-5.1.1/LGPL/JPL/Makefile.in	2006-12-03 15:00:52.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-5.1.1.orig/LGPL/JPL/java/Makefile.in Yap-5.1.1/LGPL/JPL/java/Makefile.in
+--- Yap-5.1.1.orig/LGPL/JPL/java/Makefile.in	2006-03-23 03:00:28.000000000 +1200
++++ Yap-5.1.1/LGPL/JPL/java/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -15,7 +15,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-5.1.1.orig/LGPL/JPL/src/Makefile.in Yap-5.1.1/LGPL/JPL/src/Makefile.in
+--- Yap-5.1.1.orig/LGPL/JPL/src/Makefile.in	2006-03-23 03:00:28.000000000 +1200
++++ Yap-5.1.1/LGPL/JPL/src/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -19,7 +19,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.1.orig/LGPL/clp/Makefile.in Yap-5.1.1/LGPL/clp/Makefile.in
+--- Yap-5.1.1.orig/LGPL/clp/Makefile.in	2005-10-29 06:53:27.000000000 +1300
++++ Yap-5.1.1/LGPL/clp/Makefile.in	2006-12-03 15:00:52.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-5.1.1.orig/Makefile.in Yap-5.1.1/Makefile.in
+--- Yap-5.1.1.orig/Makefile.in	2006-04-13 23:34:33.000000000 +1200
++++ Yap-5.1.1/Makefile.in	2006-12-03 15:00:52.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-5.1.1.orig/library/Makefile.in Yap-5.1.1/library/Makefile.in
+--- Yap-5.1.1.orig/library/Makefile.in	2006-04-11 07:24:52.000000000 +1200
++++ Yap-5.1.1/library/Makefile.in	2006-12-03 15:00:52.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-5.1.1.orig/library/Tries/Makefile.in Yap-5.1.1/library/Tries/Makefile.in
+--- Yap-5.1.1.orig/library/Tries/Makefile.in	2004-08-12 04:14:54.000000000 +1200
++++ Yap-5.1.1/library/Tries/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -18,7 +18,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.1.orig/library/mpi/Makefile.in Yap-5.1.1/library/mpi/Makefile.in
+--- Yap-5.1.1.orig/library/mpi/Makefile.in	2002-02-27 06:25:33.000000000 +1300
++++ Yap-5.1.1/library/mpi/Makefile.in	2006-12-03 15:01:52.000000000 +1300
+@@ -20,8 +20,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-5.1.1.orig/library/random/Makefile.in Yap-5.1.1/library/random/Makefile.in
+--- Yap-5.1.1.orig/library/random/Makefile.in	2002-11-13 08:53:52.000000000 +1300
++++ Yap-5.1.1/library/random/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -12,7 +12,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.1.orig/library/regex/Makefile.in Yap-5.1.1/library/regex/Makefile.in
+--- Yap-5.1.1.orig/library/regex/Makefile.in	2004-10-01 09:16:20.000000000 +1200
++++ Yap-5.1.1/library/regex/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -12,7 +12,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.1.orig/library/system/Makefile.in Yap-5.1.1/library/system/Makefile.in
+--- Yap-5.1.1.orig/library/system/Makefile.in	2002-11-13 08:53:52.000000000 +1300
++++ Yap-5.1.1/library/system/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -12,7 +12,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.1.orig/library/yap2swi/Makefile.in Yap-5.1.1/library/yap2swi/Makefile.in
+--- Yap-5.1.1.orig/library/yap2swi/Makefile.in	2004-08-12 04:14:54.000000000 +1200
++++ Yap-5.1.1/library/yap2swi/Makefile.in	2006-12-03 15:00:52.000000000 +1300
+@@ -12,7 +12,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
diff --git a/dev-lang/yap/yap-5.1.1.ebuild b/dev-lang/yap/yap-5.1.1.ebuild
index 5e07dd10ef26..f9859214abe4 100644
--- a/dev-lang/yap/yap-5.1.1.ebuild
+++ b/dev-lang/yap/yap-5.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.3 2006/11/23 16:35:54 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-5.1.1.ebuild,v 1.4 2006/12/03 04:00:43 keri Exp $
 
 inherit autotools eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-multilib.patch
 	epatch "${FILESDIR}"/${P}-analyst.patch
 	epatch "${FILESDIR}"/${P}-myddas.patch
 	epatch "${FILESDIR}"/${P}-tabling.patch