From: Piotr Jaroszyński <peper@gentoo.org>
Date: Wed, 27 Dec 2006 21:41:40 +0000 (+0000)
Subject: Fix multilib.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f98a40ae7ee184f0d0a68d1344c0fdf30e1e7fae;p=gentoo.git

Fix multilib.
Package-Manager: portage-2.1.2_rc4
---

diff --git a/dev-ml/findlib/ChangeLog b/dev-ml/findlib/ChangeLog
index a269fe25554a..23efa350b1c1 100644
--- a/dev-ml/findlib/ChangeLog
+++ b/dev-ml/findlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/findlib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.21 2006/11/03 10:43:42 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/ChangeLog,v 1.22 2006/12/27 21:41:40 peper Exp $
+
+  27 Dec 2006; Piotr Jaroszyński <peper@gentoo.org>
+  findlib-1.0.4-r1.ebuild:
+  Fix multilib.
 
   03 Nov 2006; Alexandre Buisse <nattfodd@gentoo.org>
   findlib-1.0.4-r1.ebuild:
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 8c4de00f22d2..a7c0529d9fbe 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST findlib-1.0.4.tar.gz 148287 RMD160 71c2ce482666db5df5ad25d57ebb306bbe551e64 SHA1 405db790d3cb8b04bf6ede7444103ae678a90ef7 SHA256 dcd0970672b6893cb91ba8dafe56b5f9508b13277e2b68bad7596b9ec1b68516
-EBUILD findlib-1.0.4-r1.ebuild 1696 RMD160 77236611abd7bd09805d1f225dba0124be53fc8c SHA1 5996dc22d0758b0997fd688b44cc7046beffd171 SHA256 ad6bd61ed8b696d393c662ffb385f00316e8d4e4d711bf4d1bf8329aeccd2f65
-MD5 885e01d6c12ea414aa17c167c939d299 findlib-1.0.4-r1.ebuild 1696
-RMD160 77236611abd7bd09805d1f225dba0124be53fc8c findlib-1.0.4-r1.ebuild 1696
-SHA256 ad6bd61ed8b696d393c662ffb385f00316e8d4e4d711bf4d1bf8329aeccd2f65 findlib-1.0.4-r1.ebuild 1696
-MISC ChangeLog 2566 RMD160 93cff6d63fb78d0edfa5c6350eecbc5b6c4a1603 SHA1 fb3e6fa6dd37ce08e539cfb191189ed7e92c0787 SHA256 e1070c2647533c0b0fec35278aa54c9755916e5fd475fb94623162749551e5a1
-MD5 2098c9716719201924ef610b3db994cc ChangeLog 2566
-RMD160 93cff6d63fb78d0edfa5c6350eecbc5b6c4a1603 ChangeLog 2566
-SHA256 e1070c2647533c0b0fec35278aa54c9755916e5fd475fb94623162749551e5a1 ChangeLog 2566
+EBUILD findlib-1.0.4-r1.ebuild 1721 RMD160 50df3dede2315d49c20e6cefe2628ddae0418c38 SHA1 aab0273777577d76b1bb0dd9daa5516bcf16fdc4 SHA256 63447f61c8a5dd3549510f5b7c024ffd7a3c0813db1156822d7cad7572af83c1
+MD5 6064372460615ad5b7931982cee1ffae findlib-1.0.4-r1.ebuild 1721
+RMD160 50df3dede2315d49c20e6cefe2628ddae0418c38 findlib-1.0.4-r1.ebuild 1721
+SHA256 63447f61c8a5dd3549510f5b7c024ffd7a3c0813db1156822d7cad7572af83c1 findlib-1.0.4-r1.ebuild 1721
+MISC ChangeLog 2660 RMD160 41e53e4eefd69ea6e6c13229a694fb7d993b7b09 SHA1 a999f443afac8f3f4d8870244e63674f36c0f4b1 SHA256 6e8ce23c1fe4118ea3205b6f6c5c64f0b8b72a4d021f5545511fafbe4b450daf
+MD5 f0321f647ab72d798fa6edae00a272af ChangeLog 2660
+RMD160 41e53e4eefd69ea6e6c13229a694fb7d993b7b09 ChangeLog 2660
+SHA256 6e8ce23c1fe4118ea3205b6f6c5c64f0b8b72a4d021f5545511fafbe4b450daf ChangeLog 2660
 MISC metadata.xml 225 RMD160 138a4a018327b252bca64596a96ca8ba9889518e SHA1 1ac1e2169f829499fdbe256195de97ed63b5a7b1 SHA256 5c308b27332bed379ee06e522386288fa511e83e6449d834dea9ebcd8e827592
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 RMD160 138a4a018327b252bca64596a96ca8ba9889518e metadata.xml 225
@@ -18,9 +18,9 @@ MD5 6972fec5130aa3075bd395b9ec5a1d4c files/digest-findlib-1.0.4-r1 241
 RMD160 787f1c8e5392322623be2c519733374f188a4828 files/digest-findlib-1.0.4-r1 241
 SHA256 d23ca58c9530b2e2da03f337e74bb8b1264c456cc9c549c2f383ac0c4b08d7b2 files/digest-findlib-1.0.4-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFSx4hwx9vvAARv2sRAsZhAJ44xeiZU9DqD1jDxX7bgkIyu/l/YgCeNFLi
-/oOV2O1FbpbVwNtm4hPzc6o=
-=jGQK
+iD8DBQFFkuidppoStNGKGywRAticAJ9bTq8Dc5p3lh/O8qRvc43U272SaQCfd2Ut
+OFUlXumIlEYtFSRfzlFJ2OA=
+=0808
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/findlib/findlib-1.0.4-r1.ebuild b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
index f130fa6f98a3..384f3ddb5a28 100644
--- a/dev-ml/findlib/findlib-1.0.4-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.0.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4-r1.ebuild,v 1.13 2006/11/03 10:43:42 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.0.4-r1.ebuild,v 1.14 2006/12/27 21:41:40 peper Exp $
+
+inherit multilib
 
 IUSE="tk"
 
@@ -15,7 +17,7 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc-macos ppc64 sparc x86"
 
 DEPEND=">=dev-lang/ocaml-3.07"
 
-ocamlfind_destdir="/usr/lib/ocaml/site-packages"
+ocamlfind_destdir="/usr/$(get_libdir)/ocaml/site-packages"
 stublibs=${ocamlfind_destdir}/stublibs
 
 pkg_setup()