Add multilib patch. Bug #147098.

Package-Manager: portage-2.1.2_rc2-r3

4 files changed, 179 insertions, 10 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/Manifest b/dev-lang/yap/Manifest
index 222e6201bf05..e9123f052604 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -34,6 +34,10 @@ AUX yap-5.1.1-configure.patch 4143 RMD160 de01cd9358d76c614858003a6faa6142ad4911
 MD5 186e100798b1941a3562009d8c37d129 files/yap-5.1.1-configure.patch 4143
 RMD160 de01cd9358d76c614858003a6faa6142ad491170 files/yap-5.1.1-configure.patch 4143
 SHA256 ed0e866218c3d483920f1fdd8ce8be2fc003ec6c7e70642dbc7afa417c999f95 files/yap-5.1.1-configure.patch 4143
+AUX yap-5.1.1-multilib.patch 5219 RMD160 d590bf81a2db3670e96cb24ca8f235dca87e85c3 SHA1 3cdfe059b607605980aa10f720c8c2395ec88c45 SHA256 7204e106707e44ea10b9f5616482d5ae01f894e45d025690433b4f378a7c7875
+MD5 68d1b1f8f6926961c915d34fcdf1cb42 files/yap-5.1.1-multilib.patch 5219
+RMD160 d590bf81a2db3670e96cb24ca8f235dca87e85c3 files/yap-5.1.1-multilib.patch 5219
+SHA256 7204e106707e44ea10b9f5616482d5ae01f894e45d025690433b4f378a7c7875 files/yap-5.1.1-multilib.patch 5219
 AUX yap-5.1.1-myddas.patch 551 RMD160 2ccd790f0769f100fba842b4cf008880be6e4694 SHA1 71aed15d57ec004ca1992f216dfb7c7af2cb0330 SHA256 d8e0714fa03595b0ad8ba07e07c9dd0686855b258464e8fac7f856a8642e4095
 MD5 f7008ced13cacf68156ef5dafde84425 files/yap-5.1.1-myddas.patch 551
 RMD160 2ccd790f0769f100fba842b4cf008880be6e4694 files/yap-5.1.1-myddas.patch 551
@@ -52,14 +56,14 @@ EBUILD yap-5.0.1.ebuild 1926 RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 SHA
 MD5 c04d3096e7ea6c31a6755021653ec85a yap-5.0.1.ebuild 1926
 RMD160 369a3eb6368b1665a7c1106b774675ca7bf8b119 yap-5.0.1.ebuild 1926
 SHA256 7ed9d6d1b4ac094366d78a0b4969fd2ed9f133bd1dd47b6a93548d47c086d837 yap-5.0.1.ebuild 1926
-EBUILD yap-5.1.1.ebuild 2083 RMD160 19608ea431dbe4aa7127a45ce726aa5ea936e493 SHA1 297709447b270f7c466bb2967566cb824aff7bca SHA256 84145f337f50c43f684eb9ded6241eeaee26a07c826ff964608c5f173d09efe2
-MD5 38bd147ce44b8c86147b21860fe509e1 yap-5.1.1.ebuild 2083
-RMD160 19608ea431dbe4aa7127a45ce726aa5ea936e493 yap-5.1.1.ebuild 2083
-SHA256 84145f337f50c43f684eb9ded6241eeaee26a07c826ff964608c5f173d09efe2 yap-5.1.1.ebuild 2083
-MISC ChangeLog 1228 RMD160 ce80ac8723e726587c5ce73c847690fe63b0fbcc SHA1 363186ef11b32d039de610976e2911ededac8a5c SHA256 10990f6ddddc654b5878db0da2677e330926f699af671ea4e77f1e18d52c11a1
-MD5 19f5512e73d14bfb33a21be373279639 ChangeLog 1228
-RMD160 ce80ac8723e726587c5ce73c847690fe63b0fbcc ChangeLog 1228
-SHA256 10990f6ddddc654b5878db0da2677e330926f699af671ea4e77f1e18d52c11a1 ChangeLog 1228
+EBUILD yap-5.1.1.ebuild 2125 RMD160 13c49a1ab1d94c4c7926d0b3c5a0483a0a346f5d SHA1 8bf08dca58ca14f20bdf1a306f2b3777e9e0f74a SHA256 75f08997d8960f91768d4eff1eccabd3f462abae0466c9c315c20e7b6e8e932a
+MD5 a80302ff6891b47ab03873824977590c yap-5.1.1.ebuild 2125
+RMD160 13c49a1ab1d94c4c7926d0b3c5a0483a0a346f5d yap-5.1.1.ebuild 2125
+SHA256 75f08997d8960f91768d4eff1eccabd3f462abae0466c9c315c20e7b6e8e932a yap-5.1.1.ebuild 2125
+MISC ChangeLog 1355 RMD160 51a12c05417458a102712be5c211ef9364baae69 SHA1 9f4bcb0a971fc9169b7d8f616129b52d5eb53e0e SHA256 6b516eb9ff5459ddead7cc691a75cb2fad8600bc38598f417788dabcdbcd3eaf
+MD5 2bd69c48d7b314c539a80c42a4d2d87d ChangeLog 1355
+RMD160 51a12c05417458a102712be5c211ef9364baae69 ChangeLog 1355
+SHA256 6b516eb9ff5459ddead7cc691a75cb2fad8600bc38598f417788dabcdbcd3eaf ChangeLog 1355
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
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