gentoo resync : 17.10.2017

19 files changed, 281 insertions, 25 deletions

diff --git a/dev-ml/iTeML/Manifest b/dev-ml/iTeML/Manifest
index c7e9c018c7e6..6e1f9d5b0619 100644
--- a/dev-ml/iTeML/Manifest
+++ b/dev-ml/iTeML/Manifest
@@ -1,7 +1,9 @@
 DIST iTeML-2.5.tar.gz 33750 SHA256 3295853f8a17e6adb085c69bab0eddacdba11c1acc4ee2bdbae9f093239683c3 SHA512 b8a2f842f0076bdf3f30a71983f686b931ac3f7fde73ad83041dae1d33d8bca2c7695b71dcc53ef942fbdee7422e2e4d22994f69b70d54e2b4d62bc1c64395c9 WHIRLPOOL 45279bb9168fdfb6354723cd3bb950390390586a3959dd95adac54eebfabe835c1d85a77ae54f00aa36c41191e262714a86602472ad70c8e30aa289b283c3de9
 DIST iTeML-2.6.tar.gz 34822 SHA256 0c1ed42a0c288cde9f3823ccc6ae142e6dccfec915e7348e99a5f615c0351db5 SHA512 6c42856d8a8d6b9e76002fe94e4be0db2a108c4a033fd3d19849772a6c1db9b792beb960b0ac02973d40dc9dda4c4cf5ba13ae9f05534798cc3ccc283f8d3567 WHIRLPOOL 7bc6901c930ae00a772e470d74e16f93c144ae7eaa28a58e981c2bd2658a847b6456fd7651ad12265fd105854896102d498311ccbf273b225debdac62b547fcb
+DIST iTeML-2.7.tar.gz 34866 SHA256 0c0276f12e9f668978783de8ea32a44d7be5be5cf312b5eabfb560147310f7c6 SHA512 477b55332ab4f733bb225fb15741e5129314fc857900715851027b132fd87f169f8d402987762bd9a07e0a644b1d2bbd49e2f21de7cc23edbe89ff8b3f2bda65 WHIRLPOOL 3ad23a7a0ef04ec873b7b713ed09c35d5ca29daf6afc6d39b760871bcf29e1f769d0aa1e3a62cd78aee7c121bfc8bddbf389efdd59f9dd14476f5417ec74f6b1
 EBUILD iTeML-2.5.ebuild 611 SHA256 b7a96a7bb5e34d6f35d4e1299005da388e82ae13b3eb4a54fd8dd6ebfb11881f SHA512 2c03e8aebb9ec9a99ebbc371ab2ca9b6fd7bed5495bc975de15197a64a6285880b5c312b3eb67c1d5c1073cf2fca34af3efb7eb530030f46c8ad8532236678a9 WHIRLPOOL 699cfd4a90fbba1ff916bee79f09dc3fa38fc0f9278147ef242c666ef3a79a5c7a978c6c1de764553d9745009337e4ee4a564daa640ae6708a31c4b9176a9c6c
 EBUILD iTeML-2.6.ebuild 611 SHA256 391c9a402b7a571f1fe1329bdd4890c8672f0e83028ad033677fc2dcf7132df7 SHA512 5416f858eb98f2c6a57eb410bdddc96d4136f61e176d7f8986a0634438e647531b3be43d38f38304b008243eb744a949f7b72b5da9bae385d0782749fa64313d WHIRLPOOL 03299f592cd290cbe7e1731383ccfdf6621503120afefbef58cc5a25423b6be990cc98d93b79daaa4019e7ff180c2f52033b6bc35afa16c0391b28960178b482
+EBUILD iTeML-2.7.ebuild 611 SHA256 391c9a402b7a571f1fe1329bdd4890c8672f0e83028ad033677fc2dcf7132df7 SHA512 5416f858eb98f2c6a57eb410bdddc96d4136f61e176d7f8986a0634438e647531b3be43d38f38304b008243eb744a949f7b72b5da9bae385d0782749fa64313d WHIRLPOOL 03299f592cd290cbe7e1731383ccfdf6621503120afefbef58cc5a25423b6be990cc98d93b79daaa4019e7ff180c2f52033b6bc35afa16c0391b28960178b482
 MISC ChangeLog 2872 SHA256 9a32c4bc65dc7deb0f5edc634c14c860570ba6021df80be9c1faa79665cc37c1 SHA512 7385519afe8d6f7c1f53bbcf7220822bda70ca6cb9d21bd496c3fdfdbdf88c841a6eebc00a285c8971d58bdb0bce25a07fbd1974d14f81c2790ee80e247aad2f WHIRLPOOL 34c510662eea0f9f4b211a7d02a5eb68464574db6bbb09511ecf964777ea83cb5ba4f3b52cf2cb8a40f3e672b27814162ea298e59915975f4ddd680f30a3afb3
 MISC ChangeLog-2015 577 SHA256 b18ce9ab76ce74747ca4c18a9fe7be69c8bc10af039754dff36caf58e15e1f76 SHA512 3ef1e17c367c5571d721aeea6dd52c91c2d66a62eb2d53cd2b500433d341a40e0cd24f4dfc1b13d4b428486938454d3c6e5373febb29ae52a84dd07bb9c357ff WHIRLPOOL d8feef7a33f4f732baa4d95d2298f7eea67a59607b499cd846b8bf66c9e82c2e563bb7d96030efef6dd94dee15231b3caa53ed858193a29ccbdd777bb134f37c
 MISC metadata.xml 341 SHA256 44f1512635bf9d63e50c80905d181dc6af98c87759f8dffe00266b89989e2d7d SHA512 c3f8f5f72ae96e9050b7c11de89ca754ac84019a857388e53a56cec3122020e06d7d6143b0cf9070f509cd62f1c32d4f52a2e4b3593a73b6fea8d41fc23d6385 WHIRLPOOL 11bc311f2abd8d409b38b8c10285e7d47d09f83cfd28e8414494e558ba7ee48e33332444715924f7d9d9ddd318bc4b563c67a07f9500cc0c7a91b1e7c9712605
diff --git a/dev-ml/iTeML/iTeML-2.7.ebuild b/dev-ml/iTeML/iTeML-2.7.ebuild
new file mode 100644
index 000000000000..90e9f8676bf7
--- /dev/null
+++ b/dev-ml/iTeML/iTeML-2.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Inline (Unit) Tests for OCaml"
+HOMEPAGE="https://github.com/vincent-hugot/iTeML"
+SRC_URI="https://github.com/vincent-hugot/iTeML/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/ounit:=
+	dev-lang/ocaml:=[ocamlopt]
+	>=dev-ml/qcheck-0.5:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+"
+
+src_install() {
+	findlib_src_preinst
+	dodir /usr/bin
+	emake BIN="${ED}/usr/bin/" install
+	dodoc README.adoc HOWTO.adoc
+}
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index 8c6c7f175390..173a76efaa20 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,5 +1,7 @@
 DIST menhir-20170712.tar.gz 855262 SHA256 ca482d690052343d6cb9452433248a0a92cc8bfc8fa529dc313220c9d7c0d000 SHA512 7850fa031a2bd69e9cf17db6d8f82f716ab5f9e60b34d1a53591a3ff46750fb01880f3282a7194465441abc4c2ba60f543646097f5f0eef6fe78b36266a3dbdc WHIRLPOOL 0c7cfcc798c2126ca345b38560972dfca79adf2b5bf2fa0d4dccaf1745298dec601c902cae8f9b35970e63084d0a261cd42f230b1c452905a28607d18fcebeed
+DIST menhir-20171013.tar.gz 854000 SHA256 7c1bfed0bda443c40408c2bb2e2a4bae2f6168ac1d5a7e258117dcea83c51cbf SHA512 ba6359c471aee62c996bd6495612f444e7ac226f7aad9991a76e4daa2df00cdec2387c488c6a29246ca48079bd8199b94de09a44f1fb05465cbeddff0b39df54 WHIRLPOOL ef58abaaa96ad8365d5359ee8e99ad7098763b3266af89417b481d234d7e5f5cd1d2aa8cba8cafebb5b6a4a64509f9faeb7088e9d6eab13d844ef3e64bc0b73f
 EBUILD menhir-20170712.ebuild 894 SHA256 874a8de97ea61b3556b48d5ae83c10edd602d42a4cd6e110b07714276b66c7f1 SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1 WHIRLPOOL e69b81e631560b3bfaecf3f49947e903e47607a8cf6b26d7366b801e5006e9cafbd5011dad63d899718bc4791782e838e1a78b86c817a0a28c657aa851fe276c
+EBUILD menhir-20171013.ebuild 894 SHA256 874a8de97ea61b3556b48d5ae83c10edd602d42a4cd6e110b07714276b66c7f1 SHA512 aa34340bdb35e4e928513c2bed7c5d6f146385d8b5b6bc5a5a1e82ec9d2bf9fb4cf2c4d172f92ba547ddfc2a7b042d0138490e856228dc35c4dd0b8254e8f3c1 WHIRLPOOL e69b81e631560b3bfaecf3f49947e903e47607a8cf6b26d7366b801e5006e9cafbd5011dad63d899718bc4791782e838e1a78b86c817a0a28c657aa851fe276c
 MISC ChangeLog 6616 SHA256 806d8cb280f6f37aace916554955afae4f5e2425e3693672f863a82b60afeb8e SHA512 e166cf6bf47c7db055b624f9a72d1c7191187c3800244a233a9ab3203b31da5fd0f1b3b86098651810563281e8acace33a7820ae2afd7e6e8d8ffef1a008cc84 WHIRLPOOL ba9101bd7ed87e6d792aad8f2b618d502dad109316832cf87cb21a953e07cb3f7316b0c9ea3d471fecbec85984e5b490070b68d209874f3becbdddcad684bf44
 MISC ChangeLog-2015 727 SHA256 53868d5d2b87ac6ea091a1a86e6949d1b220d2cc0ee8f2a0df44bf5ea6822782 SHA512 772b98528ea6657c55e8e3315373169f412c7123f5bafeff27ec79479c5b6c0f7999acbfdb9584c0ee87a4d945f0f4d56cbdcb952298591d840f81a08ccee2e7 WHIRLPOOL 6279af18de11c896c2c58be5199f8e08f805d86854e98a874971cf947e680d4786001d6ba119b14e59a7b4d2b2a61ff7e56c434d3375be08b308e97001a0276d
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/dev-ml/menhir/menhir-20171013.ebuild b/dev-ml/menhir/menhir-20171013.ebuild
new file mode 100644
index 000000000000..51e7184f445c
--- /dev/null
+++ b/dev-ml/menhir/menhir-20171013.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="LR(1) parser generator for the OCaml language"
+HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
+SRC_URI="http://gallium.inria.fr/~fpottier/menhir/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="examples +ocamlopt"
+
+RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild"
+
+src_configure() {
+	if ! use ocamlopt ; then
+		export TARGET=byte
+	fi
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr -j1
+}
+
+src_install() {
+	findlib_src_preinst
+	emake PREFIX="${ED}"/usr docdir="${ED}"/usr/share/doc/"${PF}" $(use examples || echo "DOCS=manual.pdf") install
+	use examples && docompress -x /usr/share/doc/${PF}/demos
+	dodoc README.md CHANGES.md
+}
diff --git a/dev-ml/ocaml-sqlite3/Manifest b/dev-ml/ocaml-sqlite3/Manifest
index 8dc44365a4f5..2734bb56fedc 100644
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@@ -1,9 +1,11 @@
 DIST sqlite3-4.2.0.tbz 22167 SHA256 081759b58dc0c49030a78628070377c6c6b20858411ed495f44cf19003a95503 SHA512 3221ba03eae64c59c3ffa57271585a1fe76848504d56edf33e953fad270929ba300b5828788f6cbb3f145acf743ad51bc019d151ac68472f6dbf7ab43263ae86 WHIRLPOOL f451a35c821e352f43537d985827ecb4536c8b6dade721f8b606bbf3d405df6c22862eda15a1d557645440eef08d7186a483f9c3062fa1cd15f62916a0dbaae1
+DIST sqlite3-4.3.0.tbz 22498 SHA256 250a4ab7cee8fc718fc7b06be6b415155dbea9b73572fb9290cddc6fe1ef1988 SHA512 f09d425830ac24ea835a403bc51d257c265b6e77b1dce01367c715545cbd98f3ad2694e6dfdbc7491d590aa809c0313329e81c9614228170f90197f2a94200c9 WHIRLPOOL e4f36a199e826927d8d1a834135a6ec63bab8814e30663c6b4355b98fa84e84ac8b57196e06793882551736e7ac102e2da37459a8f2099a4e8a782a2a932658f
 DIST sqlite3-ocaml-4.1.2.tar.gz 76879 SHA256 35dc12f238d171b1242c3bbc225ac947d1e34741dd6ff0a4da71197672b48191 SHA512 880f82fa9eba06114695bda56305245d2d9062f8136db85675463e97fbb8aee210df310d8d65d78e9eb1f882421581a97c4b7f20a790881f699b4d494be066f5 WHIRLPOOL 7e548b0032f4f439052a983321b201c7f2bf83f63df0354bc3a956cee2391f6048fd7089b3af239d3ec7ae9e68e823925411799b9c4c3d81d89bd5efda570bcf
 DIST sqlite3-ocaml-4.1.3.tar.gz 76989 SHA256 78177cfd37214ae51cb9765fdbdb7c8163ca2bf1b5b3e2d54977441835ec98bc SHA512 59865b4c5d99d319ee6f5e1ecb8d71b4c07bd7f77876fafb73d3c882dbf434b67313f4caf7762f2194dc819f75af9582dd4df002f0f68cb8690996b857c08a1b WHIRLPOOL 56484fbef4404263f8b544ba31547afa093870bd433cb12c4d1d180a8184f94fab8384a4909772c21c2c70954ecad5cc609fc0d89d50c5f76a6981bb3a156973
 EBUILD ocaml-sqlite3-4.1.2.ebuild 664 SHA256 c87eded9e92ff02a382841b99b7f4e3ed97610918761bbf6da43efcf0f1f97d0 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e WHIRLPOOL 580831b5dd5e7c8cf5716e5d544678b2a9557155b7a95c24175eceea347a99e7b8bcf08d82cc93f6f0f1d0d616c76e822145eee72e02160d9540474692922d2d
 EBUILD ocaml-sqlite3-4.1.3.ebuild 664 SHA256 c87eded9e92ff02a382841b99b7f4e3ed97610918761bbf6da43efcf0f1f97d0 SHA512 d3377afb7d2618a520f3108c4d80a67f565fb2a6748392ba3ee25b01271c1d67f91dab63196aed97dc12026531b69c10d714b5882bff06480d761c847da88a7e WHIRLPOOL 580831b5dd5e7c8cf5716e5d544678b2a9557155b7a95c24175eceea347a99e7b8bcf08d82cc93f6f0f1d0d616c76e822145eee72e02160d9540474692922d2d
 EBUILD ocaml-sqlite3-4.2.0.ebuild 714 SHA256 8d0b3c69378adbbd132c7a5c498ab9e4d96e2a63e9fe9591906ddf3fa323cfc1 SHA512 5a55efb3d24ecf3ad693b02d73fe7abac298676e56e41e1ab38fc44f9163988e1162493651fb36b367dda9463e6231ffcda5a3644b8a6bc36a248911b25c539f WHIRLPOOL 59f9675ac7583a98dcc9c6cd45a3bcf280ea282a6b5019ac00f579b1b833c8bb09c028f446298c97a560cc1ae6dbb648123320cf312dfffc0ce0fe55c261e9a7
+EBUILD ocaml-sqlite3-4.3.0.ebuild 714 SHA256 8d0b3c69378adbbd132c7a5c498ab9e4d96e2a63e9fe9591906ddf3fa323cfc1 SHA512 5a55efb3d24ecf3ad693b02d73fe7abac298676e56e41e1ab38fc44f9163988e1162493651fb36b367dda9463e6231ffcda5a3644b8a6bc36a248911b25c539f WHIRLPOOL 59f9675ac7583a98dcc9c6cd45a3bcf280ea282a6b5019ac00f579b1b833c8bb09c028f446298c97a560cc1ae6dbb648123320cf312dfffc0ce0fe55c261e9a7
 MISC ChangeLog 5484 SHA256 9682589ea79ed14bcfd6c05b1b2ebdecacb978a83db5ea1c49192203aaa19ee1 SHA512 08ad79ee151b26985c303152b0e707ac766132f31d5ee5f489b988b4acd91e00062d60ecc51d0fee6cf6797d98a0115fb6b618546bb98855a5d9df0a10fd65ef WHIRLPOOL 5cc7727314d62b28b338f55e1b8259c73670c0f4e1c4e9cf6260c244beecbf8db7b74b02138c5a6f6e5e85b30bc40a452d894792eb05c95120ca005a4dd0db6f
 MISC ChangeLog-2015 5565 SHA256 ac83298f1995cadb98e6cfef15641d05a5dec18d975960b79df40ebcb9628fc1 SHA512 fb6e115f2b7cfdf6e23fc1a3d2ea72adfaee15245fe78b646d6ebcaf4d49e3fcc16583dc6e0064117fc414f2654ecb62fc9c3cc0fb06ea47f320601c0d03587a WHIRLPOOL 874993d02a7da08148d0c8b7b53ac70545b3933b57b9949f9661ab8923ca66e1d1c5a17cdf7c14ca31667687729a56821a130ee0f19aed3641acb2c5f232626e
 MISC metadata.xml 407 SHA256 a45a0d9c8346d934e9465ee8cdf7903439e0594a8f911930ee54a5999f54b8f5 SHA512 d25e7f93b44c178b2035f4ab292cd9d2dbddc904b57ac9a02be971e7bf057e0ee070e9a7baa88f36bc32c404e8e64a7b2e87b6c66b2ca2d070ef9ec4b122d2a0 WHIRLPOOL 86c2380c3c1f4de7b0d4e4db06471299511335fe8ab2284d34df0469e3a6f22bb0b1c81fcffc0898de898cb8981fe194927e4ec02140691d90e041cad83575d6
diff --git a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
new file mode 100644
index 000000000000..fdedc5618e38
--- /dev/null
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_PN="sqlite3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-db/sqlite-3.3.3"
+DEPEND="${RDEPEND}
+	dev-ml/jbuilder
+	dev-ml/base
+	dev-ml/stdio
+	dev-ml/configurator
+	>=dev-ml/findlib-1.3.2"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	jbuilder build @install || die
+}
+
+src_install() {
+	opam_src_install "${MY_PN}"
+}
diff --git a/dev-ml/ocaml-stdint/Manifest b/dev-ml/ocaml-stdint/Manifest
index 15b2727ea2ac..80fea2abe4cb 100644
--- a/dev-ml/ocaml-stdint/Manifest
+++ b/dev-ml/ocaml-stdint/Manifest
@@ -1,7 +1,5 @@
-DIST ocaml-stdint-0.3.0.tar.gz 80556 SHA256 08fd03cff102f8264f9964a638d1efb223c155ce1794e3aa99def014fe53bba6 SHA512 554f816cfff052058bea63f3daa790be34da3006713dfa83096af2e4866cfb439b549d4bc8d5fe08261762c97d4f98cbbd45196f7adb4698e0a8542c1676008b WHIRLPOOL 1de97e0be66c34e0492c6cbbc82314337dc88011e12881c0b60a200320f9e238a6ddf038d4dce212970d4dfd3a2316a83bf1bb02f9e3090330e7573760637359
-DIST ocaml-stdint-0.4.1.tar.gz 79615 SHA256 a26ae71e12c76788e149ce529d9b3158b7d9ab1e489c7756895219d3ab956391 SHA512 52f46387f5f14121d1ca8509714a88253cc26dd91a2ad03cbaba67346a9a371536373fc574b5db8105c6d218746ffabb1e728848df62e9900ed6a19f69a3daeb WHIRLPOOL bb7fee3ee047090183fa847c729e98355785ece37952f3670f4c2186c43d3f50e07cc5cfdd67d83bf302ee8d3cdbe4147689e674c0fae542b04a3adf729e13b3
 DIST ocaml-stdint-0.4.2.tar.gz 79749 SHA256 88b87da27b81ce175df4c58b2733958647869d33a143886740afe075a51b761b SHA512 0663a54dca8951fadf1121b69db32590c6ec3fc26b3366271c7941841b0a95047d0a57b5f7337bc7fbc37d3730cb5ed20952c0a3d6ab71f273646bc197951125 WHIRLPOOL d03f969f1e8c592aa1e3686c28913d047efedd0510ab9b5d2d4a754a5e4e75d5125ad04e7ad2b583288d64cd9a79e970ae7884dff9e799e7c64b1891a0b3e593
-EBUILD ocaml-stdint-0.3.0.ebuild 438 SHA256 bafc0ddba2df2582ccfeecfe962052a678cd2bc6fcf3b95fd55147d043da5743 SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a WHIRLPOOL be118d456609dce52d8dd5163231997608e448b15146abb3f956568f758f7bf04882c357b33478dab3a6b8d86e8d54a14fb3e8d99aa0309781711cc11a36a17a
-EBUILD ocaml-stdint-0.4.1.ebuild 438 SHA256 bafc0ddba2df2582ccfeecfe962052a678cd2bc6fcf3b95fd55147d043da5743 SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a WHIRLPOOL be118d456609dce52d8dd5163231997608e448b15146abb3f956568f758f7bf04882c357b33478dab3a6b8d86e8d54a14fb3e8d99aa0309781711cc11a36a17a
+DIST ocaml-stdint-0.5.0.tar.gz 80106 SHA256 e99d4b16bdbe5ebd473f3a2220516743405dfdaf495379833bac5acc4ce82dfb SHA512 fa5470e587e445c0b1ba72ddb6e641db0e41c32490c3ca6dbffb73a8a39e14afe7395d55e9d22be8dddf1d4311257b5443b05cde05b25b7939600b4f74359a8e WHIRLPOOL 3abda901154974e2af3dd083caa06cf9119372b43eb4be3b9119eac86ac8cfd78d2b504b8502f5716c65f269ee412cdf95f9d59fbc8607875c80b6a489a1987f
 EBUILD ocaml-stdint-0.4.2.ebuild 438 SHA256 bafc0ddba2df2582ccfeecfe962052a678cd2bc6fcf3b95fd55147d043da5743 SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a WHIRLPOOL be118d456609dce52d8dd5163231997608e448b15146abb3f956568f758f7bf04882c357b33478dab3a6b8d86e8d54a14fb3e8d99aa0309781711cc11a36a17a
+EBUILD ocaml-stdint-0.5.0.ebuild 438 SHA256 bafc0ddba2df2582ccfeecfe962052a678cd2bc6fcf3b95fd55147d043da5743 SHA512 d7b24af0517829bb6bf470e676c87e6a3eccce47d957f6ee825d6c15ba2ff9af561ab599bf5c7464eeaf70b3b169b979fc9fb5c2a794395470bcf86bfe95f09a WHIRLPOOL be118d456609dce52d8dd5163231997608e448b15146abb3f956568f758f7bf04882c357b33478dab3a6b8d86e8d54a14fb3e8d99aa0309781711cc11a36a17a
 MISC metadata.xml 333 SHA256 87c5a2eaea8b112009820c23cb5d664272c8f72f089d9af07a7c3b94d8cc0665 SHA512 fa85ebef0ee33741dd167dd0352345a8d9f8d2cc412d18c04fb0d5e1aa3fdcc85454d2dfe5063b2a750b25edcb83d773237c3a08c37f03edb3199f78d0c618c3 WHIRLPOOL f3cceaadcbd9c1f16da4eac040198486179f39c9f5c3e5ee4279f3b2a953135b8f595e0f9345b2da635e7d32d3e7b0ec6c450b107b55912c5b2f0327b69662ca
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild
deleted file mode 100644
index f2c7b3938e6b..000000000000
--- a/dev-ml/ocaml-stdint/ocaml-stdint-0.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="Various signed and unsigned integers for OCaml"
-HOMEPAGE="https://github.com/andrenth/ocaml-stdint"
-SRC_URI="https://github.com/andrenth/ocaml-stdint/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-stdint/ocaml-stdint-0.3.0.ebuild b/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild
index f2c7b3938e6b..f2c7b3938e6b 100644
--- a/dev-ml/ocaml-stdint/ocaml-stdint-0.3.0.ebuild
+++ b/dev-ml/ocaml-stdint/ocaml-stdint-0.5.0.ebuild
diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
index 5e1b8d685956..a50746cbf52c 100644
--- a/dev-ml/ocplib-simplex/Manifest
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -1,3 +1,3 @@
 DIST ocplib-simplex-0.3.tar.gz 31013 SHA256 59bf450593e2407d52029140803e0e1343d6e30d1564f65cb2b7ec9582681171 SHA512 43373deb6e921a31526c27d33808c3520b4f375caf9e5237179db0e8d84b5be3bf43e061e2d991fc6de694958c64c7ede0b258400fb921c4139664e367958630 WHIRLPOOL eb27382e3726bbdb408b41512bb7ff294a5cb6a06335c726ae2c7a197f6fe5c829cdd2f3b2cf6a0bea483e21025fea6146f571aad60c2f91f004dadec770b264
-EBUILD ocplib-simplex-0.3.ebuild 697 SHA256 18778ccb51252421f5defc5a79ffde7e0bbbee29b175c9e91af3ca9cad658ddf SHA512 6282acb1de3d8a8df7cf442a22ca2fdb082bc371f5b472f8872bc7b623ce249d3eb910a00cde05ebf5549a19fc6316e4493b6041a8074b2b1932a965fa1a9438 WHIRLPOOL 6860237eb2d7c96f4b1d97617c51561195e565802da1f2ac6a1769cf634e6840b89f0174a81967155611d0bf210d133e6e07b67be81c7959549a1c46f396e030
+EBUILD ocplib-simplex-0.3.ebuild 756 SHA256 dc8ef6bae7ebbaae379a4cfcbf987aeec2edcbd12e44d9f14ed75e8fa219f9dd SHA512 0e9ff9bda6b8efe7b9e61510170ee65b60fdcc531dabd2ef125c0ce7c3d845a14a82ae74438b61641af7258a4d7665cbc34d7b2f4e12fee3bdf6e3101e84e000 WHIRLPOOL b6feb12b39a45f4c7b298c644652b4b529f6fe77ac64a4c6e4c8473cf8496719a5cfa71cec7a99df1837a0feeb957eb1d0c76c3a4e606cee2d0e7474ad1f9677
 MISC metadata.xml 410 SHA256 cc7ebc317723a3a1c71fef55e3716f75fac700544557ed96db65492c294fc67a SHA512 caf6a675ff8f7950d06b2ed55e0d8a1eed290fe4f14a68fc87e9c60b6b394cc029787692be7041b7d7e727d6187249ba61a324315742c1af50556496da23eb0f WHIRLPOOL 25b32d6cef11492cfd245e11fec343f4c8cd13dc37d5e7079c0c266cd5ee0fddaa7390470e30a4078d2d0003d2abc81cce2a3a4195f7b34d672ee513736eff45
diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
index cf06261cf33b..af7162c862f4 100644
--- a/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
+++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.3.ebuild
@@ -23,6 +23,8 @@ DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
 src_prepare() {
 	default
 	mv configure.{in,ac} || die
+	sed -i -e "s:configure.in:configure.ac:g" \
+		Makefile.in
 	eautoreconf
 }
 
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index bfac3d6b50da..edb69624ccb0 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,7 +1,9 @@
 DIST pcre-ocaml-7.2.3.tar.gz 88307 SHA256 6339694dbeb706c5097180ed1d79b2dae681bf155a4780a7909af49b0e6f4666 SHA512 3df4bdbbed5e1ecf4bdf15fc461f2ea65e1556af9c1683e194c8824e21da5274dd80c22c1f6676fca203305ec4244d47e09f0ef8c601bfa95f7237bb07c1ee65 WHIRLPOOL 5835811cc1aecfffa9a49704db545ff20a30089ad7bb2b9394cf20dc9c657b0f102d12e48c8eaab9d8e95eee3ca756b60a17e1715e0aca05b7a9665d6dcc558f
 DIST pcre-ocaml-7.3.0.tbz 38126 SHA256 c34af191868266d2919962b53a3a7321a7b1fb0a5619c779e2188c6daa164546 SHA512 bf2a5d188183a7f73d5a7eace98f225165e6b50828b061649e88922ca4d4705022551bce15b9b8319fc91734c77ee48182677cdb1abd754ae44c6f9412bd11e3 WHIRLPOOL 48160bf6e53a56710da6842931a171a48d8374cb547e1366f528c0eb58c55c863a47d87b13d0cc9db6aa9fc2821cbbe51c4ff6bdbeef9b0bdcb1d406d5f7b23e
+DIST pcre-ocaml-7.3.2.tbz 38445 SHA256 a5d35c9998b6cb9ead1b1c5bb4ad88120c7bbffa26b1cfbf9135fa0a4c298854 SHA512 727b129172c8c119fcb0d4ae249a3842109e3b9ab412e674af156e7bcdf0fce0bcb9561cbfe52d99002a668f0e5f145fa54d052b67a5c2eb30a1881ad4217767 WHIRLPOOL d342aac7b2d707c4458b1256cfc4400bfee4c314fc9f7dccf852ab958b5e1b872823967538d63fd5389f822bf1ba9c658f70532cdb3a82ca1d01856cf40fa73d
 EBUILD pcre-ocaml-7.2.3.ebuild 734 SHA256 55150977c72bc862653e5de74c69b614ea3bf2962546d5e2a8a1ed13bf7b8d98 SHA512 e0bf744183b55432635e2183382e752f40cfbaa4b912f34890bb8367fb903872f6dcfc294431b0d5ce134104fef76e1f123c72ab42bf19cdde336e299e354526 WHIRLPOOL 9a0f2096811135714aa81730c528cf5bdb563f2a77ed4fe36c73174843e7301e08e697e43ed9398219b75df111588749c9ffe66567a101a1aa15416c6da6739a
 EBUILD pcre-ocaml-7.3.0.ebuild 843 SHA256 a81853fe4d51d6ffe47d8fad5c17f2380518fd84193ba4a7e12776f7cda81ae3 SHA512 78dbddf6b05da6d0fe3ad3433978f0b9ac8756f9f6af2b01f9d8c0e1f50538e66d72606b49aba75108efd4d529f94f5155b77480fc7e94c91c59d1cf6bd90954 WHIRLPOOL 0a9ec10063b26db4160c0fe2592e56733403f483ab386e4b839769e67d4f67bc1f65bf383fd00c1b1e18ab5ce933b779b96114d0d9e667aa4608d2c3dabcdc95
+EBUILD pcre-ocaml-7.3.2.ebuild 843 SHA256 a81853fe4d51d6ffe47d8fad5c17f2380518fd84193ba4a7e12776f7cda81ae3 SHA512 78dbddf6b05da6d0fe3ad3433978f0b9ac8756f9f6af2b01f9d8c0e1f50538e66d72606b49aba75108efd4d529f94f5155b77480fc7e94c91c59d1cf6bd90954 WHIRLPOOL 0a9ec10063b26db4160c0fe2592e56733403f483ab386e4b839769e67d4f67bc1f65bf383fd00c1b1e18ab5ce933b779b96114d0d9e667aa4608d2c3dabcdc95
 MISC ChangeLog 4292 SHA256 ff0c28501655e10110f2e497672a4bd9b04c2d8b2f17da5e9a18ec4bb16e7aa5 SHA512 e6a6985a96b764b7391c8df1536909af37bb3ffa8b0aec719acfb3933a824418da89f3cc1f09029dd1cf17405ea13b26d4b329de73058b81dadfbbb434d27468 WHIRLPOOL d2f9164c8340b58116547469f4e020b50072f3872ef02d498d16b6d6efaa55cb4e333d14d4b6b07f0b3a302036dc5c8f9ac49da18aca1538e49c132919d29a87
 MISC ChangeLog-2015 7387 SHA256 8d5717734ec7c5fdc1e61be8c7f58d108c64fb094f879613591198f041dd09dc SHA512 625235210d8aa9ba7171386254270f194824fb6ddc383f2d1447751d1e209cb7c3e020c9f291dd48dd5c0662c0852b2c5d463e600637a1ea15daa79065bd3e70 WHIRLPOOL 2ff6f4106cbdb087ef359bfa41b6094b2ae6f16d09c026805b7c45f722dad8f85d51ab1ba42032d9f91d2a7e00a1c114a457566c5b7812ef50052c47aea830b0
 MISC metadata.xml 401 SHA256 452e8dc0cc4a22aa6896d14d6a3459506657c6b792781c834bffcc60307c25a9 SHA512 969fce8d8d459aaa46fe1d498c8485b074af03ea2ff4d66cd2013c7f45733255ee37b674da5af0fb8f11c2d6350e2871463a3b3f7167488775ce6c2e17304be0 WHIRLPOOL 53157057eac58b6809591387926ab6eaeae648364dc2d47c532acc04dc4ff1a1c621b2aae32d9e04b0d03c908e7f2c0b9fd5ac98e47b6f577546d43db142afaf
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
new file mode 100644
index 000000000000..869d45b107cf
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+DESCRIPTION="Perl Compatibility Regular Expressions for O'Caml"
+HOMEPAGE="http://mmottl.github.io/pcre-ocaml/ https://github.com/mmottl/pcre-ocaml"
+SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}.tbz -> ${P}.tbz"
+LICENSE="LGPL-2.1-with-linking-exception"
+IUSE="examples"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+
+RDEPEND=">=dev-libs/libpcre-4.5"
+DEPEND="${RDEPEND}
+	dev-ml/jbuilder
+	dev-ml/base
+	dev-ml/stdio
+	dev-ml/configurator
+"
+
+S="${WORKDIR}/pcre-${PV}"
+
+src_compile() {
+	jbuilder build @install || die
+}
+
+src_test() {
+	jbuilder runtest || die
+}
+
+src_install() {
+	opam_src_install pcre
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-ml/postgresql-ocaml/Manifest b/dev-ml/postgresql-ocaml/Manifest
index bc84cca64ae5..89e14807f53a 100644
--- a/dev-ml/postgresql-ocaml/Manifest
+++ b/dev-ml/postgresql-ocaml/Manifest
@@ -1,7 +1,9 @@
 DIST postgresql-4.1.0.tbz 36689 SHA256 8e663f70a85e6aff78323a4a6d606141adb6c10bad812a8ac9a693975a64ca5e SHA512 5749e426634f00fc8aab86e4c23f863ebdebc9bb77c121dea1c516c8bd5524096051975514daa47abe1556355bc4a1994d6634aae09736a508a9b6552b134d42 WHIRLPOOL 6a1ac952cc2448eee9324a5655196b6a149d2c3ef8058def24bfaa983793e77e116e2f2b416c8853acc25dfb9bc9966a7681291aa1bcd076a83539dcd972630e
+DIST postgresql-4.2.0.tbz 37463 SHA256 6bc19ab9093463d960e7a78766f76336f8a57d2a8fa23b8393db26a652b4ed61 SHA512 21a9d89c2fdaf5862b350aecffe1a675ecbeef42e138e09c03d14551b25622910014582c98877882746f9fc56ef5f1248c5b00a6a61d7bcd6d757c451a7844d8 WHIRLPOOL c0a3132d9c4051ace4d5d2f8765589eae054855ca53306635a5ffa4a3dcfc9f123d78811c481fe0a239dec7970f11f796337b501f06579d642186e314d8aa0b4
 DIST postgresql-ocaml-4.0.1.tar.gz 85871 SHA256 07d8fdb5c161b30809876375c43ebf29e5b99a475ee6b019b6fee3a80c18a4cb SHA512 baecd1b3b98f790131972dbd2eba563b43dec6e13e37ab904ee38b2b1168b03533272532887a42a2536806951c9e543306c6eccfb441de517ee860383ea5df36 WHIRLPOOL 71562d46b8688b4319f6fae06aeaea866e397cf6ce9f533b096d8d9f0850b2746fdffca6f4f234cc23cfb433d8124f559f89971d32554a756e88234c5a311e6d
 EBUILD postgresql-ocaml-4.0.1.ebuild 700 SHA256 035f179e4e3913c1ab7bcba2b559ffd892619f9013875e24af93e9fac577ed57 SHA512 5d3ca6f70320ac7ed6c2f9d70a9ae37de36f088edf006aa08f0a87fd8037983dc5f9e756934064d93cbee35451e42a72e067c0eda8ac9e3b8e466bbd7c240063 WHIRLPOOL 7b10d49cb94f5f2f46bf530d3104e9bbaf832da38df766233bd1311dbcec68549de8e4599021d510d075fa2c2aa36385435ea643401b662fd04b24d475a4e03b
 EBUILD postgresql-ocaml-4.1.0.ebuild 671 SHA256 47982957ad8362aaef532194e1a726f8ae5c50655880f5d70a1271bee7457baf SHA512 0a490a788f33267577d0fce20cbfa52bc705be89b9e4bcbb1ac775ca32ff46d3b6f89d907436be97ddcfa24b105c2895d78c0a3201cff134aa822c590ae3ceb1 WHIRLPOOL af8813b35e3efb294bff7ad6d2aed82ddf983af6d332d40a1e14656f528353827a45d4d4e004f453d201d29b30e3ecd7406bb7fede022dee5a43f3cacd12dcea
+EBUILD postgresql-ocaml-4.2.0.ebuild 671 SHA256 47982957ad8362aaef532194e1a726f8ae5c50655880f5d70a1271bee7457baf SHA512 0a490a788f33267577d0fce20cbfa52bc705be89b9e4bcbb1ac775ca32ff46d3b6f89d907436be97ddcfa24b105c2895d78c0a3201cff134aa822c590ae3ceb1 WHIRLPOOL af8813b35e3efb294bff7ad6d2aed82ddf983af6d332d40a1e14656f528353827a45d4d4e004f453d201d29b30e3ecd7406bb7fede022dee5a43f3cacd12dcea
 MISC ChangeLog 4110 SHA256 9acc776b458b1a8e4822dc0cd9e45c6fdd5168df85df7c724b2bf29fabd32e8f SHA512 da79382e8dc334581794550301bb54637020cfcbbdd45d3c1e5200224f8f7be9d0aa0a121fb034db14d5cbb396ecce294ca43b75f8821e81289dcfcec0076ef7 WHIRLPOOL bbafe988206d73a1a376e6ce508ddc126e487c3b68450f135afe9fc4eea9d9bbaec5f467c282ab4969accee0a638defd72ea39d8331bbae60236de525405f5cc
 MISC ChangeLog-2015 7158 SHA256 1a3d4fb5e91fc737400f720b3eb3b9b94ccc0b343a7d3c8d9999796db9001bbf SHA512 e7edbe933f137d34956518c5a3fc5f74c9bd72d6807144ce24f586bf68acdb299f89c985af61bb4336650810505acf7cd8c61dec86a546205b4aadf7537eff87 WHIRLPOOL 4a3264181c41ba1c651ce64d4458a863539941e647c8bc70a63c8efe7c16d70add66d205b7e97688dfc998affb75155b0dd961a34ca51000ed384be406d40ae2
 MISC metadata.xml 413 SHA256 a2a8609c6cce1dbe130f0b003f7b5f3d4a920932538c1fba784597fce534f96b SHA512 8d6cc5c373d7b5bdc89f7c426d23ecca928b88400e5e7b1622861d5ad18b4ffc30ac11238c935615737a08be4fbdb337939b23635c76b56c8a999c8d6ce930a8 WHIRLPOOL feb3cda4691171361ae20ac1bc5cdb29347eb53240432e093c520bcf5a3fb89f117f7c3d5ecbb3daf55b58e824c2d863ce62926fb644335abbe2bcdc8ccd5fcb
diff --git a/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild
new file mode 100644
index 000000000000..0a85bb949138
--- /dev/null
+++ b/dev-ml/postgresql-ocaml/postgresql-ocaml-4.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit opam
+
+MY_P="postgresql-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to PostgreSQL databases"
+SRC_URI="https://github.com/mmottl/postgresql-ocaml/releases/download/${PV}/${MY_P}.tbz"
+HOMEPAGE="http://mmottl.github.io/postgresql-ocaml/"
+IUSE=""
+
+RDEPEND="
+	dev-db/postgresql:=[server]
+"
+DEPEND="${RDEPEND}
+	dev-ml/jbuilder
+	>=dev-ml/findlib-1.5"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	jbuilder build @install || die
+}
+
+src_install() {
+	opam_src_install "postgresql"
+}
diff --git a/dev-ml/topkg/Manifest b/dev-ml/topkg/Manifest
index 5f6b554b3dc4..5d22d96aac34 100644
--- a/dev-ml/topkg/Manifest
+++ b/dev-ml/topkg/Manifest
@@ -1,4 +1,6 @@
 DIST topkg-0.9.0.tar.gz 120352 SHA256 1f9a718d49151ac4e914404e78865cc74e361d7befea2167fb8daa78a68fba11 SHA512 823fe1abb344d7800e09411c952bd276ecea97b5d9c124d986e26b9128d03b3ad023a38560198e476ef8f949ecb456078e332bda94075e9b746e43d3059a8fdb WHIRLPOOL 03be4f92aa654e46ffe46e49f59bac3fabb96982d512811fe1232fa067829ef09ba585bcf26bebba07aef1394497fd2551102dc97ba1f078b9b5e7d685c410be
+DIST topkg-0.9.1.tar.gz 120943 SHA256 7ad03b9ce97fbf39c040cdbd588d4cbcce97428e5dc84a23e27f2c43617f817f SHA512 19773eb764b53a6e5110c44d7942d2557d6c8502a3037b57f7737efc08f4cc374845b431fdb1465207693d15a4b072aea3db97f8e60e069e3d24ae150e8c5c8f WHIRLPOOL 93a2b08046672f88ea6a34e1f4d9c2af8432865c822bb751f029c6036c6e1975eeabc77c349a66559fa158f28f5807d799bb6e11b3168d1e0399924c3fadc754
 EBUILD topkg-0.9.0.ebuild 918 SHA256 f4c3d1e9f8a7834301bddadd633c7535b27bb02ba2915d93bcc98a07e0764031 SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489 WHIRLPOOL 4be8c9fe87f10427a2b2d939650a90964169d9d45623c7ca4487ff0973138a6c826814d3eb49e394f7ee60784f164ac454f619d97a648d1dde3de40b2fe765d1
+EBUILD topkg-0.9.1.ebuild 918 SHA256 f4c3d1e9f8a7834301bddadd633c7535b27bb02ba2915d93bcc98a07e0764031 SHA512 9f2f36e01b23b079866b641e5c5109fee45fb89f40bdbd05c6a4aeb18cc028972416a1ee3d054494b084700a0233968717a6e1abb81f2fd84223833521feb489 WHIRLPOOL 4be8c9fe87f10427a2b2d939650a90964169d9d45623c7ca4487ff0973138a6c826814d3eb49e394f7ee60784f164ac454f619d97a648d1dde3de40b2fe765d1
 MISC ChangeLog 444 SHA256 be31ff5d0e71106adab9f856d3acc8a023f9c4b73c024e37d1ef6111b90ec68a SHA512 f0b5c0125e9627d50cdaad57b826f7a7c8bf0866f3d9289fb721262c16e7a9fdaad9e9070830cfd35bf45852f1e812f2d4371a28d1e31b97a7041fb8b314ad35 WHIRLPOOL 5e760c62e8f539a6924bbd386bd375eb2d8cdc5a1de4083eb6061aca6319d11379a3c41495a379d93fb44697a17a9c9ac8b4ad930c6b7043e0c1f782f3da837c
 MISC metadata.xml 326 SHA256 b7bc06bc93622d95e7016fcd42cdfb4f67b2468733ae06a9b6cc959664e8aded SHA512 73f1d4965ba7b15a7ea5ad4382aeb1a6173c021d7f955080a69e5a77834b4dea4472b763ab598f234cc69a7d4c0b9beee0d5cbf9976cd258517eb316a9a6e92c WHIRLPOOL 440d65fe811a2d86e81da2418087634ed814466950392a21f75107a082d6533c937d7e2ae37b489a5fea3b9eda7e89999a245341f4316a6eaa65bcc853baa73b
diff --git a/dev-ml/topkg/topkg-0.9.1.ebuild b/dev-ml/topkg/topkg-0.9.1.ebuild
new file mode 100644
index 000000000000..2cfed454c256
--- /dev/null
+++ b/dev-ml/topkg/topkg-0.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="The transitory OCaml software packager"
+HOMEPAGE="http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg"
+SRC_URI="https://github.com/dbuenzli/topkg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-ml/result:=
+	dev-ml/ocamlbuild:=
+	dev-ml/findlib:=
+	dev-lang/ocaml:="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	ocaml pkg/pkg.ml build --pkg-name ${PN} || die
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs="$(echo _build/src/${PN}*.cm{x,xa,xs,ti} _build/src/${PN}.a)"
+	ocamlfind install ${PN} _build/pkg/META _build/src/${PN}.mli _build/src/${PN}.cm{a,i} ${nativelibs} || die
+	dodoc CHANGES.md DEVEL.md README.md
+}
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 9e7cd69d07b3..64576dd3163b 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1,8 +1,10 @@
 DIST zarith-1.4.1.tgz 88831 SHA256 23b6c140aad25385bb0b862b9b9fe8a5c6e6f608d0fac7a688aaede5ea876650 SHA512 ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659 WHIRLPOOL 51fc093160ccd5b26282dc1e4f0da223cf0de49c357d560c45bf839ae1dadc53968b117f6ecb96da722fcda2c669ececbd6ca3fab61c71059f37764bfc602888
 DIST zarith-1.5.tar.gz 89211 SHA256 b1d7b7394267a40c933d387131004cf0bc0dbdaea7a981fce865e1ae5d12e40b SHA512 4e616b8cc81cd83f51696926e598be3bcda0bb5999db3cf42dd627cf537320a0216c74eb14c57e57fc21c909df8ef3fb3fa602a7ad633c115d2ee61af5a9fdcd WHIRLPOOL 5f99fc525cd54167f8a6188adf8398003e8728ea9fc04b338dd69a2b0c5cbc943b79b9a5dccc41f7e24a62b00ed9900843a8eca124ab652f6c99240d6620bbdb
 DIST zarith-1.6.tar.gz 89353 SHA256 0ad52b7e8d3791d401a5d64d6f85333d096b32d3ebb9f92e2496fbe64574078e SHA512 a12eacfaa809885f2b0f09ed0fc56d90ebaf9a3d8685db8a41dcaaaa2a9d2410ec96529d8bee653343ea8d51304861dbcf12daba06206a6cf07753ad3b09780d WHIRLPOOL 61f963dadeac8cc1eaef4f783957a34fa6a3507f108c26690fb7ac2aee02744f58b2e2457222d1db937f7d79eca13cbb1cdebfd795f7e3868021c737979e93f1
+DIST zarith-1.7.tar.gz 89617 SHA256 d641bb66d04461111b75f2fc37ad1eec764dcf326d98a51ac078695baea2ab3a SHA512 812b5f9b24ce7a24d3370b8728ff6eeb56e3280fa1573e694fe54e781668c29bf8ff95e94aeff59df948adc85b8acd6b4efe117fb50a124f19b4227bee78e753 WHIRLPOOL 9369fbcc235779b7902e580df03c2b3ee8dec23a3278a8e1034c31580f4380671169fd397cad812add97b65ed4a577c20ec03040706e6f8ba4d88001d5623965
 EBUILD zarith-1.4.1.ebuild 1193 SHA256 1b2449a238fe468f77800584f7b4621c08117ca57fe09d2de9687f4362c10008 SHA512 60bfc326aaea319952c69a3ae2b05339d743009d7c0e783355ed07b410c8b94ec5c5e4cb7b4c423929efaf41b82c21b630fb12b2ef9a2f024560054818e68f99 WHIRLPOOL c7df0824908ec2a2f43d9480a5a7f055fb3651d5f320285fb33345e11409fe9069483157d88c3f5a9a5e62046d1fa2919d227255d93c354912c8033bf7b1a22c
 EBUILD zarith-1.5.ebuild 1325 SHA256 995b6a0226647f0418645001378eda0c0c878edbb100a22822e5375ad8207f49 SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385 WHIRLPOOL acf36f0c8f6fbba9fe164b1c9a05413b2088488514970febbaff14db3752ca15ef7ef44ebf24c8d23026cbeb28a83e1dbad2e60fcf73b677ca5e3f9c6e19f233
 EBUILD zarith-1.6.ebuild 1325 SHA256 995b6a0226647f0418645001378eda0c0c878edbb100a22822e5375ad8207f49 SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385 WHIRLPOOL acf36f0c8f6fbba9fe164b1c9a05413b2088488514970febbaff14db3752ca15ef7ef44ebf24c8d23026cbeb28a83e1dbad2e60fcf73b677ca5e3f9c6e19f233
+EBUILD zarith-1.7.ebuild 1325 SHA256 995b6a0226647f0418645001378eda0c0c878edbb100a22822e5375ad8207f49 SHA512 b83b61d3e2caf9fda5cb4abe42882d817af171ccbbdb526e161b0a62997aa37d5876626fbcba3e5df17fc1a0f07a5c0fb48943b8549b6a0351e195ac1b604385 WHIRLPOOL acf36f0c8f6fbba9fe164b1c9a05413b2088488514970febbaff14db3752ca15ef7ef44ebf24c8d23026cbeb28a83e1dbad2e60fcf73b677ca5e3f9c6e19f233
 MISC ChangeLog 1507 SHA256 5b528523cee002ea1131c6059eb04ed45c73a5bdd031fa64558c2b5894f9bf86 SHA512 6264a48f4908b2986c482e6854b3c1b384a94433bd6858176696795f0e3abb7ed4c7b26423ac4743efce941dd9f0cd5acfd4f27358ff2f61cb719060e532bf66 WHIRLPOOL 862c0b678a6e89d183274ad670682cb02e731bb1dbbf4ab06b0dbcc6b61350b9f78850dcf2448dca5b90edec1bd8468dc5ea993b8e0d717c7b2f831eb40bd96b
 MISC metadata.xml 409 SHA256 3788f02a1a848d23a0038d1d67d1dc1bbde54b67d30084f54aafc0230d69e38f SHA512 c409892c2c6af12afd09078ef5f5419523ae45a99369673ac48d1bb4bd3f5be535d1ec614f8340ec6b43e3789f46610618e255e50adac21d6b71aeae1827ad5b WHIRLPOOL ae6efceab43da8f32668c743fc98cf43d70e9b341cbd2fb80e85f6ac25e7c391899b7da707e14031cf1c5a699ff667472efa11b717d02257258b28af3cfaa562
diff --git a/dev-ml/zarith/zarith-1.7.ebuild b/dev-ml/zarith/zarith-1.7.ebuild
new file mode 100644
index 000000000000..857c5026e9d6
--- /dev/null
+++ b/dev-ml/zarith/zarith-1.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils toolchain-funcs
+
+DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
+HOMEPAGE="https://github.com/ocaml/Zarith"
+SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc mpir +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir )"
+
+DEPEND="${RDEPEND} dev-lang/perl"
+
+S="${WORKDIR}/Zarith-release-${PV}"
+
+src_configure() {
+	tc-export CC
+	./configure -host "${CHOST}" \
+		-ocamllibdir "/usr/$(get_libdir)" \
+		-installdir "${ED}/usr/$(get_libdir)/ocaml" \
+		$(usex mpir "-mpir" "-gmp") || die
+}
+
+src_compile() {
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) all
+	use doc && emake doc
+}
+
+src_test() {
+	if use ocamlopt ; then
+		emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) tests
+	else
+		ewarn "Tests require USE=ocamlopt. Skipping them."
+	fi
+}
+
+src_install() {
+	findlib_src_preinst
+	emake HASOCAMLOPT=$(usex ocamlopt yes no) HASDYNLINK=$(usex ocamlopt yes no) install
+	dodoc Changes README.md
+	use doc && dohtml html/*
+}