Fix for upgrades from 0.28 era mono versions. Thanks to dma`

diff --git a/dev-dotnet/mono/ChangeLog b/dev-dotnet/mono/ChangeLog
index d3099a939ce6b083c75bd6ed998a3f5b288b5d82..49f4e84a770a555b7dd6f3eb854165ad6176f60e 100644 (file)
--- a/dev-dotnet/mono/ChangeLog
+++ b/dev-dotnet/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/mono
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.38 2004/12/21 03:04:59 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/ChangeLog,v 1.39 2004/12/21 04:43:34 latexer Exp $
+
+  20 Dec 2004; Peter Johanson <latexer@gentoo.org> mono-1.0.5-r2.ebuild,
+  mono-1.0.5-r3.ebuild:
+  Fix for upgrades from 0.28 era mono versions. Thanks to dma`
 
   20 Dec 2004; Peter Johanson <latexer@gentoo.org>
   +files/mcs-1.0.5-pathfix.diff:

diff --git a/dev-dotnet/mono/Manifest b/dev-dotnet/mono/Manifest
index 37e3f65850979ce0f0fb59c01fe6ddcd00fc576f..58139c47e5210fc90353a5fb2eb92116b4587ca8 100644 (file)
--- a/dev-dotnet/mono/Manifest
+++ b/dev-dotnet/mono/Manifest
@@ -1,15 +1,15 @@
 MD5 766eb96143a4871feef1d5b2932d70f5 mono-1.0.5-r1.ebuild 2127
 MD5 79d9a2421c3661e23289dd94b0a379ba mono-1.0.2.ebuild 1715
 MD5 0328c1f3926b56cbd653e0c453901122 mono-1.0.1-r1.ebuild 1734
-MD5 0c0b5bb175e35488cb0639ac3672491e mono-1.0.5-r3.ebuild 3813
+MD5 4a8e85ff8ed48f496f2400cb0a65afe5 mono-1.0.5-r3.ebuild 3943
 MD5 3bc3b5ef13190562278e6924b82a4231 mono-1.0.4.ebuild 1502
 MD5 b049eaae1977d237a6bc2285d5e85b62 mono-1.0.4-r1.ebuild 2105
 MD5 5d0b32410408e9e4f2418dc17eaaacb4 mono-0.28.ebuild 2100
 MD5 b92843896a3417a8aa46a8638c029cdb mono-1.0.1.ebuild 1480
-MD5 892cd0bf648c04a329e46f64a1ee8f94 mono-1.0.5-r2.ebuild 3214
+MD5 4e2fba4128db7bcafef27ba441faf6c5 mono-1.0.5-r2.ebuild 3344
 MD5 c2d21e85729c9e588425689c41ef999e mono-1.0.1-r2.ebuild 1680
 MD5 7e241ab7225841b6eaecdc13b9e388c0 mono-1.0.2-r1.ebuild 2105
-MD5 26317aacf9df52a5fa9bc0efa96264ec ChangeLog 10682
+MD5 7fd3d4fb533a724f7b3910b56dbe83e6 ChangeLog 10843
 MD5 aadef171728e37af3ca21aaf6a81df65 mono-1.0.5.ebuild 1525
 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 4645d857fac25de683025cd76be5949886acc55e..f675611c9cba877e3e1e43ed273cacb8982b9f0e 100644 (file)
--- 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-2004 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.1 2004/12/21 01:14:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r2.ebuild,v 1.2 2004/12/21 04:43:34 latexer Exp $
 
 inherit eutils mono flag-o-matic debug
 
@@ -45,6 +45,11 @@ src_unpack() {
                sed -i "s:\.\.\\\\\\\\:../:g" "${file}"
        done
 
+       # Fix MONO_CFG_DIR for signing
+       sed -i \
+               "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \
+               ${MCS_S}/build/library.make
+
        # add our own little in-place mcs script
        echo "${S}/mono/mini/mono ${S}/runtime/mcs.exe \"\$@\" " > ${S}/runtime/mcs
        chmod +x ${S}/runtime/mcs

diff --git a/dev-dotnet/mono/mono-1.0.5-r3.ebuild b/dev-dotnet/mono/mono-1.0.5-r3.ebuild
index 5c83b4eb2dbae2a6ab30cf5bf42bda88fb8ad41d..037a8afe242f5cf65ebb69e7ef638d0ec4d7e673 100644 (file)
--- 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-2004 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.1 2004/12/21 01:14:54 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/mono/mono-1.0.5-r3.ebuild,v 1.2 2004/12/21 04:43:34 latexer Exp $
 
 inherit eutils mono flag-o-matic debug gcc
 
@@ -47,6 +47,11 @@ src_unpack() {
                sed -i "s:\.\.\\\\\\\\:../:g" "${file}"
        done
 
+       # Fix MONO_CFG_DIR for signing
+       sed -i \
+               "s:^\t\(MONO.*SNK)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \
+               ${MCS_S}/build/library.make
+
        # add our own little in-place mcs script
        echo "${S}/mono/mini/mono ${S}/runtime/mcs.exe \"\$@\" " > ${S}/runtime/mcs
        chmod +x ${S}/runtime/mcs