From: Peter Johanson Date: Tue, 4 Jan 2005 15:58:39 +0000 (+0000) Subject: Fixes for installations on systems without mono already installed. See bug #75560 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1ac485532b6e561984331141885ccc0f1649eac;p=gentoo.git Fixes for installations on systems without mono already installed. See bug #75560 --- diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog index 11c9b779d791..f7be05aeabf7 100644 --- a/dev-dotnet/mono/ChangeLog +++ b/dev-dotnet/mono/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-dotnet/mono # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.43 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.44 2005/01/04 15:58:39 latexer Exp $ + + 04 Jan 2005; Peter Johanson mono-1.0.5-r2.ebuild, + mono-1.0.5-r3.ebuild: + Fixes for installations on systems without mono already installed. See bug + #75560 02 Jan 2005; Peter Johanson mono-1.0.5-r2.ebuild, mono-1.0.5-r3.ebuild: diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest index 6f27aa09d2d7..841edaa84ee8 100644 --- a/dev-dotnet/mono/Manifest +++ b/dev-dotnet/mono/Manifest @@ -1,15 +1,15 @@ MD5 75c6908dca71065c892613877766aa50 mono-1.0.5-r1.ebuild 2130 MD5 452693476110c3dd268452eaf86d4bf7 mono-1.0.2.ebuild 1718 MD5 2b9c76a2c311372fc7b10b9599da282c mono-1.0.1-r1.ebuild 1737 -MD5 cf328651b45b4b8019ecd63629448354 mono-1.0.5-r3.ebuild 3971 +MD5 0c3652f1b8fba20c22896952907083ec mono-1.0.5-r3.ebuild 4192 MD5 ccbb4f9cef3dff41850ec9bb1df386da mono-1.0.4.ebuild 1505 MD5 e66406344b8e6a9bf61735cadc955782 mono-1.0.4-r1.ebuild 2108 MD5 28f48011b549877bacc0669c52fe2a65 mono-0.28.ebuild 2103 MD5 aacc649c7cfe67c9e081a012c9c7bb6d mono-1.0.1.ebuild 1483 -MD5 fa4cceacc4bde66e451adff30edadfef mono-1.0.5-r2.ebuild 3372 +MD5 2f6d7ad03cd42439371264205410fe48 mono-1.0.5-r2.ebuild 3593 MD5 80bfd3260048a7bf842a99635c1ed8d0 mono-1.0.1-r2.ebuild 1683 MD5 9794ca2580cd053f834120ccdd6445cc mono-1.0.2-r1.ebuild 2108 -MD5 7418c2c1b09ea7db25adaf3f290ae086 ChangeLog 11397 +MD5 628f1b29221047847d8042d7f3d35f93 ChangeLog 11581 MD5 05240d64160302b2704a7d49909fc5d4 mono-1.0.5.ebuild 1528 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159 MD5 9f4b4eb6a1555ed574dbdd359cae3070 files/dotnet.conf 573 diff --git a/dev-dotnet/mono/mono-1.0.5-r2.ebuild b/dev-dotnet/mono/mono-1.0.5-r2.ebuild index a0854ebb964e..8d22e991eeff 100644 --- a/dev-dotnet/mono/mono-1.0.5-r2.ebuild +++ b/dev-dotnet/mono/mono-1.0.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r2.ebuild,v 1.6 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r2.ebuild,v 1.7 2005/01/04 15:58:39 latexer Exp $ inherit eutils mono flag-o-matic debug @@ -47,7 +47,7 @@ src_unpack() { # Fix MONO_CFG_DIR for signing sed -i \ - "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ + "s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ ${MCS_S}/build/library.make # add our own little in-place mcs script @@ -58,7 +58,9 @@ src_unpack() { chmod +x ${S}/runtime/monoresgen PATH="${S}/runtime:${PATH}" + MONO_CFG_DIR='${D}/etc/' export PATH + export MONO_CFG_DIR } src_compile() { @@ -77,6 +79,12 @@ src_compile() { cd ${S} ln -s ../runtime ${WORKDIR}/${P}/runtime/lib + # Now that we have a valid config for lib mappings, put them + # in our temporary config directory. + + dodir /etc/mono + cp ${S}/data/{config,machine.config} ${D}/etc/mono/ + cd ${MCS_S} echo "prefix=${S}/runtime" > build/config.make echo "MONO_PATH=${S}/runtime/net_1_1" >> build/config.make diff --git a/dev-dotnet/mono/mono-1.0.5-r3.ebuild b/dev-dotnet/mono/mono-1.0.5-r3.ebuild index d811daea2741..4f056dfd4a33 100644 --- a/dev-dotnet/mono/mono-1.0.5-r3.ebuild +++ b/dev-dotnet/mono/mono-1.0.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r3.ebuild,v 1.6 2005/01/03 04:18:46 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r3.ebuild,v 1.7 2005/01/04 15:58:39 latexer Exp $ inherit eutils mono flag-o-matic debug gcc @@ -49,7 +49,7 @@ src_unpack() { # Fix MONO_CFG_DIR for signing sed -i \ - "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ + "s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \ ${MCS_S}/build/library.make # add our own little in-place mcs script @@ -60,7 +60,9 @@ src_unpack() { chmod +x ${S}/runtime/monoresgen PATH="${S}/runtime:${PATH}" + MONO_CFG_DIR='${D}/etc/' export PATH + export MONO_CFG_DIR } src_compile() { @@ -97,6 +99,12 @@ src_compile() { cd ${S} ln -s ../runtime ${WORKDIR}/${P}/runtime/lib + # Now that we have a valid config for lib mappings, put them + # in our temporary config directory. + + dodir /etc/mono + cp ${S}/data/{config,machine.config} ${D}/etc/mono/ + cd ${MCS_S} echo "prefix=${S}/runtime" > build/config.make echo "MONO_PATH=${S}/runtime/net_1_1" >> build/config.make