Fix Bug 452558 - dev-lang/mlton-20100608 fails to build, unknown type name '__gmp_const'. Fixed by upstream: https://github.com/MLton/mlton/commit/a658a1f4a76a01f568116598800f49b80cf8ee1a

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

3 files changed, 46 insertions, 6 deletions

diff --git a/dev-lang/mlton/ChangeLog b/dev-lang/mlton/ChangeLog
index 8f04b87d2a4f..45f6803eba61 100644
--- a/dev-lang/mlton/ChangeLog
+++ b/dev-lang/mlton/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mlton
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.13 2012/12/14 11:09:19 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/ChangeLog,v 1.14 2013/04/25 07:27:21 gienah Exp $
+
+  25 Apr 2013; Mark Wright <gienah@gentoo.org>
+  +files/mlton-20100608-gmp-const.patch, mlton-20100608.ebuild:
+  Fix Bug 452558 - dev-lang/mlton-20100608 fails to build, unknown type name
+  '__gmp_const'.  Fixed by upstream:
+  https://github.com/MLton/mlton/commit/a658a1f4a76a01f568116598800f49b80cf8ee1a
 
   14 Dec 2012; Ulrich Müller <ulm@gentoo.org> mlton-20100608.ebuild:
   Fix LICENSE, see files in doc/license directory, bug 444982.
@@ -56,4 +62,3 @@
   10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> metadata.xml,
   mlton-20040227.ebuild, files/mlton-20040227-obsolete-flags.patch:
   New ebuild for source version of mlton (requires mlton-bin to compile).
-
diff --git a/dev-lang/mlton/files/mlton-20100608-gmp-const.patch b/dev-lang/mlton/files/mlton-20100608-gmp-const.patch
new file mode 100644
index 000000000000..df95704e8dcf
--- /dev/null
+++ b/dev-lang/mlton/files/mlton-20100608-gmp-const.patch
@@ -0,0 +1,31 @@
+--- mlton-20100608-orig/runtime/gc/int-inf.c	2010-06-11 23:35:14.000000000 +1000
++++ mlton-20100608/runtime/gc/int-inf.c	2013-04-25 16:45:45.528297232 +1000
+@@ -177,8 +177,8 @@
+ 
+ static inline objptr binary (objptr lhs, objptr rhs, size_t bytes,
+                              void(*binop)(__mpz_struct *resmpz,
+-                                          __gmp_const __mpz_struct *lhsspace,
+-                                          __gmp_const __mpz_struct *rhsspace)) {
++                                          const __mpz_struct *lhsspace,
++                                          const __mpz_struct *rhsspace)) {
+   __mpz_struct lhsmpz, rhsmpz, resmpz;
+   mp_limb_t lhsspace[LIMBS_PER_OBJPTR + 1], rhsspace[LIMBS_PER_OBJPTR + 1];
+ 
+@@ -254,7 +254,7 @@
+ 
+ static objptr unary (objptr arg, size_t bytes,
+                      void(*unop)(__mpz_struct *resmpz,
+-                                 __gmp_const __mpz_struct *argspace)) {
++                                 const __mpz_struct *argspace)) {
+   __mpz_struct argmpz, resmpz;
+  mp_limb_t argspace[LIMBS_PER_OBJPTR + 1];
+ 
+@@ -280,7 +280,7 @@
+ 
+ static objptr shary (objptr arg, Word32_t shift, size_t bytes,
+                      void(*shop)(__mpz_struct *resmpz,
+-                                 __gmp_const __mpz_struct *argspace,
++                                 const __mpz_struct *argspace,
+                                  unsigned long shift))
+ {
+   __mpz_struct argmpz, resmpz;
diff --git a/dev-lang/mlton/mlton-20100608.ebuild b/dev-lang/mlton/mlton-20100608.ebuild
index 6c6c3f606003..5f52dbb16670 100644
--- a/dev-lang/mlton/mlton-20100608.ebuild
+++ b/dev-lang/mlton/mlton-20100608.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20100608.ebuild,v 1.2 2012/12/14 11:09:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mlton/mlton-20100608.ebuild,v 1.3 2013/04/25 07:27:21 gienah Exp $
 
-inherit eutils
+inherit base eutils
 
 DESCRIPTION="Standard ML optimizing compiler and libraries"
 BASE_URI="mirror://sourceforge/${PN}"
@@ -32,6 +32,10 @@ QA_PRESTRIPPED="binary? (
 	usr/lib/mlton/mlton-compile
 )"
 
+# Fix Bug 452558 - dev-lang/mlton-20100608 fails to build, unknown type name '__gmp_const'
+# Fixed by upstream: https://github.com/MLton/mlton/commit/a658a1f4a76a01f568116598800f49b80cf8ee1a
+PATCHES=("${FILESDIR}/${P}-gmp-const.patch")
+
 src_compile() {
 	if use !binary; then
 		has_version dev-lang/mlton || die "emerge with binary use flag first"