dev-lang/mono: Fixed mono re-emerging bug (#146424)

Package-Manager: portage-2.1.2.7

5 files changed, 39 insertions, 25 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 917ae17c845f..2bdca58bb093 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.113 2007/05/29 19:36:04 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.114 2007/05/31 19:29:27 jurek Exp $
+
+  31 May 2007; Jurek Bartuszek <jurek@gentoo.org> mono-1.1.16.1.ebuild,
+  mono-1.2.3.1.ebuild, mono-1.2.4.ebuild:
+  Fixed mono re-emerging bug (#146424). Credit goes to Raja R Harinath
+  <rharinath@novell.com> for proposing the solution.
 
   29 May 2007; Jurek Bartuszek <jurek@gentoo.org> mono-1.2.4.ebuild:
   Fixed typo (bug #180192)
@@ -45,7 +50,7 @@
   -mono-1.1.18-r1.ebuild, -mono-1.2.ebuild, -mono-1.2.1.ebuild:
   Long overdue cleaning of mono ebuilds. 1.1.16.1 left for visual basic
 
-  14 Jan 2007; Olivier Crête <tester@gentoo.org> mono-1.2.2.1.ebuild:
+  14 Jan 2007; Olivier CrĂŞte <tester@gentoo.org> mono-1.2.2.1.ebuild:
   Stable on amd64 per bug #159886
 
   08 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org> mono-1.2.2.1.ebuild:
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index ee37380e4077..c649af0546cb 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -6,26 +6,26 @@ DIST mono-1.1.16.1.tar.gz 19115095 RMD160 3ccf59d5e8f3e7ce74bccd495d7a8413a0fdce
 DIST mono-1.2.2.1.tar.gz 19979026 RMD160 d55d5627bb3fe4b8c4e4640aecca32713cba3e7f SHA1 d956f293d297d4ee550c6877b6b468259dac126f SHA256 d68f597c303678c3f325f552a0e2780b613dbf34d093c2269c002127be4953e5
 DIST mono-1.2.3.1.tar.gz 20694945 RMD160 0dd046f12041553bc943269ef4e0a93f145c57ca SHA1 9de19e0a29ea47857090d9d2c19168f67152da41 SHA256 b177ced4e3ec0c2efc6a4e17f1f87f6e852f319332d4f138d25d4a68ffba2c78
 DIST mono-1.2.4.tar.bz2 17146737 RMD160 f8886b7690dde27c433484fcfaff1913c60a874a SHA1 b09aaf583f203cd6aaf511fb1f17ed356dbaa586 SHA256 780987a48256e6aff4206364a59f131a9aafbd5e3aa36694380d27b1d955176c
-EBUILD mono-1.1.16.1.ebuild 2527 RMD160 e5192a579ca50d28a85113910cfa116f33b58adb SHA1 b483a27a553c3f61b6f23e9f3cc72741b5f62d13 SHA256 86a1c26327c04467ce43c01c56c93603b3f737d865c6ae3b20704a3658374557
-MD5 1ee93923e5d6c22e96e8c53b49126c7d mono-1.1.16.1.ebuild 2527
-RMD160 e5192a579ca50d28a85113910cfa116f33b58adb mono-1.1.16.1.ebuild 2527
-SHA256 86a1c26327c04467ce43c01c56c93603b3f737d865c6ae3b20704a3658374557 mono-1.1.16.1.ebuild 2527
+EBUILD mono-1.1.16.1.ebuild 2664 RMD160 79f4c0a056c91172997c7b53271d2a576cc49f0a SHA1 30bddbcf5e4ef8b4e7fd1ba362cae6f0d6c73c64 SHA256 97fdd713af542aae779a2c61b1f03be1463488e4a38ddb45b564defbba00599c
+MD5 d97cd3a0c3d3a4e387e5ef67b60e906b mono-1.1.16.1.ebuild 2664
+RMD160 79f4c0a056c91172997c7b53271d2a576cc49f0a mono-1.1.16.1.ebuild 2664
+SHA256 97fdd713af542aae779a2c61b1f03be1463488e4a38ddb45b564defbba00599c mono-1.1.16.1.ebuild 2664
 EBUILD mono-1.2.2.1.ebuild 2843 RMD160 71942878fbf8e2c0a53f0e63c3e268f4f20c29b4 SHA1 fe03a091fc32752b93d5b5348ead5470739de437 SHA256 05345790e9b85465984e3a33c780b22735cc1996d4eab1af5f025c325c0608f9
 MD5 6387a59b2315db00b44d7f18368aa0a7 mono-1.2.2.1.ebuild 2843
 RMD160 71942878fbf8e2c0a53f0e63c3e268f4f20c29b4 mono-1.2.2.1.ebuild 2843
 SHA256 05345790e9b85465984e3a33c780b22735cc1996d4eab1af5f025c325c0608f9 mono-1.2.2.1.ebuild 2843
-EBUILD mono-1.2.3.1.ebuild 2865 RMD160 6b7c4aa79234d98c01ab66aae153b24e38417d71 SHA1 1a89449715fad77465ced41f251ffd97554962b6 SHA256 9e15885daf2cb770c49f21a7991510caafb15db5cc7a60d5c94ba5b6ff3acd58
-MD5 cbcc5bee423eac85ac1d76c3fa65403b mono-1.2.3.1.ebuild 2865
-RMD160 6b7c4aa79234d98c01ab66aae153b24e38417d71 mono-1.2.3.1.ebuild 2865
-SHA256 9e15885daf2cb770c49f21a7991510caafb15db5cc7a60d5c94ba5b6ff3acd58 mono-1.2.3.1.ebuild 2865
-EBUILD mono-1.2.4.ebuild 2803 RMD160 fcfea55fa89e2b0141065958206a094cf302d1a7 SHA1 22d4318ecc742660395f170e9499116470c0d47c SHA256 25e6bc16e460a78fbb4f8fee685940518819fc2000f37e67bc13be98fd2c46dc
-MD5 a47aa8892c562fce70a9ed651f37d4e1 mono-1.2.4.ebuild 2803
-RMD160 fcfea55fa89e2b0141065958206a094cf302d1a7 mono-1.2.4.ebuild 2803
-SHA256 25e6bc16e460a78fbb4f8fee685940518819fc2000f37e67bc13be98fd2c46dc mono-1.2.4.ebuild 2803
-MISC ChangeLog 26608 RMD160 91429ef1236ac5e85e036f899efe051ec7633e70 SHA1 860f29ce66c67ad17b2a74d23e22435bceb61958 SHA256 6123525d8206b924fa2d1016581840f4d1367d41e9aaf5e0343765461afede70
-MD5 d8b4fa83d72fb03a991a328065731a49 ChangeLog 26608
-RMD160 91429ef1236ac5e85e036f899efe051ec7633e70 ChangeLog 26608
-SHA256 6123525d8206b924fa2d1016581840f4d1367d41e9aaf5e0343765461afede70 ChangeLog 26608
+EBUILD mono-1.2.3.1.ebuild 3011 RMD160 97d7a2bdf65b9a347d914a2fa2dc6a7b25ac455f SHA1 eadd874ddab85ebd20b0344e3c168db43c9205d3 SHA256 7faa746ead9305c5cda42a6ed154ea7c0077ef1cfb84054b476ef6105dcb1af9
+MD5 8fbfb955bf3d8996772bf30815de7718 mono-1.2.3.1.ebuild 3011
+RMD160 97d7a2bdf65b9a347d914a2fa2dc6a7b25ac455f mono-1.2.3.1.ebuild 3011
+SHA256 7faa746ead9305c5cda42a6ed154ea7c0077ef1cfb84054b476ef6105dcb1af9 mono-1.2.3.1.ebuild 3011
+EBUILD mono-1.2.4.ebuild 2948 RMD160 b594374904e8bce69c2d8746424e2518ca4334bb SHA1 ad8e3c44dcdfed63330899bed5cf7169d3acb38d SHA256 a4f98bd930567df9d1c320b808f60d4c3f17d0757cb4eaaced6cd275e936f90f
+MD5 999f375b528fa5eb153c6b4226cbd43d mono-1.2.4.ebuild 2948
+RMD160 b594374904e8bce69c2d8746424e2518ca4334bb mono-1.2.4.ebuild 2948
+SHA256 a4f98bd930567df9d1c320b808f60d4c3f17d0757cb4eaaced6cd275e936f90f mono-1.2.4.ebuild 2948
+MISC ChangeLog 26849 RMD160 bbdd86372fd75d3fdcbaf7894f5119989d7fe051 SHA1 2a558f15307ac555130c5c3b4cde4f68c06c0f9a SHA256 579f3881ea86c2b8ecc856a96c95acc43efcc366c7f0a0f913d97d37766bb345
+MD5 175e7b6379e5efd375d2f760868bfcc3 ChangeLog 26849
+RMD160 bbdd86372fd75d3fdcbaf7894f5119989d7fe051 ChangeLog 26849
+SHA256 579f3881ea86c2b8ecc856a96c95acc43efcc366c7f0a0f913d97d37766bb345 ChangeLog 26849
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 metadata.xml 159
diff --git a/dev-lang/mono/mono-1.1.16.1.ebuild b/dev-lang/mono/mono-1.1.16.1.ebuild
index 7f9c9b9f32a5..d38fb8038804 100644
--- a/dev-lang/mono/mono-1.1.16.1.ebuild
+++ b/dev-lang/mono/mono-1.1.16.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.16.1.ebuild,v 1.2 2006/07/12 21:04:30 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.16.1.ebuild,v 1.3 2007/05/31 19:29:27 jurek Exp $
 
 inherit eutils mono flag-o-matic multilib autotools
 
@@ -76,7 +76,10 @@ src_compile() {
 	# with old buggy classlibs/mcs versions. See bug #118062
 	touch ${S}/mcs/build/deps/use-monolite
 	econf ${myconf} || die
-	emake -j1 || die "MONO compilation failure"
+
+	# Force LC_ALL=C and the use of internal mcs/mono to prevent issues with
+	# I18N.dll (bug #146424)
+	LC_ALL=C emake -j1 EXTERNAL_MCS=false EXTERNAL_MONO=false || die "compile failed"
 }
 
 src_install() {
diff --git a/dev-lang/mono/mono-1.2.3.1.ebuild b/dev-lang/mono/mono-1.2.3.1.ebuild
index 00fceccffc71..2bc2ba48c6ef 100644
--- a/dev-lang/mono/mono-1.2.3.1.ebuild
+++ b/dev-lang/mono/mono-1.2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.3.1.ebuild,v 1.2 2007/04/30 17:23:11 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.3.1.ebuild,v 1.3 2007/05/31 19:29:27 jurek Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -87,7 +87,10 @@ src_compile() {
 	touch ${S}/mcs/build/deps/use-monolite
 
 	econf ${myconf} || die "configure failed"
-	emake || die "compile failed"
+
+	# Force LC_ALL=C and the use of internal mcs/mono to prevent issues with
+	# I18N.dll (bug #146424)
+	LC_ALL=C emake EXTERNAL_MCS=false EXTERNAL_MONO=false || die "compile failed"
 }
 
 src_install() {
diff --git a/dev-lang/mono/mono-1.2.4.ebuild b/dev-lang/mono/mono-1.2.4.ebuild
index 8a98140bf5be..17815c682773 100644
--- a/dev-lang/mono/mono-1.2.4.ebuild
+++ b/dev-lang/mono/mono-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.4.ebuild,v 1.3 2007/05/29 19:36:04 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.2.4.ebuild,v 1.4 2007/05/31 19:29:27 jurek Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -83,7 +83,10 @@ src_compile() {
 	touch ${S}/mcs/build/deps/use-monolite
 
 	econf ${myconf} || die "configure failed"
-	emake -j1 || die "compile failed"
+
+	# Force LC_ALL=C and the use of internal mcs/mono to prevent issues with
+	# I18N.dll (bug #146424)
+	LC_ALL=C emake EXTERNAL_MCS=false EXTERNAL_MONO=false || die "compile failed"
 }
 
 src_install() {