multilib-strict lovin'

Package-Manager: portage-2.1_rc1-r3

3 files changed, 37 insertions, 35 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index ce7ad1b5dbff..9453e9532ef8 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/wxhaskell
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.20 2006/03/11 11:50:30 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.21 2006/05/19 05:13:17 squinky86 Exp $
+
+  19 May 2006; Jon Hood <squinky86@gentoo.org> wxhaskell-0.9.4.ebuild:
+  Use the correct libdirs when installing for 64-bit. This way, it compiles
+  with multilib-strict.
 
   10 Mar 2006; Duncan Coutts <dcoutts@gentoo.org> wxhaskell-0.9.4.ebuild:
   Make the wxhaskell package be exposed by default with ghc-6.2.2
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index 0f2f54b7fd77..f198ff961a5b 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,9 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2aaed4b381fbf95c5ebe0b73932c73bb ChangeLog 3435
-RMD160 f0f5d6d88a3d8357becaedabab001979225d1596 ChangeLog 3435
-SHA256 6fb5e4175a9f299226782f048d5c8a5924cdc98234b767f215c9ecf9f8aa66bf ChangeLog 3435
+DIST wxhaskell-src-0.8.zip 545291 RMD160 6802992948677663e4543070875963a7932ee99a SHA256 81527b40468a87183c2d7d46cc0b1fa886caaad3abb5c0ae7b8c57eb875824b0 size 545291
+DIST wxhaskell-src-0.9.4.zip 569954 RMD160 70c386cb2451509dbd5bca652435bab35b808ed1 SHA256 586ad7eb706442e44c070455b32800ba2a5e24a67ffd5b90a9aa4f803238fdcd size 569954
+DIST wxhaskell-src-0.9.zip 564588 RMD160 9509c0da854abb4b6f82a0585968832c892efaec SHA256 5794a9fe1023b07bcd53459f81751157643cc129e712b2cda657065e3cb769b7 size 564588
+EBUILD wxhaskell-0.8-r1.ebuild 2859 RMD160 c7b76e5ce6ce99dbf3a4c0aa9928845d2363bdef SHA1 77419fb9b99a405da7557866b19670fbaed3470e SHA256 c4cd43db6ff6b65cbf2fac0dbcd78c8f9da8fcc9ce0d6f26efc425405ee93950 size 2859
+MD5 67196ffe4b985a8118e89a0ac673e114 wxhaskell-0.8-r1.ebuild 2859
+RMD160 c7b76e5ce6ce99dbf3a4c0aa9928845d2363bdef wxhaskell-0.8-r1.ebuild 2859
+SHA256 c4cd43db6ff6b65cbf2fac0dbcd78c8f9da8fcc9ce0d6f26efc425405ee93950 wxhaskell-0.8-r1.ebuild 2859
+EBUILD wxhaskell-0.9.4.ebuild 3034 RMD160 2bfd3b8692509075ff3f8785bf5d90b67cbb0122 SHA1 61e881bc480244b7386f276d15b75cfacc38ebd5 SHA256 ef2c270492e499a86d1abe09c530f2654b8368df88f2059162dcfe91b6361590 size 3034
+MD5 76be3fa5ef5534ccf4a3f7c0e106c3b6 wxhaskell-0.9.4.ebuild 3034
+RMD160 2bfd3b8692509075ff3f8785bf5d90b67cbb0122 wxhaskell-0.9.4.ebuild 3034
+SHA256 ef2c270492e499a86d1abe09c530f2654b8368df88f2059162dcfe91b6361590 wxhaskell-0.9.4.ebuild 3034
+EBUILD wxhaskell-0.9.ebuild 2856 RMD160 bee28d1368b27bedd59168c2d313cc057859628a SHA1 03f34c24b9003852e1f8c2232f781288822aacaa SHA256 4e902a85da1903f6b7678796e2809339947bbb99f0d077e1068ba9c1567f96f1 size 2856
+MD5 40618bf3fcadeef0837c0b8a6c281b64 wxhaskell-0.9.ebuild 2856
+RMD160 bee28d1368b27bedd59168c2d313cc057859628a wxhaskell-0.9.ebuild 2856
+SHA256 4e902a85da1903f6b7678796e2809339947bbb99f0d077e1068ba9c1567f96f1 wxhaskell-0.9.ebuild 2856
+MISC ChangeLog 3609 RMD160 842f7f6532b9a1f1f821d618d4e20a8531e261c2 SHA1 250197f3bdb152eb53e73636f7ce6cc3d27c74be SHA256 ece4144e880ba0dfc069b8bbe0195f79b47203e8d85d3100860171ff912cddd3 size 3609
+MD5 00da55758f672d2c08e933cf76b2dff8 ChangeLog 3609
+RMD160 842f7f6532b9a1f1f821d618d4e20a8531e261c2 ChangeLog 3609
+SHA256 ece4144e880ba0dfc069b8bbe0195f79b47203e8d85d3100860171ff912cddd3 ChangeLog 3609
+MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 size 223
+MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
+RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
+SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
 MD5 045506c36a937e84a6203f2205c9dfd4 files/digest-wxhaskell-0.8-r1 244
 RMD160 396f688c25e1c117f0f3c5a2a8ca372d230db9de files/digest-wxhaskell-0.8-r1 244
 SHA256 4ad92a7532e732e05f38cc736707005c632d6f326ae32a140c705cd9db63e824 files/digest-wxhaskell-0.8-r1 244
@@ -13,22 +30,3 @@ SHA256 0fa6e1bcccc39b28f68aed38d9f800f7f52668df7b588afa3b8c4f932e6a4346 files/di
 MD5 d65df2d0e35a232f916aa03605183014 files/digest-wxhaskell-0.9.4 250
 RMD160 44e2bab5fe15dc3bc1c736c008068884ad674953 files/digest-wxhaskell-0.9.4 250
 SHA256 38ad5e3401720ff06d5eead8cd11d7646b4f6ee7c896d1b191d9d5b68077f7d0 files/digest-wxhaskell-0.9.4 250
-MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
-RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
-SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 metadata.xml 223
-MD5 67196ffe4b985a8118e89a0ac673e114 wxhaskell-0.8-r1.ebuild 2859
-RMD160 c7b76e5ce6ce99dbf3a4c0aa9928845d2363bdef wxhaskell-0.8-r1.ebuild 2859
-SHA256 c4cd43db6ff6b65cbf2fac0dbcd78c8f9da8fcc9ce0d6f26efc425405ee93950 wxhaskell-0.8-r1.ebuild 2859
-MD5 53887ef9622903fd025b45079fcd0542 wxhaskell-0.9.4.ebuild 2953
-RMD160 d8c347bd7d8fe0508edd3b9a92b22756c6e24d7c wxhaskell-0.9.4.ebuild 2953
-SHA256 01a79decd8651bc3a49f0dd9f75157ae7e24c35cf23334395b3b3eaaf344d8de wxhaskell-0.9.4.ebuild 2953
-MD5 40618bf3fcadeef0837c0b8a6c281b64 wxhaskell-0.9.ebuild 2856
-RMD160 bee28d1368b27bedd59168c2d313cc057859628a wxhaskell-0.9.ebuild 2856
-SHA256 4e902a85da1903f6b7678796e2809339947bbb99f0d077e1068ba9c1567f96f1 wxhaskell-0.9.ebuild 2856
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEErl2/B0cxt+cq+wRAqEGAKCFgXlmFAICS8dfkNa6wgtjDnqTawCeLr9Q
-KyHqg2okP8OuXbaUVGpuaek=
-=EW44
------END PGP SIGNATURE-----
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
index ab41230b8067..14b5d976ff06 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.5 2006/03/11 11:50:30 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild,v 1.6 2006/05/19 05:13:17 squinky86 Exp $
 
-inherit flag-o-matic wxwidgets ghc-package
+inherit flag-o-matic wxwidgets ghc-package multilib
 
 DESCRIPTION="a portable and native GUI library for Haskell"
 HOMEPAGE="http://wxhaskell.sourceforge.net/"
@@ -62,7 +62,7 @@ src_compile() {
 		--wx-config="${WX_CONFIG}" \
 		--prefix=/usr \
 		--with-opengl \
-		--libdir=/usr/lib/${P} \
+		--libdir=/usr/$(get_libdir)/${P} \
 		--package-conf=${S}/$(ghc-localpkgconf) \
 		|| die "./configure failed"
 
@@ -81,9 +81,9 @@ src_install() {
 	emake -j1 install-files DESTDIR="${D}" || die "make install failed"
 
 	# the .so needs to be on the lib path
-	mkdir -p ${D}/usr/lib
-	for f in ${D}/usr/lib/${P}/libwxc-*.so; do
-		mv ${f} ${D}/usr/lib/
+	mkdir -p ${D}/usr/$(get_libdir)
+	for f in ${D}/usr/$(get_libdir)/${P}/libwxc-*.so; do
+		mv ${f} ${D}/usr/$(get_libdir)/
 	done
 
 	if use doc; then
@@ -93,9 +93,9 @@ src_install() {
 
 	# substitute for the ${wxhlibdir} in package files and register them
 	# for ghc-6.2 change the package to be exposed by default.
-	sed -i -e "s:\${wxhlibdir}:${D}/usr/lib/${P}:" \
+	sed -i -e "s:\${wxhlibdir}:${D}/usr/$(get_libdir)/${P}:" \
 		   -e "s:auto = False:auto = True:" \
-		   ${D}/usr/lib/${P}/*.pkg
-	ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg
+		   ${D}/usr/$(get_libdir)/${P}/*.pkg
+	ghc-setup-pkg ${D}/usr/$(get_libdir)/${P}/*.pkg
 	ghc-install-pkg
 }