dev-ml/mlgmpid: mpfr-3.0.0 compatibility

5 files changed, 43 insertions, 30 deletions

diff --git a/dev-ml/mlgmpidl/ChangeLog b/dev-ml/mlgmpidl/ChangeLog
index b7315f9ff..7fb3a3c06 100644
--- a/dev-ml/mlgmpidl/ChangeLog
+++ b/dev-ml/mlgmpidl/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  mlgmpidl-1.1.ebuild, +files/mlgmpidl-1.1-mpfr-3_compat.patch:
+  dev-libs/mpfr-3.0.0 compatibility
+
   23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   mlgmpidl-1.1.ebuild, +metadata.xml:
   QA fixes
diff --git a/dev-ml/mlgmpidl/Manifest b/dev-ml/mlgmpidl/Manifest
index 38d79ec0c..dcb0c8e03 100644
--- a/dev-ml/mlgmpidl/Manifest
+++ b/dev-ml/mlgmpidl/Manifest
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mlgmpidl-1.1-mpfr-3_compat.patch 496 RMD160 87a9cad8c449643be14d1253905c4a0900738899 SHA1 0b8ad163c5698ae19f87bb6bb90b42972f48205d SHA256 d888a1ad0930895ef2ec83bef6eef5a39ed18a38aa3a637f33b61b9a20d19e2b
 DIST mlgmpidl-1.1.tgz 194002 RMD160 752c865e5355b40f9b3c9babf0c9c378cb3b4009 SHA1 ef26eaa215ccedbfc20c00614f702a06d3a70420 SHA256 8990a56f4c1ff701bb922bacf7f23b40539d123216ac5f9fe0f35967735d6fc9
-EBUILD mlgmpidl-1.1.ebuild 1267 RMD160 ca763b888082e54ec64cdca44861e32a26cf7e61 SHA1 32d6144861e96bc12f27ea494c5e8f03f3bd579b SHA256 a8f95678f3de7c367aa608b7a5be82254c07ed9d0a11080ffe7a4e8a6599676b
-MISC ChangeLog 232 RMD160 0b974ca08b5ff68c4f6459a81616605fe240a144 SHA1 a5f079576870171f284677e549a15c3fe0a49374 SHA256 7494c80d1ea1d2a97c3146241028d2e926098d006b166423092c5b120ff563a1
-MISC metadata.xml 360 RMD160 c47404a67e2615a34a3ce4e1cd33d2de28186089 SHA1 f99a716cd788eaef4030471f445edaa33df064e5 SHA256 6e86d1e365a9faa5d7410f103cf94f1b7d2c345d68fc58914ada30fbcdb64512
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMIlUVAAoJENwGBM22xffetRoP/135OTwSEFHJzquI0VrBEipd
-cwk5JcJ0Ld3l1z6o/OZ1F/mGsbxWX4G8/LXJjBewSHQjf+smYKywoyxLcYuE6e7m
-XB3xlGaqR/fJlHOQMO6G6JqZ8riT/JOqd5MA6PaO+L/5mpnZ7QD31qfLATP0rIMa
-EOvsKtbw2rWJ6D0OiCZ1CM3/Rrf818WJDF4gLehfq9y5kEoDHFOhi4QmvBcjmq+F
-NONuAlyB+iVq9Ko4TqF06gckOIUoSyUv8Q08WPZJifKRk+PaufQr0aeb6k0Z/QPo
-W8EdpdLPC1RQVF9o2RCik/YYtkEW8qD4dgccgMSsgopTNr5Ki5oD/z7plPWX8LOs
-1douWHCj5U1ivNzoPPhxP1yYC+qVjl68VKH+mx8+ZQTPYtV8/fCbSEVoRARvgFPn
-8xiAzcg5GX9DwZD7SGWmGw2vrKBAFbKx/6zkykQK4v/sJd2BsLXpIud9DtvXIolF
-C5Pm9hQHYciBO17Debepg/CZAsFwkfT3siOVAcF9vHeOlc9zOym4DN8Cc+1n6P9Q
-NHQhFolzzJNcx7gDOnCSTehx02SXfA8iFv/VvVo+2WIzAobsqChCX1Fmui7uDIsS
-8e6VybXN3fg3JLaaVVjnQ3Mwp+YC7GFMv0lFEwvw31+Rx0N9Y2lPSZJgNhhRSKCT
-88728uLHzQg4WIMgUYOr
-=Tflp
------END PGP SIGNATURE-----
+EBUILD mlgmpidl-1.1.ebuild 1315 RMD160 166d9e21af4d404d51f3a3ad47edcdeca96437ce SHA1 acf5c4c569e651ffec05ac679d8d8a398969ef2e SHA256 2dfec91b30b5cbc05d3553da15fe126d522a117297be04e686052cb07252f49a
+MISC ChangeLog 380 RMD160 18bb9c76419ff5a522e95412b983357f0e7ebdad SHA1 c7ce6c23f0700f92089e1c8d2fd2a163578ba210 SHA256 4104e42798187a33dd54889b0c078ffa9bbe44203d19a982956ec9113c073330
+MISC metadata.xml 629 RMD160 e1be104bd63812ee41bb3dfee175e1605e582b15 SHA1 466cd3b727bceb9bdc0eb5dbc2e6dc9807c7ff69 SHA256 c430bdc6e03131ed1ce7f991f1ad0d9fd641be877a5bd089da1179fa8d10eb1a
diff --git a/dev-ml/mlgmpidl/files/mlgmpidl-1.1-mpfr-3_compat.patch b/dev-ml/mlgmpidl/files/mlgmpidl-1.1-mpfr-3_compat.patch
new file mode 100644
index 000000000..efb07559d
--- /dev/null
+++ b/dev-ml/mlgmpidl/files/mlgmpidl-1.1-mpfr-3_compat.patch
@@ -0,0 +1,20 @@
+diff -Naurp mlgmpidl/gmp_caml.h mlgmpidl2/gmp_caml.h
+--- mlgmpidl/gmp_caml.h	2007-07-11 13:29:31.000000000 +0000
++++ mlgmpidl2/gmp_caml.h	2010-07-03 16:09:33.000000000 +0000
+@@ -14,6 +14,16 @@
+ #if defined(HAS_MPFR)
+ #if HAS_MPFR!=0
+ #include "mpfr.h"
++#ifndef GMP_RND_MAX
++#define GMP_RND_MAX (MPFR_RNDNA - 1)
++#define mpfr_random(x)	\
++	{\
++		gmp_randstate_t s;\
++		gmp_randinit_default(s);\
++		mpfr_urandomb(x,s);\
++		gmp_randclear(s);\
++	}
++#endif
+ #endif
+ #endif
+ #include "caml/mlvalues.h"
diff --git a/dev-ml/mlgmpidl/metadata.xml b/dev-ml/mlgmpidl/metadata.xml
index 009fac2e7..c6107f8e5 100644
--- a/dev-ml/mlgmpidl/metadata.xml
+++ b/dev-ml/mlgmpidl/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>sci@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="mpfr">add support for mpfr, the library for multiple-precision floating-point computations with exact rounding</flag>
-</use>
+	<herd>sci</herd>
+	<longdescription>
+		MLGMPIDL is a package offering an interface to the GMP and MPFR
+		libraries for OCaml version 3.07 or higher. The interface offers access
+		to almost all the functions of the library, and is decomposed into 7
+		submodules.
+	</longdescription>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="mpfr">add support for mpfr, the library for multiple-precision floating-point computations with exact rounding</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
index e610136fc..a060e106f 100644
--- a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
+++ b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
@@ -36,6 +36,8 @@ src_prepare() {
 	if use !mpfr; then
 		sed -i -e "s/HAS_MPFR=1/#HAS_MPFR=0/g" Makefile.config
 	fi
+
+	epatch "${FILESDIR}/${P}-mpfr-3_compat.patch"
 }
 
 src_compile() {