Add multilib fixes and mark ~amd64 wrt bug 109401.

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index 35e97d40c012ad7a87ed14a12d1979ec9fbccac0..d872eaaeb929882c4834396735cf88478b62913f 100644 (file)
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.2 2005/11/14 06:15:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.3 2005/11/14 15:42:36 herbs Exp $
+
+  14 Nov 2005; Herbie Hopkins <herbs@gentoo.org> mono-tools-1.1.10.ebuild:
+  Add multilib fixes and mark ~amd64 wrt bug 109401.
 
 *mono-tools-1.1.10 (14 Nov 2005)
 

diff --git a/dev-util/mono-tools/Manifest b/dev-util/mono-tools/Manifest
index 33bbc5794257523ab542e249c9ef247b08cb0990..801c3746d51e87dd7dd370bfd907e82f3bf28f3b 100644 (file)
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -1,6 +1,6 @@
-MD5 6c5a33d97f8fdd2b0b0b8c5e2bddedd0 mono-tools-1.1.9.ebuild 800
-MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
-MD5 3e92dd815e5527b97c950efb2d6af462 ChangeLog 574
-MD5 5fa4b8a6ed48c20d7be0d8b42d216ae7 mono-tools-1.1.10.ebuild 801
-MD5 c4e9e26f2de9880b018d52913396a564 files/digest-mono-tools-1.1.9 68
+MD5 f1d31675b12401961a7cf1d161386ef8 ChangeLog 703
 MD5 ef298aaced690df60aa4661092650a69 files/digest-mono-tools-1.1.10 69
+MD5 c4e9e26f2de9880b018d52913396a564 files/digest-mono-tools-1.1.9 68
+MD5 3df553e94423a0075a61a43a56dc6726 metadata.xml 256
+MD5 e73c68c9f7987858b05bcde405d49641 mono-tools-1.1.10.ebuild 1246
+MD5 6c5a33d97f8fdd2b0b0b8c5e2bddedd0 mono-tools-1.1.9.ebuild 800

diff --git a/dev-util/mono-tools/mono-tools-1.1.10.ebuild b/dev-util/mono-tools/mono-tools-1.1.10.ebuild
index dae0acd9d3e8debda39936b37bd501506210f400..321de448e3f13c9de9a0d0791e256dbc3ec786ab 100644 (file)
--- a/dev-util/mono-tools/mono-tools-1.1.10.ebuild
+++ b/dev-util/mono-tools/mono-tools-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-util/mono-tools/mono-tools-1.1.10.ebuild,v 1.1 2005/11/14 06:15:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/mono-tools-1.1.10.ebuild,v 1.2 2005/11/14 15:42:36 herbs Exp $
 
-inherit mono
+inherit mono multilib
 
 DESCRIPTION="Set of useful Mono related utilities"
 HOMEPAGE="http://www.mono-project.com/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/mono
@@ -22,6 +22,23 @@ DEPEND="dev-lang/mono
        =dev-dotnet/gconf-sharp-1.0*
        <dev-dotnet/gecko-sharp-0.10"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # Install all our .dlls under $(libdir), not $(prefix)/lib
+       if [ $(get_libdir) != "lib" ] ; then
+               sed -i -e 's:$(prefix)/lib:$(libdir):' \
+                       ${S}/{asn1view/gtk,docbrowser,gnunit/src}/Makefile.am \
+                       || die "sed failed"
+               sed -i -e 's:$prefix/lib:@libdir@:' \
+                       ${S}/docbrowser/monodoc.in || die "sed failed"
+
+               aclocal || die "aclocal failed"
+               automake || die "automake failed"
+       fi
+}
+
 src_compile() {
        econf || die
        emake -j1 || die

diff --git a/dev-util/monodoc/ChangeLog b/dev-util/monodoc/ChangeLog
index e85a4c7588f87f854906faa41f05a5bfe003ec22..d4751e8cbfc081b11342dc053a0571173c8955d2 100644 (file)
--- a/dev-util/monodoc/ChangeLog
+++ b/dev-util/monodoc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/monodoc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.39 2005/11/14 06:14:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/ChangeLog,v 1.40 2005/11/14 15:40:35 herbs Exp $
+
+  14 Nov 2005; Herbie Hopkins <herbs@gentoo.org> monodoc-1.1.10.ebuild:
+  Add multilib fixes and mark ~amd64 wrt bug 109401.
 
 *monodoc-1.1.10 (14 Nov 2005)
 

diff --git a/dev-util/monodoc/Manifest b/dev-util/monodoc/Manifest
index 85169ef30ad5df898d8cfd76c92106d7c5f5b79b..507278df47f52ee3e52d58bdf39a39711045be1b 100644 (file)
--- a/dev-util/monodoc/Manifest
+++ b/dev-util/monodoc/Manifest
@@ -1,12 +1,12 @@
-MD5 591d8f4076437a07efd2e3b825e65cdb monodoc-1.0.4-r1.ebuild 972
-MD5 2acc7ece6f712669d86a4d05c764f3e7 monodoc-1.0.6.ebuild 949
-MD5 c3d5a1bb0e781b3274ad6f7edfa397b5 ChangeLog 5217
-MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 04426363e03707230801dc91cf106d92 monodoc-1.0.5.ebuild 968
-MD5 556e7252605ab27e449155e93380b838 monodoc-1.1.9.ebuild 769
-MD5 612b2ed4818b040ec7fa95ce67748a9b monodoc-1.1.10.ebuild 770
+MD5 c11098aa26d38bb77da1ff4dca174c90 ChangeLog 5343
+MD5 ab527f255d04f1158b6415f2c2d6630d files/digest-monodoc-1.0.4-r1 66
 MD5 896cd9767cb24e6972b9fc0279d28749 files/digest-monodoc-1.0.5 66
 MD5 d34ec1713afad1384e5271c7ef773283 files/digest-monodoc-1.0.6 67
-MD5 ab527f255d04f1158b6415f2c2d6630d files/digest-monodoc-1.0.4-r1 66
-MD5 64f44b1f3dc70bb45f1568c30ed7749c files/digest-monodoc-1.1.9 67
 MD5 3f326461f82eded0d9c8b956676f79d2 files/digest-monodoc-1.1.10 68
+MD5 64f44b1f3dc70bb45f1568c30ed7749c files/digest-monodoc-1.1.9 67
+MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
+MD5 591d8f4076437a07efd2e3b825e65cdb monodoc-1.0.4-r1.ebuild 972
+MD5 04426363e03707230801dc91cf106d92 monodoc-1.0.5.ebuild 968
+MD5 2acc7ece6f712669d86a4d05c764f3e7 monodoc-1.0.6.ebuild 949
+MD5 994a493a19923e0bf46df405d431ffd1 monodoc-1.1.10.ebuild 1225
+MD5 556e7252605ab27e449155e93380b838 monodoc-1.1.9.ebuild 769

diff --git a/dev-util/monodoc/monodoc-1.1.10.ebuild b/dev-util/monodoc/monodoc-1.1.10.ebuild
index c664ea932782a1a1e00a09e6ace16f4a85c4e61b..dcbf4f4a643b36dfe4c1bf8ccfcb4e80b882f892 100644 (file)
--- a/dev-util/monodoc/monodoc-1.1.10.ebuild
+++ b/dev-util/monodoc/monodoc-1.1.10.ebuild
@@ -1,18 +1,35 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-1.1.10.ebuild,v 1.1 2005/11/14 06:14:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodoc/monodoc-1.1.10.ebuild,v 1.2 2005/11/14 15:40:35 herbs Exp $
 
-inherit mono
+inherit mono multilib
 
 DESCRIPTION="Documentation for mono's .Net class library"
 HOMEPAGE="http://www.go-mono.com"
 SRC_URI="http://www.go-mono.com/sources/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=">=dev-lang/mono-1.0"
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       # Install all our .dlls under $(libdir), not $(prefix)/lib
+       if [ $(get_libdir) != "lib" ] ; then
+               sed -i -e 's:$(prefix)/lib:$(libdir):' \
+                       ${S}/engine/Makefile.am || die "sed failed"
+               sed -i -e 's:libdir=@prefix@/lib:libdir=@libdir@:' \
+                               -e 's:${prefix}/lib:${libdir}:' \
+                       ${S}/monodoc.pc.in || die "sed failed"
+
+               aclocal || die "aclocal failed"
+               automake || die "automake failed"
+       fi
+}
+
 src_compile() {
        econf || die
        emake -j1 || die "make failed"