Test char.det_from_char() when checking for bootstrappable mmc

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 22 insertions, 4 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 90526506b875..ffe9974d201d 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.115 2010/09/05 05:48:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.116 2010/09/12 03:17:24 keri Exp $
+
+  12 Sep 2010; <keri@gentoo.org> mercury-10.04.1.ebuild,
+  +files/mercury-10.04.1-char-det-from-int.patch:
+  Test char.det_from_char() when checking for bootstrappable mmc
 
 *mercury-10.04.1 (05 Sep 2010)
 
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 19f8c2c84993..32f04249ffe5 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -21,6 +21,7 @@ AUX mercury-10.04-tests-sandbox.patch 2932 RMD160 2cb2b82e4d282c31ecfd350e732f5c
 AUX mercury-10.04-tests-static-link.patch 568 RMD160 72a38e289d1e7f76e4dfdae21c42322d452b8fcf SHA1 76b78ee37ac2b3ef4ddc804485d7bd10a9720dff SHA256 f37e8399aed753a947062d40573ba5205ef62ecfbbe87ecb8632cf1895002663
 AUX mercury-10.04-tests-workspace.patch 1058 RMD160 34f0623fdf595bdd4c098cf57573178a622fc4e4 SHA1 e6afeec2e55d8b61dbf6359fb03289534059f86c SHA256 7551204ad0bd0fdbe6b17d29bd44d7ab4ae5a1f1b51d32391e368bbb747a3d1d
 AUX mercury-10.04.1-boehm_gc.patch 5932 RMD160 a7432297f4a03af8072444f05d1f3a22282620cb SHA1 c98916c2459e677b34e6fbfbd163a89a4571b22b SHA256 eb88c6a4560e6bb7adf2b27271543bdd4bc9b69bde726109ef719fcaeb48585a
+AUX mercury-10.04.1-char-det-from-int.patch 499 RMD160 39c971c8694aeb5c644d40b55e994b00c4d0615b SHA1 34d6177c0fbc2a4f6d541f48038abe05ab64daca SHA256 8586424eee7d23632b9a7a3ff336404edfb8a755d62cdb9e31b6355f5dfcc506
 AUX mercury-10.04.1-default-grade.patch 9273 RMD160 d66b819f9a21e07de7cccda39c64c87c5cb2f1da SHA1 459b5340fd57035843a85b883432c2a96ca6b5f4 SHA256 41b5329f001812584eba7b9a70553cc09bfaff9c66baff2a64305625111942ee
 AUX mercury-10.04.1-docs.patch 890 RMD160 03cbff1254b61261cbca8fa2d518f02c3544bf42 SHA1 327891efea1c84d68326564e435ea093b91fc262 SHA256 492b3a92e93359330648f51f8b82d9d8b7addb22ba56bd7bfc8489aaedbc1764
 AUX mercury-10.04.1-linker-flags.patch 3661 RMD160 ad568f11077e30a4dadfd96a31b32bdf832c00e0 SHA1 235e88def696d2588a0ea7ede2df15cfafc276dd SHA256 3a4d1cceffcb5e659a0e7910a1d538099bd1c6aded524d67c8d4854c4f359d2f
@@ -49,8 +50,8 @@ DIST mercury-tests-10.04.1.tar.gz 1332741 RMD160 e7880a095d071f4fcdce69f9e656e67
 DIST mercury-tests-10.04.tar.gz 1329423 RMD160 c85e489eea4e36fef6d12fb9bf4e7cd01bb2e7fd SHA1 32ca9267d58d2cbb7d144c1501803f0a7b92f145 SHA256 d56a76b4a2c8c2cc878b7a7cd04fd34b4069cef1316155a942f4372425d45085
 EBUILD mercury-0.13.1-r2.ebuild 3350 RMD160 8a1635d8c301751b2da7260785baaa788b81b620 SHA1 2aae241faf85518b6bb6d162939b2f293eb67649 SHA256 af0a034331b9a7acb0d0a7dea42fc84aafcf9e66de2b6fceddc623f975689c44
 EBUILD mercury-10.04-r1.ebuild 4397 RMD160 ac0c5f73a0468ad0b975c7b4e45fd962cd3d1b42 SHA1 b7d1d4b635f916f1be1a4fc496c2d80f9949ab30 SHA256 55dfdb3ae95f0dfc74014d2f87085d568316c84d78d74805e30c8674f8ece543
-EBUILD mercury-10.04.1.ebuild 4724 RMD160 a4d46cd3f895f42d278e1b3b3ef98e6103bac624 SHA1 127e2eec5f21a63e385c100dd4f1c795668cf24c SHA256 733576e06b1aeda4ff904967f0a39a4106ecfc4221e72cf1ccdeea765388518c
+EBUILD mercury-10.04.1.ebuild 4775 RMD160 28585e703f832487d41f09c1c2faaaf1bd964599 SHA1 cf7ade7b40c8595d28da3c55eb20b7ee40b1c521 SHA256 55699c4544b0cd97e2103bc555db6034bce40231f0a583310602cfe531d4f1dc
 EBUILD mercury-10.04.ebuild 4150 RMD160 565ad36c8253f0da62f6a4256cbf45d2655a6223 SHA1 3f6363b22b7b4dcd0fe731f404d6d8dadb6cebff SHA256 943ee918a3113d45d268f4091de5a0767d05e99194f121771ce43c3a9c71eba0
 EBUILD mercury-10.04_beta1.ebuild 3561 RMD160 b608b732acdfccb4a8ccdc4728bdd0b9f3f28283 SHA1 319302199665f6e4ffa9aaff95128fcd8a7d63a0 SHA256 ffbba59515166327f79a698086d516f14fcbcfc8c76f58dbf1116eaa8eb16626
-MISC ChangeLog 23479 RMD160 7e944cd7314b7cd7540326ff951266a3aa11f56a SHA1 c0df9030bf125a9365e13508507c3adb390be143 SHA256 55327150e8c594f01e4ae5c4be74149552c56821ff0d23ec7ab902b5195cdc97
+MISC ChangeLog 23652 RMD160 b3aa01f59b8abea586219653ad7ffe3579644f33 SHA1 1e2754c9d0b46df34fef7e443198ca1c796714df SHA256 4db07df86653c308d3aba20ae3340680c765926fc147d723056ede725a7e2ccf
 MISC metadata.xml 318 RMD160 b9e62c5b9d04f43a6570cfcadd6a6c9a2b9e3f6f SHA1 67893d667419e727696eb2c386565794fd137418 SHA256 5e64767eb2ff6b10d88b169c87648d62b534356fb94c5407a253aeafc2d16935
diff --git a/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
new file mode 100644
index 000000000000..6440854baf8d
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-10.04.1-char-det-from-int.patch
@@ -0,0 +1,12 @@
+--- mercury-compiler-10.04.1.orig/configure	2010-08-29 19:27:34.000000000 +1200
++++ mercury-compiler-10.04.1/configure	2010-09-12 12:59:51.000000000 +1200
+@@ -3412,7 +3412,8 @@
+                 Version >= 8,
+                 ac(2) ^ elem(3, 5) = 17,
+                 (1 .. 2) = [1, 2],
+-                Global = 561
++                Global = 561,
++                char.det_from_int(255) = '\xFF\'
+             ->
+                 trace [io(!S)] (
+                     io.print("Hello, world\n", !S)
diff --git a/dev-lang/mercury/mercury-10.04.1.ebuild b/dev-lang/mercury/mercury-10.04.1.ebuild
index 1bf5b643cdc1..2b0e1de3eab2 100644
--- a/dev-lang/mercury/mercury-10.04.1.ebuild
+++ b/dev-lang/mercury/mercury-10.04.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.1 2010/09/05 05:48:09 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04.1.ebuild,v 1.2 2010/09/12 03:17:24 keri Exp $
 
 inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
 
@@ -39,6 +39,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-default-grade.patch
 	epatch "${FILESDIR}"/${P}-boehm_gc.patch
 	epatch "${FILESDIR}"/${P}-sparc-llds-base-grade.patch
+	epatch "${FILESDIR}"/${P}-char-det-from-int.patch
 	epatch "${FILESDIR}"/${P}-docs.patch
 	epatch "${FILESDIR}"/${P}-no-reconf.patch