13 files changed, 140 insertions, 99 deletions
diff --git a/dev-ml/mlgmpidl/ChangeLog b/dev-ml/mlgmpidl/ChangeLog
index 7fb3a3c06..0b8e69c49 100644
--- a/dev-ml/mlgmpidl/ChangeLog
+++ b/dev-ml/mlgmpidl/ChangeLog
@@ -2,7 +2,7 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  03 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  03 Jul 2010; Jonathan-Christofer Demay <jcdemay@gmail.com>
   mlgmpidl-1.1.ebuild, +files/mlgmpidl-1.1-mpfr-3_compat.patch:
   dev-libs/mpfr-3.0.0 compatibility
 
diff --git a/dev-ml/mlgmpidl/Manifest b/dev-ml/mlgmpidl/Manifest
index e3fb55977..81f2b7f30 100644
--- a/dev-ml/mlgmpidl/Manifest
+++ b/dev-ml/mlgmpidl/Manifest
@@ -1 +1,5 @@
+AUX mlgmpidl-1.1-mpfr-3_compat.patch 496 SHA256 d888a1ad0930895ef2ec83bef6eef5a39ed18a38aa3a637f33b61b9a20d19e2b SHA512 b4979e4dbf1cc5aa1fba5ffb08557c6c32d16e4d2c3ae1fc14d999e52231efb344524e1dc2d6612021a0b4dba4b5f6d1394316abff4698f58d5decc3ff417cbf WHIRLPOOL a3f1c218c2de8413042f56f1de2a6257a895a44edd16daa0e301a20426da0c0275685e440d039d8db39b79853617c54b68002c4d5dd2b63a9d22a9341d987a7d
 DIST mlgmpidl-1.1.tgz 194002 SHA256 8990a56f4c1ff701bb922bacf7f23b40539d123216ac5f9fe0f35967735d6fc9
+EBUILD mlgmpidl-1.1.ebuild 1311 SHA256 756c0655b0045c2e8c2c4072f113023dd70d6e27dd31059db234df7ca586d188 SHA512 493266916193940b1701aea85cbb447e154820113b87ec87319d3ffd11689c08b3a77d5fd8e8c9290b05141ac83707f68ff97e2ba6b5050796b58aa11bc68c1e WHIRLPOOL 1861032f03cf71ec5c6d025c0f2f17964cf07822425d8fca1d1e19c1755ee9d985bc689f49ce123ebdd95f1b682c1c1a00d818900cb6ddae3cf550ae2596010d
+MISC ChangeLog 394 SHA256 ec34f25ee458e0ce79b7209a31cfbb9e40975cc3e22e7b97fc9fc57372c9a549 SHA512 eafca747c958cb036ae7dfbd068d8be9c6db76342d42d458c886fc8dc1677d6b5d9bb758da7e138bc89c87816a58ddc50eabf115b5b9a41dfdca8ff3d5bd73eb WHIRLPOOL da7983220947c85972e778061bff3b0612a2de7a39a343a88ef204a6235050b32b8b3a791f485ba187b819f97adb88811c7437cc47096b5f723644ffabd3364b
+MISC metadata.xml 629 SHA256 c430bdc6e03131ed1ce7f991f1ad0d9fd641be877a5bd089da1179fa8d10eb1a SHA512 a5c827b6e812cc96befabb965377723eae2468e8d7ad8f3ae00c6c3ad70d459301225b8f76105ed8f02bdd2f261407b4d2dbd4fab1b1d17806fba0d14f1663b2 WHIRLPOOL 1fb51759a7409d3d3cc8178c3f4db215fb7fbb350bbe6c5314292f303749f1a655bcf0375c3960e9d86506a7981bbede2b9d2beffb5bd2fe861d02a9c7b081d9
diff --git a/dev-ml/mlgmpidl/metadata.xml b/dev-ml/mlgmpidl/metadata.xml
index a3fac8132..c6107f8e5 100644
--- a/dev-ml/mlgmpidl/metadata.xml
+++ b/dev-ml/mlgmpidl/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</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>
-<use>
-  <flag name="mpfr">Add support for <pkg>dev-libs/mpfr</pkg></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 a2bf2eec4..6efca0c5f 100644
--- a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
+++ b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/20228/${PN}-${PV}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +mpfr"
 
 DEPEND=">=dev-lang/ocaml-3.09
@@ -49,7 +49,7 @@ src_compile() {
 }
 
 src_install(){
-	emake install DESTDIR="${D}" || die "emake install failed"
+	DESTDIR="${D}" emake install || die "emake install failed"
 	dodoc README
 
 	if use doc; then
diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 18e109637..42f0c5b82 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -1,24 +1,32 @@
 # ChangeLog for dev-ml/ocamlgraph
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  14 Jan 2013; J.-C. Demay <jcdemay@gmail.com>
-  +ocamlgraph-1.8.2.ebuild, +ocamlgraph-1.8.1.ebuild:
+  21 Jun 2014; Jonathan-Christofer Demay  <jcdemay@gmail.com>
+  -ocamlgraph-1.8.3.ebuild, +ocamlgraph-1.8.5.ebuild:
   version bump
 
-  21 Dec 2011; J.-C. Demay <jcdemay@gmail.com>
+  10 Jan 2014; Jonathan-Christofer Demay <jcdemay@gmail.com>
+  -ocamlgraph-1.8.2.ebuild, +ocamlgraph-1.8.3.ebuild:
+  version bump
+
+  14 Jan 2013; Jonathan-Christofer Demay <jcdemay@gmail.com>
+  -ocamlgraph-1.8.1.ebuild, +ocamlgraph-1.8.2.ebuild:
+  version bump
+
+  21 Dec 2011; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -ocamlgraph-1.7.ebuild, +ocamlgraph-1.8.1.ebuild:
   version bump
 
-  06 May 2011; J.-C. Demay <jcdemay@gmail.com>
+  06 May 2011; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -ocamlgraph-1.6.ebuild, +ocamlgraph-1.7.ebuild:
   version bump
 
-  13 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  13 Jul 2010; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -files/ocamlgraph-1.5-makefile.patch, +files/ocamlgraph-makefile.patch, -ocamlgraph-1.5.ebuild, +ocamlgraph-1.6.ebuild:
   version bump
 
-  04 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  04 Jul 2010; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -files/ocamlgraph-1.2-makefile.patch, +files/ocamlgraph-1.5-makefile.patch, -ocamlgraph-1.2.ebuild, +ocamlgraph-1.5.ebuild:
   version bump
 
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 4b4f6d4f0..123489c97 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1 +1,5 @@
-DIST ocamlgraph-1.8.2.tar.gz 249253 SHA256 e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6 SHA512 93995dbacc571569a3f168ae141808ac5053ad895ad3ee4dddd311f1e5b3123a8096a5a4b4d10695b5c02d41efa15a92c425987836a5db6ef6469ef77cd23750 WHIRLPOOL 7d36a4b33fb1e981b5ae7b94627de918ad60610ecc8f364b1895593da98f78cfdb606325e862534ecdb9ef53b00de50d31df1e67a5e4fa5325327d8d1e4588a8
+AUX ocamlgraph-makefile.patch 1564 SHA256 c36612f740033a3d158f5d2a458697b1a41dacf2d1964484c1fd0c0f39fd276b SHA512 a0251220741069e729ffebdf7d9f2b3f02119dec48c09321cc9cbc8b82286d4081ccd89dbe5c1fe634ea415aa5e48d162f522ce6509812847dba2909c7572adb WHIRLPOOL 56765554649d5e5d38016ad22183b7b0d46c3780beeffb7f79d46c30e33967a3fd5f8ed92335dd8b5dd727743d25d8975c52d839817e276d13f595b25b7d82f4
+DIST ocamlgraph-1.8.5.tar.gz 269438 SHA256 d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f SHA512 e3bf7f43f7b5167cbd23ea44a510d1a569d35771882ab7ae83bacc73822c5f4c944f62c95e0efa813b765e1e385a6b3ebff342cbf1c5589c73d022b8591a52dc WHIRLPOOL d25e124c2814e3196a441e706ca91a0429ab48669309c5dec2ae6697e48064ce54efc9d24440d9e52f3a1af8cfdd5c3ae04cd549fde4e9abc860a3506bd2de8d
+EBUILD ocamlgraph-1.8.5.ebuild 1086 SHA256 3f0b493eb204938e5fbe27db188f1c0d2aaf697a78d1964178e79d2eac5a27e2 SHA512 cc8bf450cfd95177d417e638ad082f7f13a84bf7f0b2059ab5aa10b63d4ad3e87998b35c6d4fca6714bb981ea08180b77c2297e8b74693f93968d74bcd31346e WHIRLPOOL 205b37506e016e9f27158720ea828a71000dfeafa2da331a0145cb524abb27517e7053ee13afb6239ea7c2bd0aef0967872b8cc9eb86fafb188399a6ba8ceb14
+MISC ChangeLog 1288 SHA256 e6b9aa482e6272815905a96ebeb959b8333947336de304fc75ed8bc1bc3ba361 SHA512 7718a1990e660bf8f5194b7aa3a1b7bf0203b27f35c9e6d614cd8fecf055d1a92072ae1829148b98322dce8f6ea5c13112d30a58bf97396ae5a283dcb60edf47 WHIRLPOOL ebfc633797de5dfe2952c5e07d8edfa3d3dfe009bda6e5fc505c7054a152a205e32bca24ddef2a403ebacc8a2afb65c531da8fc5b6d61d6d19ccfc1b1358c7c3
+MISC metadata.xml 1550 SHA256 cf29ffe695398a61363b2f993b7e904ae259447488f14e072f77a098798ed1e0 SHA512 a824c62089e03b1c8936930100b893b25706cbcb5747e218d72120332e14597f2823ac1da64b59a62637d66295679202eb7142867145e2ae28b0667492587103 WHIRLPOOL a91552ca140d206fb80768b25999f38047e8a82904a949c724ba188c8682222709dd9cb3ec3b662c8573b568a97d64e3a64b4dfeb415d212ab6d94209b0f6a78
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 87fc10d58..763c1cd36 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription>
-  It provides an easy-to-use graph data structure together with several
-  operations and algorithms over graphs, in Graph.Pack. It is a reasonably
-  efficient imperative data structure for directed graphs with vertices
-  and edges labeled with integers. Several other graph implementations
-  are proposed for those not satisfied with the one above. Some are
-  persistent (imutable) and other imperative  (mutable). Some are directed
-  and other are not. Some have labels for vertices, or labels for edges,
-  or both. Some have abstract types for vertices. etc. These
-  implementations are written as functors: you give the types of vertices
-  labels, edge labels, etc. and you get the data structure as a result.
-  it also provides several classic operations and algorithms over graphs.
-  They are also written as functors i.e. independently of the data
-  structure for graphs. One consequence is that you can define your own
-  data structure for graphs and yet re-use all the algorithms from this
-  library: you only need to provide a few operations such as iterating
-  over all vertices, over the successors of a vertex, etc.
-</longdescription>
+	<herd>sci</herd>
+	<longdescription>
+		It provides an easy-to-use graph data structure together with several
+		operations and algorithms over graphs, in Graph.Pack. It is a reasonably
+		efficient imperative data structure for directed graphs with vertices
+		and edges labeled with integers. Several other graph implementations
+		are proposed for those not satisfied with the one above. Some are
+		persistent (imutable) and other imperative  (mutable). Some are directed
+		and other are not. Some have labels for vertices, or labels for edges,
+		or both. Some have abstract types for vertices. etc. These
+		implementations are written as functors: you give the types of vertices
+		labels, edge labels, etc. and you get the data structure as a result.
+		it also provides several classic operations and algorithms over graphs.
+		They are also written as functors i.e. independently of the data
+		structure for graphs. One consequence is that you can define your own
+		data structure for graphs and yet re-use all the algorithms from this
+		library: you only need to provide a few operations such as iterating
+		over all vertices, over the successors of a vertex, etc.
+	</longdescription>
+	<maintainer>
+  		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="doc">?doc?</flag>
+		<flag name="examples">?examples?</flag>
+		<flag name="gtk">?gtk?</flag>
+		<flag name="ocamlopt">?ocamlopt?</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
index 1442073be..d950b6f2d 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.2.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
@@ -7,12 +7,12 @@ EAPI="2"
 inherit eutils autotools
 
 DESCRIPTION="A graph library for Objective Caml"
-HOMEPAGE="http://ocamlgraph.lri.fr/"
-SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
+HOMEPAGE="http://ocamlgraph.lri.fr"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples gtk +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
@@ -21,11 +21,15 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-makefile.patch"
+
+	#dirty fix for doc building
+	sed -i Makefile.in -e "s/-d doc -html \$(DGRAPH_INCLUDES) \$(DOC_SRC)/-d doc -html \$(DGRAPH_INCLUDES) \$(DOC_SRC:src\/merge.mli=)/g"
+
 	eautoreconf
 }
 
 src_compile() {
-	emake -j1 DESTDIR="/" || die "emake failed"
+	DESTDIR="/" emake -j1 || die "emake failed"
 
 	if use doc; then
 		emake doc || die "emake doc failed"
@@ -33,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	DESTDIR="${D}" emake install || die "emake install failed"
 	dodoc CHANGES CREDITS FAQ README
 
 	if use doc; then
diff --git a/dev-ml/zarith/ChangeLog b/dev-ml/zarith/ChangeLog
index aab4931c7..a521a070e 100644
--- a/dev-ml/zarith/ChangeLog
+++ b/dev-ml/zarith/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for dev-ml/zarith
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  03 Mar 2013; Justin Lecher <jlec@gentoo.org> zarith-1.1.ebuild, metadata.xml:
-  Clean wrong space and blank lines; move EAPI=5
+  10 Jun 2014; Jonathan-Christofer Demay <jcdemay@gmail.com>
+  -zarith-1.1.ebuild, +zarith-1.2.1.ebuild:
+  version bump
 
-  14 Jan 2013; J.-C. Demay <jcdemay@gmail.com>
+  14 Jan 2013; Jonathan-Christofer Demay <jcdemay@gmail.com>
   +zarith-1.1.ebuild:
   initial commit
 
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 5ba03d9d8..8dbf2f331 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1 +1,4 @@
-DIST zarith-1.1.tgz 68383 SHA256 a0ba322c8d4f5bffa43f1c571e839baa0c7b155b67630bbd8481df21eb636b6e SHA512 60f36282eb5721df164437a0b24f36b601639914b4369ed0b9ca089fda1e75191163c1c57a3890f6f9c92c64eb99f9092f045822223c448298eccf9baed535e5 WHIRLPOOL 5671caa5f942084215d52f691257fb40229607f6394ad1a1e4c932df3cf3c0bcf598caf72dc16a23c849e2bba4e9caaad659a186475ea0173b78fad6799bd859
+DIST zarith-1.2.1.tgz 68654 SHA256 916801cc39599d3fca07384fbfeec4bfaa5ffcb497d68ef89320af40ba5e4144 SHA512 5c053e259469bf6a2d4aaa3e653da42d18015e815a0b922a4e317db091a54c560e7ed32f5cb1faae7df1e8a6d81ba3913d71e5b500ace1bd45d69e69858467a1 WHIRLPOOL e31770c23e7f77bff8f084eeb3e0a9cab7c1413f2da64926c403720df2351bb84598953ad1bae0436d9b3ba6e66c1543aee0dbd9151a3708d793abe5506f1e00
+EBUILD zarith-1.2.1.ebuild 992 SHA256 247562941f50638da74a08fd033a38a2366f9f896ab4983c0d1c2a19e67fe589 SHA512 4a5bfa400ac5f0804c06b42e488cf8ec54c0674fc4224bc19c8e7d845bbd8c25458cc776790da91b1764df1be0094813603d71ea04c32a0016d442107d134aee WHIRLPOOL b5cbbaa432b53df50051a97fd4679be1d884ad19dbcddc331e827ae6e4cc6bc148deb54394a946dba8cf8550d8aad75d376c51551b412cc3e34e6ff2340b13e6
+MISC ChangeLog 336 SHA256 dd82e831bb0b21ef3c9917dc50b16b10b21e66561794ca0b59eb2ae07cda49aa SHA512 471d19d844981cff8dab5738d5366922de22a658a652956214304f7a47f431c39086ab488cc9c5b79ce22562170cdedd67b58a879ade9e8cfdce47a7d14037e0 WHIRLPOOL 15b849caba4bd8c03a9d1d6f1f8682956cac874c1cf918635c08e8919fa398bc76cf237c4b26b49cb4fa2225355d377c73142af24ee77ee97dda521b903a035e
+MISC metadata.xml 576 SHA256 f2e3b72798b53b5cc8de7f84bb15a4f936b202798dff0924a8dc3153fc02eba3 SHA512 fabad704c895e72ced7561f1e5db01869f3b5b7ecca6d96d3a1474e7febad1170a8ad9087346aa8caf8741a5cd719290567581297ef452cb1eb94f706cb14e6e WHIRLPOOL 15466f22d6b3f39bc2c294a642dccc215a34c84325443b385a9e4aeccef0e8a178b389ce76380769edd55992d6e665b8f440236a132141b85a8885d26d2de108
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 1ff321877..d2e969145 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/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-mathematics</herd>
-<longdescription>
-  The Zarith library implements arithmetic and logical operations over
-  arbitrary-precision integers. It uses GMP to efficiently implement
-  arithmetic over big integers. Small integers are represented as Caml
-  unboxed integers, for speed and space economy.
-</longdescription>
+	<herd>sci</herd>
+	<longdescription>
+		The Zarith library implements arithmetic and logical operations over
+		arbitrary-precision integers. It uses GMP to efficiently implement
+		arithmetic over big integers. Small integers are represented as Caml
+		unboxed integers, for speed and space economy.
+	</longdescription>
+	<maintainer>
+  		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="ocamlopt">?ocamlopt?</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/zarith/zarith-1.1.ebuild b/dev-ml/zarith/zarith-1.1.ebuild
deleted file mode 100644
index dc8c685cb..000000000
--- a/dev-ml/zarith/zarith-1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="The Zarith library implements arithmetic and logical operations over arbitrary-precision integers"
-HOMEPAGE="http://forge.ocamlcore.org/projects/zarith"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/835/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt"
-
-DEPEND="
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]
-	dev-libs/gmp"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	OCAMLDIR=$(ocamlc -where)
-}
-
-src_prepare(){
-	sed \
-		-e "s:(OCAMLFIND) install:(OCAMLFIND) install -ldconf \$(INSTALLDIR)/ld.conf:g" \
-		-i "${S}"/project.mak || die
-}
-
-src_configure(){
-	./configure -installdir "${D}${OCAMLDIR}" || die
-}
-
-src_install(){
-	dodir "${OCAMLDIR}"
-	cp "${OCAMLDIR}/ld.conf" "${D}${OCAMLDIR}/ld.conf" || die
-	emake install
-	rm "${D}${OCAMLDIR}/ld.conf" || die
-	dodoc Changes README
-}
diff --git a/dev-ml/zarith/zarith-1.2.1.ebuild b/dev-ml/zarith/zarith-1.2.1.ebuild
new file mode 100644
index 000000000..2822592e2
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="The Zarith library implements arithmetic and logical operations over arbitrary-precision integers"
+HOMEPAGE="http://forge.ocamlcore.org/projects/zarith"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/1199/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+OCAMLDIR=`ocamlc -where`
+
+DEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
+		dev-libs/gmp"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	sed -i ${S}/project.mak -e "s:(OCAMLFIND) install:(OCAMLFIND) install -ldconf \$(INSTALLDIR)/ld.conf:g"
+}
+
+src_configure(){
+    ./configure -installdir "${D}${OCAMLDIR}" || die "configure failed"
+}
+
+src_compile(){
+	emake || die "emake failed"
+}
+
+src_install(){
+	mkdir -p "${D}${OCAMLDIR}"
+	cp "${OCAMLDIR}/ld.conf" "${D}${OCAMLDIR}/ld.conf"
+	emake install || die "emake install failed"
+	rm "${D}${OCAMLDIR}/ld.conf"
+	dodoc Changes README
+}