Update multilib fixes

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 89ae24dd013eae61956bb8103f1e254b92cb7ba8..adc95e8cf777122201e782f072c61d07eec06896 100644 (file)
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -21,14 +21,14 @@ MD5 f82809daef4d783797094233672feb3f files/mono-1.1.8.3-icall.diff 433
 MD5 25426f960f7fc04c8932375f20885eda files/mono-1.1.9.1-io-layer-fix.diff 5552
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 10c58186e6ce0ab643d16c883f2071ff mono-1.0.5-r5.ebuild 3718
-MD5 e677117f5c7a5ffb4e9273cef85d466c mono-1.1.10.ebuild 2194
+MD5 7c228ddae84f1b83e790aeba4587f970 mono-1.1.10.ebuild 2355
 MD5 5415fa75de6e201ae1a0e12c17498709 mono-1.1.8.3.ebuild 2501
 MD5 9e335202b997822eafad0c2f80137f66 mono-1.1.9.1.ebuild 2285
 MD5 8a27590ee5780db41e7f4124b7de58d0 mono-1.1.9.2.ebuild 2000
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDeJDK2G5bA0cA/ScRAiXqAKCBqyHOEu4/cI/lDfVx0p49wvrmNACZAVCI
-viMZV28iy5DKwUTKhXoGoHc=
-=p9yS
+iD8DBQFDeK8G2G5bA0cA/ScRAix5AKCn0iSOqWRNNYucDg8k+xMZKqWR4QCghZRY
+uivaqxx998MtcyCbJUVs7X0=
+=rsLl
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/mono/mono-1.1.10.ebuild b/dev-lang/mono/mono-1.1.10.ebuild
index c2ce693499106f6c2b5e4ed79f2834ca9712f5de..6399f71ba968da4f764ad091822ac8d67d69ab1c 100644 (file)
--- a/dev-lang/mono/mono-1.1.10.ebuild
+++ b/dev-lang/mono/mono-1.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.10.ebuild,v 1.2 2005/11/14 13:27:21 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.10.ebuild,v 1.3 2005/11/14 15:36:24 herbs Exp $
 
-inherit eutils mono flag-o-matic
+inherit eutils mono flag-o-matic multilib
 
 DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
 HOMEPAGE="http://www.go-mono.com/"
@@ -36,11 +36,15 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}-1.1.5-pathfix.diff
 
        # Install all our .dlls under $(libdir), not $(prefix)/lib
-       sed -i -e 's:$(prefix)/lib:$(libdir):' \
-               -e 's:$(exec_prefix)/lib:$(libdir):' \
-               -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
-               ${S}/{scripts,mono/metadata,mono/os/unix}/Makefile.am \
-               ${S}/configure.in || die
+       if [ $(get_libdir) != "lib" ] ; then
+               sed -i -e 's:$(prefix)/lib:$(libdir):' \
+                       -e 's:$(exec_prefix)/lib:$(libdir):' \
+                       -e "s:'mono_libdir=\${exec_prefix}/lib':\"mono_libdir=\$libdir\":" \
+                       ${S}/{scripts,mono/metadata,mono/os/unix}/Makefile.am \
+                       ${S}/configure.in || die "sed failed"
+               sed -i -e 's:^libdir.*:libdir=@libdir@:' \
+                       ${S}/{scripts,}/*.pc.in || die "sed failed"
+       fi
 
        libtoolize --copy --force || die "libtoolize failed"
        aclocal || die "aclocal failed"