Fix multilib patch. Closes #201754.

(Portage version: 2.1.4_rc9)

2 files changed, 65 insertions, 14 deletions

diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index 1ae8b43e4534..6068c07b03d7 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/yap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.18 2007/11/23 07:52:18 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.19 2007/12/10 08:13:43 keri Exp $
+
+  10 Dec 2007; keri <keri@gentoo.org> files/yap-5.1.2-multilib.patch:
+  Fix multilib patch. Closes bug #201754 reported by Nikolay Orlyuk.
 
   23 Nov 2007; keri <keri@gentoo.org> files/yap-5.1.2-configure.patch:
   Fix Makefile expansion of shared library extensions in lam package.
diff --git a/dev-lang/yap/files/yap-5.1.2-multilib.patch b/dev-lang/yap/files/yap-5.1.2-multilib.patch
index b19727c0502b..ea23cfca5eb2 100644
--- a/dev-lang/yap/files/yap-5.1.2-multilib.patch
+++ b/dev-lang/yap/files/yap-5.1.2-multilib.patch
@@ -1,6 +1,6 @@
 diff -ur Yap-5.1.2.orig/CLPBN/Makefile.in Yap-5.1.2/CLPBN/Makefile.in
 --- Yap-5.1.2.orig/CLPBN/Makefile.in	2006-02-12 13:41:23.000000000 +1300
-+++ Yap-5.1.2/CLPBN/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/CLPBN/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for libraries
@@ -12,7 +12,7 @@ diff -ur Yap-5.1.2.orig/CLPBN/Makefile.in Yap-5.1.2/CLPBN/Makefile.in
  #
 diff -ur Yap-5.1.2.orig/LGPL/JPL/Makefile.in Yap-5.1.2/LGPL/JPL/Makefile.in
 --- Yap-5.1.2.orig/LGPL/JPL/Makefile.in	2005-03-12 17:04:58.000000000 +1300
-+++ Yap-5.1.2/LGPL/JPL/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/LGPL/JPL/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -24,7 +24,7 @@ diff -ur Yap-5.1.2.orig/LGPL/JPL/Makefile.in Yap-5.1.2/LGPL/JPL/Makefile.in
  #
 diff -ur Yap-5.1.2.orig/LGPL/JPL/java/Makefile.in Yap-5.1.2/LGPL/JPL/java/Makefile.in
 --- Yap-5.1.2.orig/LGPL/JPL/java/Makefile.in	2006-03-22 10:28:08.000000000 +1200
-+++ Yap-5.1.2/LGPL/JPL/java/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/LGPL/JPL/java/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -15,7 +15,7 @@
  #
  # where YAP should look for binary libraries
@@ -36,7 +36,7 @@ diff -ur Yap-5.1.2.orig/LGPL/JPL/java/Makefile.in Yap-5.1.2/LGPL/JPL/java/Makefi
  #
 diff -ur Yap-5.1.2.orig/LGPL/JPL/src/Makefile.in Yap-5.1.2/LGPL/JPL/src/Makefile.in
 --- Yap-5.1.2.orig/LGPL/JPL/src/Makefile.in	2006-05-25 13:02:03.000000000 +1200
-+++ Yap-5.1.2/LGPL/JPL/src/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/LGPL/JPL/src/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -19,7 +19,7 @@
  #
  # where YAP should look for libraries
@@ -48,7 +48,7 @@ diff -ur Yap-5.1.2.orig/LGPL/JPL/src/Makefile.in Yap-5.1.2/LGPL/JPL/src/Makefile
  CC=@CC@
 diff -ur Yap-5.1.2.orig/LGPL/clp/Makefile.in Yap-5.1.2/LGPL/clp/Makefile.in
 --- Yap-5.1.2.orig/LGPL/clp/Makefile.in	2005-10-28 15:43:57.000000000 +1300
-+++ Yap-5.1.2/LGPL/clp/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/LGPL/clp/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -60,7 +60,7 @@ diff -ur Yap-5.1.2.orig/LGPL/clp/Makefile.in Yap-5.1.2/LGPL/clp/Makefile.in
  #
 diff -ur Yap-5.1.2.orig/Makefile.in Yap-5.1.2/Makefile.in
 --- Yap-5.1.2.orig/Makefile.in	2007-06-21 01:45:42.000000000 +1200
-+++ Yap-5.1.2/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -4,7 +4,7 @@
  #
  prefix = @prefix@
@@ -83,7 +83,7 @@ diff -ur Yap-5.1.2.orig/Makefile.in Yap-5.1.2/Makefile.in
  #
 diff -ur Yap-5.1.2.orig/library/Makefile.in Yap-5.1.2/library/Makefile.in
 --- Yap-5.1.2.orig/library/Makefile.in	2007-06-21 01:46:02.000000000 +1200
-+++ Yap-5.1.2/library/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -9,7 +9,7 @@
  #
  # where YAP should look for binary libraries
@@ -95,7 +95,7 @@ diff -ur Yap-5.1.2.orig/library/Makefile.in Yap-5.1.2/library/Makefile.in
  #
 diff -ur Yap-5.1.2.orig/library/Tries/Makefile.in Yap-5.1.2/library/Tries/Makefile.in
 --- Yap-5.1.2.orig/library/Tries/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/Tries/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/Tries/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -18,7 +18,7 @@
  #
  # where YAP should look for libraries
@@ -105,9 +105,45 @@ diff -ur Yap-5.1.2.orig/library/Tries/Makefile.in Yap-5.1.2/library/Tries/Makefi
  #
  #
  CC=@CC@
+diff -ur Yap-5.1.2.orig/library/lammpi/Makefile.in Yap-5.1.2/library/lammpi/Makefile.in
+--- Yap-5.1.2.orig/library/lammpi/Makefile.in	2006-07-28 01:14:48.000000000 +1200
++++ Yap-5.1.2/library/lammpi/Makefile.in	2007-11-23 20:28:11.000000000 +1300
+@@ -16,7 +16,7 @@
+ #
+ # where YAP should look for libraries
+ #
+-LIBDIR=$(EROOTDIR)/lib/Yap
++LIBDIR=@libdir@/Yap
+ #
+ #
+ CC=@CC@
+diff -ur Yap-5.1.2.orig/library/matlab/Makefile.in Yap-5.1.2/library/matlab/Makefile.in
+--- Yap-5.1.2.orig/library/matlab/Makefile.in	2007-05-25 03:11:46.000000000 +1200
++++ Yap-5.1.2/library/matlab/Makefile.in	2007-11-23 20:28:44.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.2.orig/library/matrix/Makefile.in Yap-5.1.2/library/matrix/Makefile.in
+--- Yap-5.1.2.orig/library/matrix/Makefile.in	2006-12-05 01:15:00.000000000 +1300
++++ Yap-5.1.2/library/matrix/Makefile.in	2007-11-23 20:27:39.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.2.orig/library/mpi/Makefile.in Yap-5.1.2/library/mpi/Makefile.in
 --- Yap-5.1.2.orig/library/mpi/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/mpi/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/mpi/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -20,8 +20,8 @@
  #
  # where YAP should look for binary libraries
@@ -121,7 +157,7 @@ diff -ur Yap-5.1.2.orig/library/mpi/Makefile.in Yap-5.1.2/library/mpi/Makefile.i
  #
 diff -ur Yap-5.1.2.orig/library/random/Makefile.in Yap-5.1.2/library/random/Makefile.in
 --- Yap-5.1.2.orig/library/random/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/random/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/random/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -133,7 +169,7 @@ diff -ur Yap-5.1.2.orig/library/random/Makefile.in Yap-5.1.2/library/random/Make
  CC=@CC@
 diff -ur Yap-5.1.2.orig/library/regex/Makefile.in Yap-5.1.2/library/regex/Makefile.in
 --- Yap-5.1.2.orig/library/regex/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/regex/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/regex/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -145,7 +181,19 @@ diff -ur Yap-5.1.2.orig/library/regex/Makefile.in Yap-5.1.2/library/regex/Makefi
  CC=@CC@
 diff -ur Yap-5.1.2.orig/library/system/Makefile.in Yap-5.1.2/library/system/Makefile.in
 --- Yap-5.1.2.orig/library/system/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/system/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/system/Makefile.in	2007-11-23 20:26:19.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.2.orig/library/tries/Makefile.in Yap-5.1.2/library/tries/Makefile.in
+--- Yap-5.1.2.orig/library/tries/Makefile.in	2007-05-03 03:31:23.000000000 +1200
++++ Yap-5.1.2/library/tries/Makefile.in	2007-11-23 20:32:20.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries
@@ -157,7 +205,7 @@ diff -ur Yap-5.1.2.orig/library/system/Makefile.in Yap-5.1.2/library/system/Make
  CC=@CC@
 diff -ur Yap-5.1.2.orig/library/yap2swi/Makefile.in Yap-5.1.2/library/yap2swi/Makefile.in
 --- Yap-5.1.2.orig/library/yap2swi/Makefile.in	2004-12-15 06:00:33.000000000 +1300
-+++ Yap-5.1.2/library/yap2swi/Makefile.in	2007-08-20 20:24:58.000000000 +1200
++++ Yap-5.1.2/library/yap2swi/Makefile.in	2007-11-23 20:26:19.000000000 +1300
 @@ -12,7 +12,7 @@
  #
  # where YAP should look for libraries