Fix multilib patch. Closes #201754.

Package-Manager: portage-2.1.4_rc9

3 files changed, 73 insertions, 22 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/Manifest b/dev-lang/yap/Manifest
index 593d45329c98..7e1c1fd1a67b 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -54,10 +54,10 @@ AUX yap-5.1.2-jpl.patch 1269 RMD160 461a1e841e2ee38e3a4b2bae7a6be2bb4746bfbe SHA
 MD5 203887f743d55e35ca4feff21c50e5f3 files/yap-5.1.2-jpl.patch 1269
 RMD160 461a1e841e2ee38e3a4b2bae7a6be2bb4746bfbe files/yap-5.1.2-jpl.patch 1269
 SHA256 c3be49f295945fcfd8b30bbc4ded358e9ba039f5e3e60c176b2fd9a701b1662b files/yap-5.1.2-jpl.patch 1269
-AUX yap-5.1.2-multilib.patch 5361 RMD160 dbdfb8a17dcb9d8ca81bedabe2f958b27c9c1fa7 SHA1 b9eaac4813a5f0db22ba39d40025b55021ea0cea SHA256 66d36f3af2cb9ee311a8b30913f486406eb5b467e054adebb46b54531fcc944a
-MD5 57078ce77d49b6ae87b7f1aa26a747e6 files/yap-5.1.2-multilib.patch 5361
-RMD160 dbdfb8a17dcb9d8ca81bedabe2f958b27c9c1fa7 files/yap-5.1.2-multilib.patch 5361
-SHA256 66d36f3af2cb9ee311a8b30913f486406eb5b467e054adebb46b54531fcc944a files/yap-5.1.2-multilib.patch 5361
+AUX yap-5.1.2-multilib.patch 6853 RMD160 ad0dcd4a235d60bdee3fdc71df8470886f89dbe3 SHA1 588a69efabb4901543c468d289105c2add0fbe33 SHA256 849862da7313cb95e4fffe8bdcb8aebf9b488035d59a43448d32fef90540708d
+MD5 bbf38d74bb3013ce37964b8a0b3e2440 files/yap-5.1.2-multilib.patch 6853
+RMD160 ad0dcd4a235d60bdee3fdc71df8470886f89dbe3 files/yap-5.1.2-multilib.patch 6853
+SHA256 849862da7313cb95e4fffe8bdcb8aebf9b488035d59a43448d32fef90540708d files/yap-5.1.2-multilib.patch 6853
 AUX yap-5.1.2-parallel-make.patch 3307 RMD160 5c1e2aa5d6b0cbee85d9b72c381f6d903e495ac2 SHA1 59504b8fd9f74ed786abbce4a96f79451e120ea3 SHA256 818964d0e5da157c4307ba646e29f8f3f1a6c453f5474926829d23b93a4c64a8
 MD5 f351647762e192617aa968fd8678ec46 files/yap-5.1.2-parallel-make.patch 3307
 RMD160 5c1e2aa5d6b0cbee85d9b72c381f6d903e495ac2 files/yap-5.1.2-parallel-make.patch 3307
@@ -80,10 +80,10 @@ EBUILD yap-5.1.2.ebuild 2365 RMD160 ff5bbba19bd974b3f81cff3a1e0efc5bed80b40d SHA
 MD5 b247dcc0e9f653c5fee146a7235bd573 yap-5.1.2.ebuild 2365
 RMD160 ff5bbba19bd974b3f81cff3a1e0efc5bed80b40d yap-5.1.2.ebuild 2365
 SHA256 bf5d788f41188919ffbf80b92f52412d6a6f7eea9df5865e81093441feeb1673 yap-5.1.2.ebuild 2365
-MISC ChangeLog 3134 RMD160 3af8fe268d484b818e0e31cadee2b0f1e69de51d SHA1 58c0e2cd4d59c3098b905167e1ecc2bd2e2dc743 SHA256 afd0b2366946c167f42ef6b711fa5c15e6b129faf69f881159e655def5e16bf3
-MD5 aae6f40848bc0517f95b0585f77392d4 ChangeLog 3134
-RMD160 3af8fe268d484b818e0e31cadee2b0f1e69de51d ChangeLog 3134
-SHA256 afd0b2366946c167f42ef6b711fa5c15e6b129faf69f881159e655def5e16bf3 ChangeLog 3134
+MISC ChangeLog 3274 RMD160 7b86e67fc9e4d2c0391090fd5c91ed4f53c1118e SHA1 0d36de3033a3f4c81b835a0005d782ea1004438e SHA256 f2d574671bdb6733ffcb4de1ee7931840b99bba2f0299bceb7fea5962854dce1
+MD5 35a362d11778aacca1da2f2b1494b666 ChangeLog 3274
+RMD160 7b86e67fc9e4d2c0391090fd5c91ed4f53c1118e ChangeLog 3274
+SHA256 f2d574671bdb6733ffcb4de1ee7931840b99bba2f0299bceb7fea5962854dce1 ChangeLog 3274
 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.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