gentoo resync : 10.11.2017

29 files changed, 451 insertions, 39 deletions

diff --git a/dev-ml/base/Manifest b/dev-ml/base/Manifest
index b83e56532483..97b5ae4f63ed 100644
--- a/dev-ml/base/Manifest
+++ b/dev-ml/base/Manifest
@@ -1,7 +1,9 @@
 DIST base-0.9.1.tar.gz 286498 SHA256 4a616dbbb6c85bee4e0dc03a1ba94928a74eb5cd1ac63e3b9f060a2f85a1ad79 SHA512 e1eb26eb07ee3489c8f42a886e2131bcc5eb5e965727eb29910e3aa37cdab6d23bfbf71421e16b77d9fe20a69392f9313ad6189c9618013794f0ed7df8c76c52 WHIRLPOOL 31674e5490d8ed63d584f56b42db9c48a83153694ee03dd7d499ec7bea6b0dcb8528a45f79fd3ae35a4a29f415c6abb3a06f603ad6478a2af13a928802b729ff
 DIST base-0.9.2.tar.gz 286533 SHA256 cb93c7b8da60adefc6f154b6eb7f94417add7b5d483e7f6f27e13b1295e30afc SHA512 9eae093c18e4fcbc02eb970b73bb7e49a94e0ccdd3fd6509d0668035b454ad8b5894bdbd10027a83681e993b4e1dec97db213b7fdfc293cb9737bae303002e11 WHIRLPOOL 28fe2edcfd0fb3eef62e5e776473af4588b2f5668b867233715cc9b10ec3185af6041728d7cb33ddeb406cc8af54a0607a87d3295ef370e21ae0c167eae33cdd
 DIST base-0.9.3.tar.gz 286655 SHA256 fce1bc3dcfa6b3c3da5a01324c1bce5cbbde70b5dc5e0dded8ba6acb94398cfb SHA512 7c7ca4439479230a6d338ce51b14c93225b71fd98242f47d82e06c08cbec092a33faa7385db8d21ce0302e7f4f3cf5d659a704e2d85ab3391e046c7d7ea3b62b WHIRLPOOL 3bcc65e6132ae9d88de301b0d1f8105cc4ad07f29ef3aff64957206f421652465e49d0fc364e2fa8155bb7612f71a463232418f2a7b51d6d185e8cdb41fe65b4
+DIST base-0.9.4.tar.gz 286689 SHA256 941ca48e046b864a3b1d13742caa0e71910058fcd6e033ea636c94cfa5a93225 SHA512 9e25caee46ec09c835aa74857f415ac61adeb1ae8d6773334fa1b28699b9ebbac9ef95a698b1f324d0ad59c27ea52fea0e0df86bf4908b6ba3e5121eb8e26076 WHIRLPOOL d6bafc897b694bec7913b2d266501e69267688a217d8f47f97ba29ce4adb37e850013857cda7d18a3ad936fdd3b183b916a29f04cbfb748dcda30cc301a5d3c8
 EBUILD base-0.9.1.ebuild 702 SHA256 40aba6d4e1c460b296096a968cf4294ef8588a8589cf4b214f6473ade2ee38b4 SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6 WHIRLPOOL 46a44f63c3e21a8f6fa13c1158ac775225b60e3b22353582102c666fb293fdfc0cf978502357d7ad2cbe9aad180c5b9c9482fd37d54fd0d14060784e31c4521b
 EBUILD base-0.9.2.ebuild 702 SHA256 40aba6d4e1c460b296096a968cf4294ef8588a8589cf4b214f6473ade2ee38b4 SHA512 fec860167885783b655536a434bb3472b949f95416cdb01ba3ce89482459c9248598e73edb09000567abbb48ce57ceb6006b8b7a96770bcd79bb18fb116bf2f6 WHIRLPOOL 46a44f63c3e21a8f6fa13c1158ac775225b60e3b22353582102c666fb293fdfc0cf978502357d7ad2cbe9aad180c5b9c9482fd37d54fd0d14060784e31c4521b
 EBUILD base-0.9.3.ebuild 707 SHA256 44726ee55b48d2211191cdb216c0c64c6958efbb3cb6d813ce3a19c7f910e210 SHA512 051898dde7e937f83f2b88087a3918918a04ade8fcfae7aa637bf5d73efebe6bcb77865b45308002a7dcccdb9c4e6f8a537a65eb935d3bd48eb5da3ed60bfbb7 WHIRLPOOL fffd573b4a4e635163e6565861a6eee32eb1f835e6f7e75982385a07d3425d0152142c1cb84af896f20d6f1f0c89efdd1fe960aa0c8de93ac9221f9d8c9264b2
+EBUILD base-0.9.4.ebuild 707 SHA256 44726ee55b48d2211191cdb216c0c64c6958efbb3cb6d813ce3a19c7f910e210 SHA512 051898dde7e937f83f2b88087a3918918a04ade8fcfae7aa637bf5d73efebe6bcb77865b45308002a7dcccdb9c4e6f8a537a65eb935d3bd48eb5da3ed60bfbb7 WHIRLPOOL fffd573b4a4e635163e6565861a6eee32eb1f835e6f7e75982385a07d3425d0152142c1cb84af896f20d6f1f0c89efdd1fe960aa0c8de93ac9221f9d8c9264b2
 MISC metadata.xml 326 SHA256 4226e2cd4f7f0edb6be48b264d144a338b0f78544ff1041197b7932d5612b89b SHA512 eeb20d898ffb2de1cbcd83f67b9e4ac056729f2f2c1738f0597326fb708134f11a7077bacb8870f20bbcbe71dfd541f7801590294d439ce01be421669d3c92d0 WHIRLPOOL d0545da1421753e2a3bf742aeec28ce6d988ab8ed0fd9be36b276d891ff11d1de2b09a51c8426675fa37d4cff3e9a8948cb8d23897ab7a7c218b00cf371c4eed
diff --git a/dev-ml/base/base-0.9.4.ebuild b/dev-ml/base/base-0.9.4.ebuild
new file mode 100644
index 000000000000..ca33dfd699e3
--- /dev/null
+++ b/dev-ml/base/base-0.9.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Standard library for OCaml"
+HOMEPAGE="https://github.com/janestreet/base"
+SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="
+	dev-lang/ocaml:=
+	dev-ml/sexplib:=
+	<dev-ml/sexplib-100
+"
+DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_test() {
+	jbuilder runtest || die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	dodoc ROADMAP.md README.org
+}
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 0332fea6ce07..a72bb96a5240 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -1,9 +1,11 @@
 DIST camlp5-6.17.tar.gz 718935 SHA256 8fa2a46a7030b1194862650cbb71ab52a10a0174890560a8b6edf236f8937414 SHA512 c4bf32eb79202d6127375b940fe77fc57c7dc5f8c6763b50ba23ab52ae9f3edb0ba15148109af2f6f4808619348d78e927cfdf29901bf1141b17de0d3fd8ff30 WHIRLPOOL 287641aa68bda275e39968aae93500307b5726e5381bbb5012840fcd6f3fd9a24335e9950a8fd9fed61045bf328ea877cd96ad735f6ce712b2e65a747e4ccf9e
 DIST camlp5-7.00.tar.gz 755750 SHA256 0b252388e58f879c78c075b17fc8bf3714bc070d5914425bb3adfeefa9097cfd SHA512 2d63451229f86fffeb287735ed26901ad43bb964b6ede1716cb82737001a5c1e4b77479a969509606f6a4f14bb6dbff32275d82f4a9640e0c16bb6594779e849 WHIRLPOOL 14fe8e69a7146397744d3868196f8df4d14e33a849bc0159ac6ffb4f4acc99ee1b8c37a65de3a1a82743eeaac7506c7c8fe517c0f1880e5967e0adb1d5684dc4
 DIST camlp5-7.01.tar.gz 757118 SHA256 c83640ffabc5506d7b9c9fdcc342062dee1eabd90de547c0471faf5ef5560540 SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008 WHIRLPOOL 584257c9c7a4ae1b55f6c8135b347708aeb7c892f495a10110f330e23dee01d6d95c2f921e14958fd7f2957373d7817cefd18c7e861e20f2dcff933405c5b23b
+DIST camlp5-7.03.tar.gz 758136 SHA256 c13d0a957a8e70627e1900ca25243b5e8da042bbda9eaa9e7d06955c0e3df21a SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d WHIRLPOOL 3423b097c2bb7d09a2d1747417c81c1ac8c6ed070ee9aac055aad3e56bfdbc87f58c03b6798b24d728d360405117cc6bbd87fab5ecba93bd19451c6cc53d17b2
 EBUILD camlp5-6.17.ebuild 1655 SHA256 ce2b02fd48d442603ef48db9cc8c464475749fcf2aeec4d3e9bc1ef7e889bcc5 SHA512 9ca905692a13fdb8783a0df0f3a13c7700ffcc03d526445b6ba79fae6ecb1c3dce40ce7b0a2d9f16adbcda2f0d1a5949a3c6718815280141df934e2dce0b193b WHIRLPOOL f3d08eba0d848ce659a275585ef0f66db672a0d8f46219cf5aed5b237ad276fa2b973a4a74fe072d5bb8f76d79db2bdb063b527946b3f91f739e19dedbea3843
 EBUILD camlp5-7.00.ebuild 1462 SHA256 51b5be18a111e81729661a011647c278810c592276e8d112321f28039f078bc3 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3 WHIRLPOOL fa0625240c470cf45239d2ff5e1330cb96eaf11fc79e0aed7b4d1d9926be41fff1feaa42685f8790523749205497a7c61994065f1f32ee4378702182cd395cd6
 EBUILD camlp5-7.01.ebuild 1462 SHA256 51b5be18a111e81729661a011647c278810c592276e8d112321f28039f078bc3 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3 WHIRLPOOL fa0625240c470cf45239d2ff5e1330cb96eaf11fc79e0aed7b4d1d9926be41fff1feaa42685f8790523749205497a7c61994065f1f32ee4378702182cd395cd6
+EBUILD camlp5-7.03.ebuild 1462 SHA256 51b5be18a111e81729661a011647c278810c592276e8d112321f28039f078bc3 SHA512 6a03760cf9e53ef8f0595a161f7b49874f0a3df7df99002defc6b73ef7e7c92d32753e9371a4ddfc682dbb32582988c87c925ce08262cfb9bdf6dd04f52a4fd3 WHIRLPOOL fa0625240c470cf45239d2ff5e1330cb96eaf11fc79e0aed7b4d1d9926be41fff1feaa42685f8790523749205497a7c61994065f1f32ee4378702182cd395cd6
 MISC ChangeLog 4190 SHA256 23bcef192708954a9903d0a0a403faccafc4ce481130926df59d04196f3379dc SHA512 4b82802ce3a6cd18c761603aec388c5af399587999c011c6fa1e3bb9b7efea12a6f57352c8df448e3ee9c9de22b7a94a79ceb7131a464e9068e95b910acadd0e WHIRLPOOL 7b1b9d7e69e728f5aaf9d85caff49a92f0427f399f9bbef0755e153c98031f4bf5863b1c2d63de9655042e8936207a4af9f5ba527bdec486496453e0cc8807f4
 MISC ChangeLog-2015 10891 SHA256 bbfbf6eb9cf34740efb86d1bc9d2180bc1389f3645109db736be6b3826bb6c36 SHA512 a3dbea358bfe180547541e5dc44d2b5728c860b775023fe2498e0a6c6b240abada01d02317ec9fc86ae90483f4ebcabc45f5539bc5e0e013f848c0a3f0412494 WHIRLPOOL fa63becb1c672105e9d7113d47ca27561476664ad5fe3cf9eb64eb78ca7ea93693f8898dd3243b20cb5eea65283b232b0fdaca652568d70b56c04c6bdf4cb9a3
 MISC metadata.xml 324 SHA256 e4bf519d94c3bc731cf4cc042dfae19f72af3b0fbe0f0025dccd495883e58423 SHA512 6c687a098de464ce854345b4d2828c62331346d30ddf31c522ee34aaaa1400853c957d0cbeed9f993e8b449442ba6f56d8c9d22634465cc7e87250a5058d8729 WHIRLPOOL a5ff0b6cb067288e75457f32d1171a48160cf93a7a219673eb9e11a61d0ffe22a08f6913bd3764bc53962695eef289134d75a93d26779c3a4b72353387ab6bf3
diff --git a/dev-ml/camlp5/camlp5-7.03.ebuild b/dev-ml/camlp5/camlp5-7.03.ebuild
new file mode 100644
index 000000000000..c0f52ab10e7f
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-7.03.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit multilib findlib eutils versionator
+
+MY_P=${P%_p*}
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/"
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(replace_all_version_separators '').tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel$(replace_all_version_separators '')"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+PATCHLEVEL=${PV#*_p}
+PATCHLIST=""
+
+if [ "${PATCHLEVEL}" != "${PV}" ] ; then
+	for (( i=1; i<=PATCHLEVEL; i++ )) ; do
+		SRC_URI="${SRC_URI}
+			http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${PV%_p*}-${i} -> ${MY_P}-patch-${i}.patch"
+		PATCHLIST="${PATCHLIST} ${MY_P}-patch-${i}.patch"
+	done
+fi
+
+src_prepare() {
+	for i in ${PATCHLIST} ; do
+		epatch "${DISTDIR}/${i}"
+	done
+}
+
+src_configure() {
+	./configure \
+		--strict \
+		-prefix /usr \
+	    -bindir /usr/bin \
+		-libdir /usr/$(get_libdir)/ocaml \
+		-mandir /usr/share/man || die "configure failed"
+}
+
+src_compile(){
+	emake out
+	if use ocamlopt; then
+		emake  opt
+		emake  opt.opt
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	# findlib support
+	insinto "$(ocamlfind printconf destdir)/${PN}"
+	doins etc/META
+
+	use doc && dohtml -r doc/*
+
+	dodoc CHANGES DEVEL ICHANGES README UPGRADING MODE
+}
diff --git a/dev-ml/configurator/Manifest b/dev-ml/configurator/Manifest
index 03be03693c53..c05c4836f55a 100644
--- a/dev-ml/configurator/Manifest
+++ b/dev-ml/configurator/Manifest
@@ -1,5 +1,3 @@
-DIST configurator-0.9.0.tar.gz 10221 SHA256 05e2f6f7bd92cfda01a95f3993db75e8c377434bc10ebad71f34dad610b4de5a SHA512 3ed50093ecdeabd1e9bf7eeb99305fa64f2166093c75d616d627eb5aeb0df07092f7b43234140cba6ecec5c0e876d45f8e72b65f00b3486efa2bc5576252199e WHIRLPOOL e30c18e188403142de1fb021f0f1fac7f919343dedc6ee31cc4155fcdd38f4a274ed7e2bcf68fce86e4011acf7b76eeb3629c496fa9aaff48a850a50277831db
 DIST configurator-0.9.1.tar.gz 10231 SHA256 f93c68f4d9d2939555fdcfb5ad02cd06bbfc116374bdfb7779d80f2ab1affb96 SHA512 43d864d3317241dd66829747dd956ac42614cc687bbca23e2575cb1b3ab9d0c628dfbdd8f026bcd4d76cb87cf282d955d6a90f0e69543ee1ee1f01a1efa9b54b WHIRLPOOL 1b771aff10a9676ce2fab2c24057f612c414e211c504ee63fd54652dab6edc2d1d35708643bee98764677ba85811650e93ddd720c06cefc4af8e431061643d10
-EBUILD configurator-0.9.0.ebuild 749 SHA256 940776536c323ed9ddc6d757b85d0b90c1e2481bb88c36b53b71ade805e39aed SHA512 a660317829309b297cbf29241cb005526da5f380b976ebbc0ce01c0599432f4df32d214ed3ea0e479b09f41e7fd6da2c995f827fe658a654ec903afba55792f0 WHIRLPOOL 7e97362ad2e752e3c6cf9240308cac9387a87a4d1b1d853b43f3881933bb7fdf9a64d4eb7211cc3ceb2e87923db3a56d3defdd60868fb0ce9b8e83655cecda1a
 EBUILD configurator-0.9.1.ebuild 754 SHA256 a78def02ed449fb8c6df8b0fb60faa988bcc2e37cd5d0b9e7129ba1c3c5791f4 SHA512 b8b2b397ad20fd75a4664db3ce95e1d597bc29a834f5b0c3063fa40408e9f005e7c57aab8c0e44c511e107101552126ef6b45dfca4f6e7c7a604d3bc0e8d68bf WHIRLPOOL 7268d1ee0729737bec9eacdcf7145d23d1be477078220fce2b62689950311bd259fad586cfb75322b61b2e919a4a7c4a062fd9a8e7d6395521e559070f4e971a
 MISC metadata.xml 335 SHA256 cf20f61f1453d82fa97c15fd60f572d8d2fee29fc608dd6e3fbe28f14e32a668 SHA512 661360e00a85c70e5d1b28e2a4003d34fef28daa0e3efb909ac9bb748829e43ed50f5307d19c86e5c19142f64e1ab769845c583a45a2b4b93a9ddf2371ed96bb WHIRLPOOL 56ef12d21ca224e66e669d6f3de103c3b25b56cc61ba86c1f1e7cd8d6414a2f9eb832c8d501b87a7a89f46c2d6de6ccdcf859cfd49d25c3a8d32c83d11320f77
diff --git a/dev-ml/configurator/configurator-0.9.0.ebuild b/dev-ml/configurator/configurator-0.9.0.ebuild
deleted file mode 100644
index 2d78c8695c78..000000000000
--- a/dev-ml/configurator/configurator-0.9.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Helper library for gathering system configuration"
-HOMEPAGE="https://github.com/janestreet/configurator"
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	dev-lang/ocaml:=
-	dev-ml/base:=
-	dev-ml/ppx_base:=
-	dev-ml/ppx_driver:=
-	dev-ml/stdio:=
-	dev-ml/ocaml-migrate-parsetree:=
-	"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-}
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 1bc9103d38a0..7292b32bebfc 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -2,7 +2,7 @@ AUX facile-1.1-make.patch 1613 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee3
 DIST facile-1.1.2.tar.gz 99755 SHA256 ea8b72d1d171fb44c0c6dafbddac0ccb0a453a7caafd1852919d4f805eded367 SHA512 12c086a9e1d7b2d76c36fa3d7b519da24199bb958b56050d5635cd6eb0288b6d98845b4ade74e22127b2abd405f359b0a33cfd776042187f3ab506ad656676df WHIRLPOOL d643b8b7151fa262542f6408acda23b6a29466b48fc288ea9efc8b024c418e95ca50ef005a09c61f6030faddbff6d2f013b1ffddd4544291f8387b29303a0a32
 DIST facile-1.1.3.tar.gz 99656 SHA256 5cb63ddb0dca8de12cd54dbf0de37e0fa8af54e7c1f15ee035a33ec219be8aec SHA512 78d315188e661245eb7306b645e9baaca94db0b9511112b57dbc8597bf2f75cab5604c8f4cf850209464e802c636f592552c8b492730cb28896d2acd7f413346 WHIRLPOOL 31ec165d6f02ce0e3b2e4c12d151f14075916cce325f0028d56e3a2d62cdb03da7d157b223c1e7df06b30b603a89e0303a8c73b690fc659d60d7690614692b13
 EBUILD facile-1.1.2.ebuild 1366 SHA256 6c8bcc82c7f69203e92e5d5f7986be7af24ce49c3a73ce7d4fdb856ff76feda1 SHA512 c86f22411d39fe1c42d2361a830cb6bf763e3d7fce029461ec12a5e3dd813c5159c2f5dfaa95a2bf292fc18ff964f15b6194f0ce842c6dc1e87a360762343111 WHIRLPOOL 5953d11a25993ddd85ea8c71cb2d7ce72316413c108fca1c8a4e140c1cab3a8cc4c1b58bda523017b91ddfb78a7675fffb649c265130e2ac912bd474e0599d8e
-EBUILD facile-1.1.3.ebuild 1389 SHA256 80714a45cda3c6f4c63479ba4fbc3cd999602930640d57d40bccdc1273c349a3 SHA512 3668136ddf52db6b6cbeeb7ddbb3cf8db44b65a5f0a31000c199d39800ea7b4d91367b97d975f2270872cc6b6ec56d6d80804ca41ab7ec63f3e71b4af8b8b54f WHIRLPOOL 8945eee62ea94180bc1b1312e475ffa5f5fa4327f632a7b0af30aaf6b2a3e993777fe108bf1a970714ca601847dee6729387e6bdb2f2118b1cb48011cc7bea46
+EBUILD facile-1.1.3.ebuild 1383 SHA256 05c3819507746488ee83eed859ee65dd6b716e300519be45192d174919ecf0cf SHA512 462f780faaeb221f96e1ccd247f6bbbd63dc932d9c5bc2b476a6c18cf4e42d874879ba99eaf6883f72a893b9e854b8366aaa6c847a30b56d940a070d30b3e339 WHIRLPOOL e8b34af0f621ea33057ca7b65c7a0150e1a95731985dbf1ab43bd470a402a2d3e82343ffecb09ac9eb783ef8e28028e9b248c22c9e29498a193a5087023aa339
 MISC ChangeLog 2898 SHA256 d1be8a08544f54db20b880489f77126fc38e61d858c77c11a568754354118ceb SHA512 d57f2a4622f6a8137dd79287350fe368fb1095655404209fdb2bf00da9f4fe12e042b85963d8f8d9e03cf73e51302d03496dffdc89feecbad7845a0c786ceb58 WHIRLPOOL 213718cba3eefeba153119a52cabf13e364aa94e6bfe516f7734bd31141e21597c2025a64d2293056cfc960aec1bb8ad0b1c64ea2e40a78f6d9782cf7fbb95a2
 MISC ChangeLog-2015 3157 SHA256 a323d6e5cee5c94a83201c851ae96e7e61e90b430367d23bc763d71ec18da0db SHA512 9051d5261825c6b65cdf22641bd4973e2aad88e0e2c66141c4eaa1f19dcff27bd40ca0c4d1bdfecabb5e61022706f90e08bb741cda48b0c5603ea882e601bef4 WHIRLPOOL 216c6fbfc3348700501546ec257080ed9138b9a22bf584b0827972747c4e3af6fc519b8b62153a0de22f69d2aab2c50822c5ea9d55bfc12e7d81966d3ed51230
 MISC metadata.xml 357 SHA256 ff6104acee7724ee9c82d7c35927e582cd0ed92c80e154b664c4de034ba916b0 SHA512 8491e3bed96f117fe721e3e6d261d75480e0b183c06ec21d606ccf659263dc8c2642b1fd30f89aec63a2e70a725f71985119117c1c11fa3fe8b49b7c31db969c WHIRLPOOL 365833bda8a247f2c7822902d3d0e606df18a0c8a4c60e7fd04735105fdafbc1efab27a486a65f4aa2cc693741fde2fb40671a142cd99e163120e6f2fc5e328a
diff --git a/dev-ml/facile/facile-1.1.3.ebuild b/dev-ml/facile/facile-1.1.3.ebuild
index 70b836ea6aad..a1d0c160eb67 100644
--- a/dev-ml/facile/facile-1.1.3.ebuild
+++ b/dev-ml/facile/facile-1.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://opti.recherche.enac.fr/facile/distrib/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 23dedb3cf9d9..6ed5baf46065 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,5 +1,7 @@
 DIST lablgtk-2.18.5.tar.gz 808005 SHA256 2bf251db21c077fdd26c035ea03edd8fe609187f908e520e87a8ffdd9c36d233 SHA512 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024 WHIRLPOOL 009e1fd2a048f6833ac1d745b5fee5d618b9729fa8c73d29f7bd67b6bd5f8a9b81c361ceb69626afe6a3a09b84b98ccbf0a19e9add0329a50a8ebfbcfdaf7b85
+DIST lablgtk-2.18.6.tar.gz 804837 SHA256 4ddca243066418e2a88ac49ebf2d846fac4b667b1b1753efadd078ae777368f8 SHA512 0d30da0e4a93b1693ac6d63161d40c8cd6d9337e105a65f3cc01b013ce7ca04aa5e1a013527cb0728a9b7b7af20d0f4c8b0cc7f9102e553dff3cf8bc83a14e5e WHIRLPOOL 6888d91be3cf3cd6818bb7f01323375f870e505a306699df3a34e7273e9acae05f281af90ffbb58c09a8d5f98fce7e149a34c5a3a145ffe0f535db42a3860ef0
 EBUILD lablgtk-2.18.5.ebuild 2503 SHA256 fd5d40a3d12cea2537b04ab992a3359936c61c8fc6d7c228be171134680410ae SHA512 70925cc5f13be37fb907c8d3e12e6c44bfad72cdb088892120f971892b44f0f59f5355c5b443b57e1c95ebe04cc76ca68048c2fc55eedbb2b7bdfdbbc407ed14 WHIRLPOOL 3501fc59cdccbcebf6a66cfef74cab6a9bb968e35c024b74fe04079cc325fc3f63facc51955a78dd1162b065cdc14d8e3c2e6bc838e98807b40a265ed13dfc2e
+EBUILD lablgtk-2.18.6.ebuild 2515 SHA256 ef912a5dbc631f7e783b8086dad43514c3d409fbc956865c6afa30fc629ec122 SHA512 98fd4b3f703f14bdc9cc5850312802430baca49c837fd40ed825e4ba8c9f722eac7eac6ff825dc0df5f5f70868c1995da9e113e5ba0d934bc083303a4382c58c WHIRLPOOL 56be05c96febf37d55ec27497b4e73cda628f7b64920bd7c28e55beae4de04f6b77cb0ee0c26f3fa733cdd0016a96739b3765b233f9fcfe100acf457615cce04
 MISC ChangeLog 7193 SHA256 f49abfe4e72e2c016c321d4b29c10382f442929fff2e306a1b777edd6e71048c SHA512 67a98cca32c5262a3ca090d1bfe49f3305a4bf543aa1c7d96439997357f0682406fab58d392e57b075b7622a8ba62ce0585e541246e697030eec977ad33d6410 WHIRLPOOL e9b85511a5a5eddd5f61fa2b744f6f63f207ac684d184bd0306e02c9e4327987999bc589cd90ed45ea910ae306f8280a598f90f3f5a6e9534b1b163f557d6345
 MISC ChangeLog-2015 15365 SHA256 08152f0579d9da0966bd4ccb42017b8df552a4c32d56346eb695feb6fcf813ae SHA512 b3d6f317a6e47d82c1d3497faa3371cd8070660d9933bd770a1a48e127a5f5d02096fadd116fd617bc6729faaaeea91850afe36a57d3facc1ef74ae914c93c7b WHIRLPOOL c42aba32b05505d855a6c2d30a6771c609a4dd19c26b722ded298fd4d0201ccea282ee52fba595e1836d6b588ff4ff7210006dee16e4aef9a39e2161273860a1
 MISC metadata.xml 461 SHA256 4b9412ff063931198bcde9856e54fe085734a37747c856a8239f99f6f7837afd SHA512 4401c55a7286fcfac919ac0bcec77d590641c79826eaf126a7df338e1a3d19e38d930eb8b0bb1716f9b5bedea0bd54961dea34fb3133b9bd4f621138cfedf78d WHIRLPOOL ec5d047c0cf5a59a7a86c52f9720bf67690d4e3a77a508068128d1a7c3e16702f5e1d5569e29c5b92df57ebe53042897c176bcb1031125e42b98855bf05d4111
diff --git a/dev-ml/lablgtk/lablgtk-2.18.6.ebuild b/dev-ml/lablgtk/lablgtk-2.18.6.ebuild
new file mode 100644
index 000000000000..00e9bf7bcd91
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.18.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib findlib
+
+IUSE="debug examples glade gnomecanvas sourceview +ocamlopt opengl spell svg"
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://lablgtk.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1726/${P}.tar.gz"
+LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
+
+RDEPEND=">=x11-libs/gtk+-2.10:2
+	>=dev-lang/ocaml-4.06_beta:=[ocamlopt?]
+	svg? ( >=gnome-base/librsvg-2.2:2 )
+	glade? ( >=gnome-base/libglade-2.0.1 )
+	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
+	opengl? ( >=dev-ml/lablgl-0.98:=
+		>=x11-libs/gtkglarea-1.9:2 )
+	spell? ( app-text/gtkspell:2 )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	dev-ml/camlp4:=
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+SLOT="2/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_with svg rsvg) \
+		$(use_with glade) \
+		--without-gnomeui \
+		--without-panel \
+		$(use_with opengl gl) \
+		$(use_with spell gtkspell) \
+		--without-gtksourceview \
+		$(use_with sourceview gtksourceview2) \
+		$(use_with gnomecanvas)
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+install_examples() {
+	insinto /usr/share/doc/${P}/examples
+	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
+
+	# Install examples for optional components
+	use gnomecanvas && insinto /usr/share/doc/${PF}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
+	use svg && insinto /usr/share/doc/${PF}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
+	use glade && insinto /usr/share/doc/${PF}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
+	use sourceview && insinto /usr/share/doc/${PF}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
+	use opengl && insinto /usr/share/doc/${PF}/examples/GL && doins examples/GL/*.ml
+
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+src_install () {
+	findlib_src_preinst
+	export OCAMLPATH="${OCAMLFIND_DESTDIR}"
+	emake install DESTDIR="${D}"
+
+	rm -f "${ED}/usr/$(get_libdir)/ocaml/ld.conf"
+
+	dodoc CHANGES README CHANGES.API
+	use examples && install_examples
+}
+
+pkg_postinst () {
+	if use examples; then
+		elog "To run the examples you can use the lablgtk2 toplevel."
+		elog "e.g: lablgtk2 /usr/share/doc/${PF}/examples/testgtk.ml"
+	fi
+}
diff --git a/dev-ml/labltk/Manifest b/dev-ml/labltk/Manifest
index fcb8e2286022..c8d3d43c1c7a 100644
--- a/dev-ml/labltk/Manifest
+++ b/dev-ml/labltk/Manifest
@@ -2,8 +2,10 @@ AUX findlib.patch 645 SHA256 68e6dbe7c2d67e4590949cd1321de9fdd4952c051a9b162f162
 AUX ocaml405.patch 13731 SHA256 ddadf02211c0b4055b8375d975fd73603723100ebfff1fe7eb16e38eec68afd1 SHA512 a246af35b932e773e0c58b745d3885f98162892945f359dc4781489d76715c0564efa2ea985a43808e431fb8fd4225d4ad7b6a753abd54a8f12dc65ae43cfa9d WHIRLPOOL 14d35e7814497bd97055eccc44a36c4a35e90106ad181f78a0bf35cc24c9f89cbb25bdf9e18edc24785b91bd69fa4a26cc31f1362ddbc168cc00909c4d09bb5b
 DIST labltk-8.06.2.tar.gz 369508 SHA256 b32ea0465ec2fff89ebf5219845656f8334f61857e01ea3d59b3ab31749227dd SHA512 d9342d49ba8769edd7a4ed051844f6ae5d3e62a7c2c76e895bfd1162d0433c4ea54f2314b29b708551fba63daec1123553b56f0abb6412807ab00d7bb40b73d6 WHIRLPOOL 4300efb9bc6499901f7b984bb10230fdea0084d6346f5f8acc832eb054f44e52c00425994196721a966caabc917a93210a20b8bea25eefde08b4288f58a04b21
 DIST labltk-8.06.3.tar.gz 369924 SHA256 b6b7076f6a2a7b2f63095013cb4e37a1f2a6eb3d4abb57dbb1b8cff1ae4c6ae6 SHA512 c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979 WHIRLPOOL 5fb97fba547a99655a2ecce3014f4ef9ef9e57ae5f9db531bb166c066210738aba48c5c79e6900e6559bd40ef11c123dbd8fc9ccdbf056ce813e7b79124c492a
+DIST labltk-8.06.4.tar.gz 370079 SHA256 3132dc8f3748a121d094e21b8a8a84322c13882ed36a3d141f2965f23ff87948 SHA512 5221d2378f73cbcc2a4abd003023c01c8f0e1a919029ddb06069db30284b0bdef12e03b66b9c7c694c7a2128b060f2f2a5a34e4f3b8eed1060a0880a2e429644 WHIRLPOOL 23226b6dbd79f7a70123a6377a7f4270e08bd1f9c9997bda02d8a4bf4bec1910f9a0ec42cbecb0e9dedffc7359b5d251bdce0632b6d4f40056cce9029de82a69
 EBUILD labltk-8.06.2.ebuild 1118 SHA256 81b72d98577fdee8ad909c32e84f233e8388fbdf97466131d3ba95d06f46c601 SHA512 387bcab89c39ed0ed80dac5e878bbf4f1dc4e62dd6b8384db9b3a68a57ab5f360e095ff05e41b5785b44c773dde25ef8f6941b64d0935473410067a9c4e48baa WHIRLPOOL 7796c51616c3734b1379fb50e91f8f92f2c942db71f123ad9bcd0105b68ccd25efa623f8b84ef089d9ef80bc4258fd9ce5557070101bc942af7b7fd80b4f5720
 EBUILD labltk-8.06.3.ebuild 1044 SHA256 28e767fb17268805c28f2225bb5f77377a35731cdff9239dbe89ffe8302b5d36 SHA512 eb8948252b7aa811219bc2980a436d8d7b1cb5121d3025a908f32cf6cab3105982560509397fd65d09e93fb93c036644f4e5906f1c17292fd7bdaa01d95e3d56 WHIRLPOOL 7baafcd3aaf98ba51dc915fcc31dfa174403be690560331e6b879fd211ce61bd2c4e4f5652e1bcc294c287f8420cc95c8a3065a2bb26fc4553abcb3c073ee0b6
+EBUILD labltk-8.06.4.ebuild 1049 SHA256 e8153766e5bd1cccd0b1a46886cc59457f729ced8a427cfa4d7bfc9431637690 SHA512 6253036e6954dcfa3072ae743c4c0efac08d3a91b5db50e16f982a891724030d1f4e64c5a09d662706b6b5e74f9d52cffe49a4c517c57b5fb783e1b231c2b06c WHIRLPOOL 1c3aef449646db0454b16c04bd7a94c4f283037b1703247b1536fd2ad63fcab1edbd70c21a38a66842724a3ea6a425025dec18652461beb28c416bfa9c6d3eb2
 MISC ChangeLog 4034 SHA256 283ba1020b31a02d424c98c65af45f86d925333333f1d61d7cac03e465121a5f SHA512 1c1b834bce2ffc4561ec27a3bb608f6e962e6e3b27205a86e74e1c8a29d084c87a7229e83cd5d960f81bf58c400c3aada51984238cfe2b5173332d9777a30d72 WHIRLPOOL 0e94b9ff77c3fed25fd3ce8802b42016bdf07c12257dde39c72c91667fbd8bad5608eea17099b23e7618e52cb5b8ece1350c2923535319d1830b4a9ceaae5224
 MISC ChangeLog-2015 890 SHA256 ea96173f7287c7cc4cc11b725bb313ad2ede7223303d08427e0c2d7eb4d00cba SHA512 4690e4a8a73c5ac11ab68626029ec7a738f640fc256514e140a394c4da7288822ca666dfa2874b12891306e13396118dc4183c494545e6bca64cad945d609cef WHIRLPOOL 48cc1be3886754b3a27e687fa3e12d4f3b96874b536ca56aa2bc11f24fad9c7a7a5a7cba03570a5a118f7ad3b80865e2ca00ba1a84260057c5a6140682616c8a
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/dev-ml/labltk/labltk-8.06.4.ebuild b/dev-ml/labltk/labltk-8.06.4.ebuild
new file mode 100644
index 000000000000..f5af7fe686fc
--- /dev/null
+++ b/dev-ml/labltk/labltk-8.06.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="OCaml interface to the Tcl/Tk GUI framework"
+HOMEPAGE="https://forge.ocamlcore.org/projects/labltk/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1727/${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt X"
+
+RDEPEND=">=dev-lang/tk-8.0.3:=
+	>=dev-lang/ocaml-4.06_beta:=[ocamlopt?,X?]"
+DEPEND="${RDEPEND}
+	>=dev-ml/findlib-1.5.5-r1"
+
+src_prepare() {
+	epatch "${FILESDIR}/findlib.patch"
+}
+
+src_configure() {
+	./configure --use-findlib --verbose $(use X || echo "--tk-no-x11") || die "configure failed!"
+}
+
+src_compile() {
+	emake -j1
+	use ocamlopt && emake -j1 opt
+}
+
+src_install() {
+	findlib_src_preinst
+	dodir /usr/bin
+	emake \
+		INSTALLDIR="${D}$(ocamlc -where)/labltk" \
+		INSTALLBINDIR="${ED}/usr/bin/" \
+		install
+	dodoc Changes README.mlTk
+}
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index 3a16e770f6ae..8087a9100809 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,5 +1,7 @@
 DIST ocaml-expat-1.0.0.tar.gz 58149 SHA256 69d0bc2bfef2b4310faac2bb984173a26abde5c5758152822f6807774c7abe4f SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897 WHIRLPOOL 7f3140317bfb44a2980199a4cd09ca641dcfea419317289d1528402afdaa54c1f8bcff02053ad6cebf169441ae6c2ff0906ec7b3772bc3fe7c30cd588d86c445
+DIST ocaml-expat-1.1.0.tar.gz 58318 SHA256 1f23e3a355182ff93f43a90c1262865339fe29778825e990ca0337050ef9f616 SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23 WHIRLPOOL 6bc42fe2d457a1798b463159ed8d61ee66888e5544ebe9393da30d6a2daa70fdac4280f7ef7882d95fc87b7061fdc3d15c508248fdf76d69e3c403ff0d360a2d
 EBUILD ocaml-expat-1.0.0.ebuild 799 SHA256 54924d8414e2bdbc69779ff358af2a25b120b0c8cf3a8a2b05c4e1436eef8bef SHA512 441c8b375de084746533a41b878edb94a5ed5494b080da3ca6c9cb57730388f9e79503e2dee486e5d0807e025fcad7c41f5aca669a4e81c9b181a79eceff3d73 WHIRLPOOL 923a538a6a9804402ff1c9d5114eeb822c31385f5140af1da1043afb9e3f24952dee96a49e64486c4b0d424219d20aaed2245890b21c5b2903e5bd30a469fd5b
+EBUILD ocaml-expat-1.1.0.ebuild 799 SHA256 54924d8414e2bdbc69779ff358af2a25b120b0c8cf3a8a2b05c4e1436eef8bef SHA512 441c8b375de084746533a41b878edb94a5ed5494b080da3ca6c9cb57730388f9e79503e2dee486e5d0807e025fcad7c41f5aca669a4e81c9b181a79eceff3d73 WHIRLPOOL 923a538a6a9804402ff1c9d5114eeb822c31385f5140af1da1043afb9e3f24952dee96a49e64486c4b0d424219d20aaed2245890b21c5b2903e5bd30a469fd5b
 MISC ChangeLog 2476 SHA256 37bda1d4ee92b58c8ad269d0f63a832fcaef765e5f63f4adc9b86dcfc11be42b SHA512 09eee12958d71bf2edef955c42b1be710f7fb9c82aab7740e9cdff63e100f87e928cca84cedcf0527ecc24daa956d6132bbca0f7cc2759a83f9a5e296c023320 WHIRLPOOL 17c639c619ed410bb3814ffb40a07b1108f40829b2575e11bf6a98deff8b1cdb81ca43b26d1061db38c5fec7c9100c7d4a5862dae14591af5cf40ffa1007010e
 MISC ChangeLog-2015 1237 SHA256 31462aa2cdb0fda4123550028acb20f571dd5a420242c73581232749af3156c3 SHA512 a89580e21d64b1547b0e1885718b084bba5b1eb1cb8475394a095a2da5e086d160b8fce3d56fa0967b6de8cbce773b671d27ea2e82414f0183f4b3e0fb6fe8f3 WHIRLPOOL 490d7d7f2160d471d464e5ce3b89a945fe152822a388b584b23f7e09488e8d8c36f783166b6c8e607130ed24b31dfa0b2ed7a50f009c3309bde9bf6785f7a8a3
 MISC metadata.xml 344 SHA256 b24ce50c7ad3024a45f5dca504da7b984f50cc260969ebc093d2a4478c60773c SHA512 55896d776b185342170d38e2b36d98359a9bbab592f7740bf0d8de90d3cb8a6184381e824a2dcb22e8497b2d4322362770b538a55c0d3f6cb64cc81f7f58303c WHIRLPOOL b83e0169899b76d6a546a29fed9975a83b5337a7795eb46c64e661dae39d5b9d893b0495ae75ddaf68ba6946319c8216280400b97805fcbc4b9d415483846104
diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
new file mode 100644
index 000000000000..00eeb198ef8d
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+
+src_compile() {
+	emake depend
+	emake all
+	if use ocamlopt; then
+		emake allopt
+	fi
+}
+
+src_test() {
+	emake test
+	if use ocamlopt; then
+		emake testopt
+	fi
+}
+src_install() {
+	findlib_src_preinst
+	emake install
+
+	if use doc ; then
+		dohtml -r doc/html/*
+	fi
+	dodoc README
+}
diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest
index 4e56a15ae616..b595d384e514 100644
--- a/dev-ml/ocaml-migrate-parsetree/Manifest
+++ b/dev-ml/ocaml-migrate-parsetree/Manifest
@@ -1,5 +1,7 @@
 DIST ocaml-migrate-parsetree-1.0.5.tar.gz 209078 SHA256 5fbf6f7a03bfc37f7d090785e0e1fd1368d42f6449bfb0e75b9f3ea616b764fe SHA512 eff87416eeb6175820bedfa3160160fa7328bcee3d05e066b5a94db25a476299f3f5ad07db22eb192f84e5b83804cf2e3a66d77561c984d658d9255c43660b90 WHIRLPOOL 856696733394a5f877f59aedf89c1c5a4f104297a14c53c0399c76c22520d7b0c2913f7662b347ed9004c26269b55bf3ee65421f5a1369025bdc2a697f93445c
 DIST ocaml-migrate-parsetree-1.0.6.tar.gz 209199 SHA256 2ae17e143688d7b76f279b19c9964bf5808213fb9131cf7129dece5383dd7615 SHA512 b44b9fc59cef787a0188245be357685fe7ecd5cc81368b5677b3389e8d09834e5e40f94a3cd7be762f3eb27657a628c0a228c4cefe4443ad1dc8ce012f2552b4 WHIRLPOOL 00ac5d44d4039652383ace78cd722ef5c519ef66def356235ea41d80faad1def142b15c0c258711e86cb1a2eeca9ab390b8f3bacd2189fc92807bd27a5ec469b
+DIST ocaml-migrate-parsetree-1.0.7.tar.gz 209251 SHA256 591cef61f0c8169bd48381782e0f7fca76a777410c7286ac776a3c71a1d8a6de SHA512 3ba1bfe4840b2664b5053068b3659eb6a2ca216f29ece3f4522d1e7c5d87cb643bfb59ebe0563264cafdc31b9aa572007b4261fd3df8b27607fad47ff6168892 WHIRLPOOL fa1d9720f78e3ac837b413b75ac886e2e62d7efb3a31c36398639010a5c0a47115f465581c61c6fadfbe6c68bac7a7792121ab40952e6db1dd4dd7e14778a34e
 EBUILD ocaml-migrate-parsetree-1.0.5.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
 EBUILD ocaml-migrate-parsetree-1.0.6.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
+EBUILD ocaml-migrate-parsetree-1.0.7.ebuild 535 SHA256 f449b5a86e37d4601a1d766fb009a39eb3dac9bd096832a20127715a05e1aadf SHA512 3689a644a17ca76067c7c1559a23a25d8035a78c51d35fc5d7ec5d123d0f172583406b3c30665f57ad6cee1d73c6895019384a90926d0c95812c484a2fe3a6e3 WHIRLPOOL 5d64adea24ae540da206d5b0eeffd05d5db94e567ab02389cc67e0f55e0560fb8ff9f6d37d9342560d84a1f9c50b3b8c3f68bb645271aaee98e2b8d1768d510a
 MISC metadata.xml 343 SHA256 579617da042a3895c1e5ef1eee8e16f5d11073a3d14ad9cb2b0d54c160f2696f SHA512 21dab98a6df0be04a7256797e7dd6d0056a16018fe20e9c83470d0e6fe7c2a792d9251d691faf92a4e00c1ced2f34d1a5b7fd7c901104d5d78739d1c465f391d WHIRLPOOL 7b0bbb3a477d1ad1d2120a4d07fa8e45302a7c6972c007c1280de5cef91c9932e4adf968986932749b9879bcbafeb2479cd6f28cb338c2bb1bf9af3ce618b369
diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild
new file mode 100644
index 000000000000..da28219a5424
--- /dev/null
+++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib opam
+
+DESCRIPTION="Convert OCaml parsetrees between different major versions"
+HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree"
+SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-ml/result:="
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/jbuilder"
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
index 41765b51dbb6..7d45f2138c29 100644
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@@ -1,7 +1,9 @@
 DIST ounit-2.0.0.tar.gz 103504 SHA256 4d4a05b20c39c60d7486fb7a90eb4c5c08e8c9862360b5938b97a09e9bd21d85 SHA512 e12c8fb534ef88de7a83a34e5a578060a90abfce601d8532408412a56e843f69b89cfd6ce69bd7c5519e9a04e306d46339e9b8f13975727a3458afe20cd776d0 WHIRLPOOL 4b2ea33cdb2ad08ebb97c80a1c9f4e59c4f5f08ea52c7486cc892bf84fce5193e2a0a220c37c0304426ddae010aa18f6f6895427e78a71b784b9b367f41b3a8c
 DIST ounit-2.0.5.tar.gz 114285 SHA256 c04a53bfab11789a3d333d2a4fb16cdfaa71e2f8fb34edfc6a93b3e85f1fcd68 SHA512 b2414b7581ec230a949de0d7a677786bb63ef3a3ee0c3dc666d176f83705b5bc8aeab4b6e2327c98714bb26c249d71766ed831ebf572aff2b8829a33cc0e4b75 WHIRLPOOL 164986305ead2db9d1339e6bb267cd884a2dfc1a28264a3a9f037a102e380a1183d31787cf3487347b010dcc2bc06b48ef19fcf5a0f16d89efc828e4c507649c
+DIST ounit-2.0.6.tar.gz 114305 SHA256 05966b040aefeb56ae86098bc3fb3c685db07f30dc849e38462f42bd3b61f5d6 SHA512 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d WHIRLPOOL f9b61e09b187adfa802cb9743ac1f9028af40fe0b00ef7eab933dd7045c82401862cbb6a123351c0eba041bf2d3ca995c05d8b83a545e88301ac62be04fb8153
 EBUILD ounit-2.0.0.ebuild 469 SHA256 b1ab8a9b889ed6e90a99fc08c7319daf9ad61e194fd2aca96702acdf64e6e2a0 SHA512 73b25b25c9b1f380bcca7e3ab625daef5d2b84d57c8da535f93d547e5e4d4da238bb370261f85358af7c5c04f66ffca4281a262a8aa3e33657c5d8f435f32d0d WHIRLPOOL 3c6b88437505d7283fb7fef2d1e0ed9a67e2e4b365953416bd5f9e0948ffeef1b76305dd9d5e409f824829f6495a0088722c5256582223dcca689761f7d30163
 EBUILD ounit-2.0.5.ebuild 473 SHA256 8cb0b320bbdda7daef562929229290d5bfeb1e776f17fe40f252ec4215626b75 SHA512 c517aa5f0d2521050624d0dcfe58089d3f59e013fa7db9809d9045db286d753b0703ab3317cb0e00a390a1fdef38df1d6a5c2c1779c5861ab04a443707fb37bf WHIRLPOOL 3084d94e13eb01608d0f5dfa5102f5737345b4b66d7598187826d5e1b900ee2458f4cd4f6cfc1d2954217e73e35b7a978034c9d9e310a28d565ab2bb53e3a1f4
+EBUILD ounit-2.0.6.ebuild 473 SHA256 0bade2709fd406614466bdce4f6b2119bbff264d1da4ad4405e7bdfbb6112809 SHA512 2b81f8e499b16b46c074aefa7278e75bc21eaee1fedff71475f01e7f98c6cdebce43af08cdb752705eca87e69b2008f5fe8bab25c2df064a6bb2306dab077f8a WHIRLPOOL 79a5e8f6e14230723e600fce5dccfee12282fccdda52b58bf8ca9f31b9cc23fb8e70f09bee55c43d527b7558eefa844b1fe4c295d2eafedbbc3bcfcf8dfe729d
 MISC ChangeLog 2639 SHA256 d2d5e61fe6fca0012c573a9f9aa64414401b5c84310ec0f7254d694317c1e1ba SHA512 b91389013e31c6685601fcee4f985c958cf81e2c2e02ea9c51046695cc3a4030cdbe03241c866d9f3d80485d6e687b30997fd11ba1f07b2f66fce2dc817f2669 WHIRLPOOL 6321d5618479f75566be9330632965b4de146e46f607944a128ba1a9121b82336349d298eb53aa038d1ccf0b954f43651fa0b95c41d3be57aeb9bd57c842e03f
 MISC ChangeLog-2015 4605 SHA256 e494e15ef05d7df9438e6df8438e1329ee60327b68ecee7939abbe86ad9799ce SHA512 9d405b798b9f5163aa53902101384e18a8e281381c307643aeb2b42e69e383d6876358ba7f5d9483a424155175578d39ce768d8de6727ad122585a3f25be171d WHIRLPOOL c5c25deeb99be1dceca12f36500e2670f951215c9cc84b8f9dc76b804d3b38e3b178eb88095bd542020718b61f6818a361eb1763f42c7a0df36badf0256d2574
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/dev-ml/ounit/ounit-2.0.6.ebuild b/dev-ml/ounit/ounit-2.0.6.ebuild
new file mode 100644
index 000000000000..0ade5f19c1e2
--- /dev/null
+++ b/dev-ml/ounit/ounit-2.0.6.ebuild
@@ -0,0 +1,20 @@
+# 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="Unit testing framework for OCaml"
+HOMEPAGE="http://ounit.forge.ocamlcore.org/"
+SRC_URI="https://forge.ocamlcore.org/frs/download.php/1722/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+DEPEND=""
+RDEPEND="${DEPEND}"
+IUSE=""
+
+DOCS=( "README.txt" "AUTHORS.txt" "changelog" )
diff --git a/dev-ml/pcre-ocaml/Manifest b/dev-ml/pcre-ocaml/Manifest
index edb69624ccb0..68fd7235df1a 100644
--- a/dev-ml/pcre-ocaml/Manifest
+++ b/dev-ml/pcre-ocaml/Manifest
@@ -1,9 +1,11 @@
 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
+DIST pcre-ocaml-7.3.3.tbz 38412 SHA256 57c92741ed04cc52ad80f2e2f248dfd2c7b39c7678422f1a36fd1e6955cd4b8a SHA512 569e323dea83f33212a2aa9482e55f7491c8f83382fad13dfaf9fe624307ca261baf255db7c5837e1c6b5c64445daf05b64b9929cbd6d311d06278826bb788e3 WHIRLPOOL 949f7703b565eef49117d9a3dc2821cac3d0e0dacde5f5f1f65ee927068c7907083662156eda57f5ddcda9eecc7e181d775c7c7990d01fc98d0c5a5f68e5d18f
 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
+EBUILD pcre-ocaml-7.3.3.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.3.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
new file mode 100644
index 000000000000..869d45b107cf
--- /dev/null
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.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/ppx_optcomp/Manifest b/dev-ml/ppx_optcomp/Manifest
index 6760ab080b92..9e4340032776 100644
--- a/dev-ml/ppx_optcomp/Manifest
+++ b/dev-ml/ppx_optcomp/Manifest
@@ -1,4 +1,4 @@
 DIST ppx_optcomp-0.9.0.tar.gz 14611 SHA256 6dcbea3257d104dcf1a3a89c8cf51ec88ba79e07f9ca30caaa1da4fbb9b66fbc SHA512 ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c WHIRLPOOL b8fe502dcb21b103e890e48c7f4a4764503dd593bf1160c7e2cbfc78301cfd0de58625670bc25bc5c35ece73b68a0c8034015407adde487e74598afd5754a31f
-EBUILD ppx_optcomp-0.9.0-r2.ebuild 505 SHA256 ea8309da07de3774f40bc4bea056a383b9015b25f528366cf9fc6ea6deb306e2 SHA512 689ac5352a6392041cf051149f07b7b15f5474204d3171905d842170a3f46100fe22c8bfdc858bd0cf0820f9650d827169ac86dc11f1a5677ac343c36eb007dd WHIRLPOOL 5325a06ab2f4c264b876e09ea08eddae1279d6322dec1d9fd2402183756cc88c5a1436ff852d0dee5dd21f2d30951fb960cb3c766f7619c12edc69a6320e441c
+EBUILD ppx_optcomp-0.9.0-r3.ebuild 521 SHA256 cfb4a6b616a195d6f888c0634cf37afab14a98ed4588987823f92558ea445fcd SHA512 a2765bddde18f213157d4f5ee6662251df24c85a698dc2740dd7ab735cc1eac322a8ce3ed8856705cda2c961e0ae550d04e77764e9a70eda359517684adcc2e1 WHIRLPOOL 3c75eaf8a24b5c6058f500a6124fcff5722b564bfaf3767f90aae8a578298b907fb18c0cb98080ab47d9a0900555360598c9e22d2e47d4a29ba6b8fbb61c523c
 MISC ChangeLog 1220 SHA256 4325c3cd25b18f354ef3f39f64e7388feb829b0a67addee5d6af205d8d4a0356 SHA512 6e2326f8b7ba8161d95bef2c8b90490339222b545f11535b0a3486bffcd97c2bfd2f3e38f551a1c7e22e1addff98a09cb672c1db52111f46c6c7d696e76b32f9 WHIRLPOOL 6f39f1c14dd9ba87a0b8265409034a926865036c0cc35ac0a4ee5f2fc2b1cb9b233e45178eb629ce312ca6d8f6c5ff54e4d1e4dc35c07cfb921414ac746e6433
 MISC metadata.xml 334 SHA256 699bacee0e9c2f537c82755a773ce46bc93412249d6fe8ae7172943f30c88974 SHA512 65cf194ca0b988ab6f13026930011318c27efdeae8dde0bf54e0262334d290b540a9f19cf4476cc7f2a6920c89bb501d20ad9cba8acb1cc10a01f9a124b43236 WHIRLPOOL 48ce150d1fed21c09d3eb32d8cf5897d5c67e084ada24381a216a6167352432abbd59f92af5d1f1bd95269df47c5c5dbfb962722729fde762bd998918f469df6
diff --git a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r2.ebuild b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
index 0185e9f77fb8..44140740f37b 100644
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r2.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
@@ -16,6 +16,7 @@ IUSE=""
 
 DEPEND="
 	dev-ml/ppx_core:=
+	dev-ml/stdio:=
 	dev-ml/ocaml-migrate-parsetree:=
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 2dc7dfd5e717..d3c1b2a69e1d 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1,7 +1,9 @@
 AUX ocaml404.patch 2031 SHA256 607ae0fc6356f51c09dd8ca10d767fd176050c2e5f4971b38bc4506b9a2e43ba SHA512 507bda106d25a92718aae1b0e95103d481cbe18624f80a59af6b3e884594c1d18b0c15b51f014b1af39b09a5264272f92ee8d18dcca37e7595964f85241c141a WHIRLPOOL 38bcb37d2843e8dfb5d6caaf1053cb6501f9f6c6abcaed85afffba6fb1bca1de85cb67705529b3c94b4e119cf70d4ce2da60f96ca28e53ce89f8c3216ba6cb1a
 DIST ppx_tools-5.0.4.03.0.tar.gz 17209 SHA256 2cd990ef36145c35b0fd2cfaadc379cf032dd0987c07bea094d4437277d573e5 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4 WHIRLPOOL a74a30397ec858d3be478c85d7e4b54f065e35d6a95b95cca0a49049eb167e23892088620d9cdb59d81b598be0ebe3a1be123928768e21186f710ad81a5b8118
 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 SHA256 031e05e2f98fd77a412cff00f19262e186b0c8a1804fece06d2af05e37a563b7 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64 WHIRLPOOL a48ed77f05d7cc52fa40a4a017b689c34695bf267b74dd438a7da7d1c30a5709de6e01a1dffaa110086b5ed410689189fee45686502a6a0d70de71be9a8b1d86
+DIST ppx_tools-5.1.4.06.0.tar.gz 17943 SHA256 413e01444bdef2c4a231ddb1281b29bbc7b0c4bd780b7da47d9255b193bfcc56 SHA512 9adab758f2e68f155775559ed6568b1c3338d03291a27108b7e47a4fc5bbe65c6451c9bb90fc3270b62148213dfcc30b709b6a95e99d218884f915b48ecda9ff WHIRLPOOL 712c0a69a5759d381059bd855e311efebdbea9b20bf177d92ae11cbd5ad415ab4152f40ee424cd92bb659c934c22bc8a0bd4d6e1606d764c8f72d0d33610f0dc
 EBUILD ppx_tools-5.0.4.03.0.ebuild 808 SHA256 43da43e9ee1a531b47752097c5d68c67a51f69e2c2408db325fa61d147e10a57 SHA512 0ac1bb42288129bc1060b0bbb230a4a4becd88a439105936ac9c1dc2f7d4dff5305b76893fc25394bf3bd5bf58f306214cb1d3bf8c9a62c022518607ee0e4d67 WHIRLPOOL c896406729cd4fb04decc7a1964dd37c6fe01840c5aecfa4af8a4efdfb68e1da33b918b92c2b9cdd899d767690280bd57f633228ce682df88fac9652821891dc
 EBUILD ppx_tools-5.0.4.05.0.ebuild 711 SHA256 5d166dfae9d051d586896a7b269985429f183214b31bb4269e813ae8ca693693 SHA512 298f93f131a3194c0fdfd4cbbf75a4f148290273d579816f398a0551cde42ff48620d0ecc02d5c0ac0ee349a91d867ceca2c6eef5a9f030527ec03329cb5ca36 WHIRLPOOL 80ba7bd8edd8ba7ee20dce4447fd4514e2eba1a18dafc2c619bd062f75ea6089078fc7b4158ee7da034ad4a751842c57544abd1d79a27eb01775bcf5b27bf1c1
+EBUILD ppx_tools-5.1.4.06.0.ebuild 711 SHA256 d91902c04fc6a4b1937a1f6574f89abebd17557bf36cfaa54f17c2ee4914d071 SHA512 16130cf09a59a1f788ac486a3618faaa398264ff479384862f252320469202594cd3a37b436d4df81ec2dde388e8b4342a644cd25ac448d20415a888a172e426 WHIRLPOOL 1de6c7d817565a17d31e442f7bb00b521815404355c0e282f7fdf37a74f15c8624f290966cc0d590bd0d2421264fb736d968b8370f505046ec5367eb970ceafe
 MISC ChangeLog 1866 SHA256 d01f067c0deee1ae4e1c497c4843f48c93e26a1eef79b3030136777911da514e SHA512 0e8c986c92456f824765bc90d3f87e77a93cfb0c0f14c59f587326031f5a3ce7a90007551dd0d508f5851ec0a71a70a6630b14ad01f9385e63f406b4ef48d215 WHIRLPOOL f51be9d71547c0346c02f60fe50df628f9ddad766902c23b031d04a3e00829d47196e4eae88fa8051eea45cefce6466ee6d9694f7844b3730b5ed2059c8709a1
 MISC metadata.xml 343 SHA256 87064e375d2727a76537d55f44c370f77943cfcf9d407f450da087f5a5260e5b SHA512 af6d8ea7cea8aee25e51afdd9b2f6a8353467a67089121d3dfddef55ae48b31f8f3e539cea90455d0044dba784ca21b6af4be8eb55a455c97827b7277ac37aff WHIRLPOOL 553fa13a5dda0864af3b41ec8cf54641c921535654694695ab54eca4cab5f80eed9f4bd44db84805b480d9aa1e3a13dfeb79fb9a3dfc3dfa9db92cd9eabd3646
diff --git a/dev-ml/ppx_tools/ppx_tools-5.1.4.06.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.1.4.06.0.ebuild
new file mode 100644
index 000000000000..1762b0c06480
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-5.1.4.06.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib versionator eutils
+
+MY_PV=$(replace_version_separator 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools"
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.06_beta:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-$(replace_version_separator 2 '-')"
+
+src_compile() {
+	emake -j1 $(usex ocamlopt "" "ARCH=none")
+}
+
+src_install() {
+	findlib_src_install
+	dodoc README.md
+}
diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest
index 0713524c4daf..3b6ff1157547 100644
--- a/dev-ml/sexplib/Manifest
+++ b/dev-ml/sexplib/Manifest
@@ -1,5 +1,7 @@
 DIST sexplib-0.9.2.tar.gz 75035 SHA256 8dbcd78d3625b71ed60ac7eee9da83da6f979fee62be103f82bb9af90d26d1e1 SHA512 d9e02ae9e7e8be4387c5d4e5c4a23222e2ebbd3355d52c26e0d6ac0ccc4f4e09653ac2852e6698d6128ff954888e65d97dd7a494b9404bad2e8349cd592bab1d WHIRLPOOL 6a75c41c4e57e6ed08d56b901df069eefd03eec2e6e1b4f504507f08512d34e9817180cc958925038f4b779b0f33bd157515a0b8214215a0509b8bda14f73c5f
+DIST sexplib-0.9.3.tar.gz 75074 SHA256 2301ae60d0d5d691c690536bb36b711192506ac64b60c57fda6cd11bb85d3608 SHA512 32c471b3ef2b2595fed7fa748b7bc7059491651442dec0bca5a60b93458d78b0950e4386a973c9c856ba25f3f839d6747ab9e2e88b1927f9907e8107b63b706d WHIRLPOOL 7fe302863b1d8946b3245f7b5e7e1f4eb74ad7e35e0308714927189defd78e516029afab01f07253529f66d8f2349ec84fd7b0de3a9a17db6a70a65371cd255a
 EBUILD sexplib-0.9.2.ebuild 510 SHA256 8cc07200c46222a138c35ec5bd083f6b63e8e11a6daa035e979f83132b60c84e SHA512 3b6e46b353170e08673138a2d94f00159e050fe9f24e1b8af0f1915091092aac61419d0d701d7f7413a256e8a8200d72591a8f52da352ec4dbab5f92abd7c550 WHIRLPOOL bb300dd1d7356ab2621f2841925ecb07e1cff2ab80feb9b222cefb679d3e97ded48c220e3afba84f542edc74bd2080508d0d0595b6eae02c3a4eaf23f1aab48e
+EBUILD sexplib-0.9.3.ebuild 510 SHA256 8cc07200c46222a138c35ec5bd083f6b63e8e11a6daa035e979f83132b60c84e SHA512 3b6e46b353170e08673138a2d94f00159e050fe9f24e1b8af0f1915091092aac61419d0d701d7f7413a256e8a8200d72591a8f52da352ec4dbab5f92abd7c550 WHIRLPOOL bb300dd1d7356ab2621f2841925ecb07e1cff2ab80feb9b222cefb679d3e97ded48c220e3afba84f542edc74bd2080508d0d0595b6eae02c3a4eaf23f1aab48e
 MISC ChangeLog 3946 SHA256 d132763bde36a20773d981ef1c1a6aadf1e3d1c9c6d6d21fc3ab95659f957733 SHA512 12c151304c9ccbcbb33ca63d03c092c132f711d58c71168d6caa722f8963201e3ee0b6362b2ded169fe4611cea5bdbf3eee64abd80b628fab12e1646a3a6e164 WHIRLPOOL 78af4c389d0e344a903514cc28088350b86fe5440ce2d37fd104a90d882f3c72ef93018a69574050639410677c29bcf7031b27572d577cab01149d384a35158d
 MISC ChangeLog-2015 5278 SHA256 c12330cd91fac64bb14a7557e352fbe55f4a68e1c06c8405a53b58b461b56038 SHA512 f231c9b8779dc23a9b6f6de7934d31ffabd022c97a1ae2d193fdb8884b15fe5004ccf84eb976fe4a4967c6cfbc7a08cb0e147bee8def1a998e4f49e0828b6883 WHIRLPOOL c02d438963be49573f480913afe432bac7bcc4bf092447ab5f3604a77f548f337e84bc780effb2f93d2723899d7d7b7ba73a1e40b5ad7613c88f0c396e7b0de6
 MISC metadata.xml 403 SHA256 c9e1d69ca85006d6e825d6b4ef5b51b1b7e5eb607f2b31326a9fb7b18ca96d99 SHA512 eca3cf17735fd16c06a64d309bf510f0ef43c3ac7ef2dd5af29a8c12142830bb266600bcff5ed174232028139239a9d6cb3c85e07c6cc63471eed026a3536a12 WHIRLPOOL ec8aef5df41a9b809a67c8ab5aae4297e4af5c262a1a26aacb9bc1996de0e4f9f98e031fe6e11b7d68dc6f217dab5aeb77fecab44fb09d14a5f1eda20d99876d
diff --git a/dev-ml/sexplib/sexplib-0.9.3.ebuild b/dev-ml/sexplib/sexplib-0.9.3.ebuild
new file mode 100644
index 000000000000..0def0f6d5dfb
--- /dev/null
+++ b/dev-ml/sexplib/sexplib-0.9.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions"
+HOMEPAGE="https://github.com/janestreet/sexplib"
+SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+	jbuilder runtest || die
+}
diff --git a/dev-ml/stdio/Manifest b/dev-ml/stdio/Manifest
index 82a4982fd92f..4460fa2c3152 100644
--- a/dev-ml/stdio/Manifest
+++ b/dev-ml/stdio/Manifest
@@ -1,3 +1,5 @@
 DIST stdio-0.9.0.tar.gz 9264 SHA256 d0d429f0873bf7a9e37d2791443f4f3d4b74a4b5b7fee78489a567fdc92894d9 SHA512 a3809272c00653872d02b07b6c133215e06a70a7cbebed8c6c22ba5790ee8cbba17821da7875290c8869dfac22bf3cf248028e2aed2570195ca9b5f63b6ab75d WHIRLPOOL 9a9aa0af65091fe976528f0dabcb8a97443f4e403171df41af2c5dd579ce8202e81f98eebb561631821018d9dbdc820aa622349421de1c3f57632cee620598f0
-EBUILD stdio-0.9.0.ebuild 474 SHA256 5001cbb207a467aa7e3dbe823a6f9bc6b39ad4e6db10622f87d6756dd2ab6c51 SHA512 ce2bf3539f011fa4379cfd2665f9634c5639e9393944d4a442b89929db4ca846a8c1f0578e9811ff46896d2fadcc26d1659e5027ddd48a90d79428ce9958301f WHIRLPOOL d30a0205ef3e3d37ae8f917b1508486f82d9fa4242b2923b2eece3edb000dee2e883f20f97205b9d6f1b4809c89a7741173838f184ae29ba79f056b43a000b1c
+DIST stdio-0.9.1.tar.gz 9281 SHA256 45e9fb469cd1dd4de5e101add9e2205c52cd3393a677de683328d875ca3e9134 SHA512 bfef782562af7fae790b8baf02bf5d5edae2ccff29531080a608fd9224710c7d0a1a346c3480b6eaf4d7be1a280e19d9380a4dd9072de6d68e48ac419d275716 WHIRLPOOL 2ba6b87139ec8c8de72e9a7ae222b3cb90aba64bffa363bb239d0b5fb6abea02948165d1bbf131c224e68bd031b2252bc9dcfeb12137948ac41c83c859ac3009
+EBUILD stdio-0.9.0-r1.ebuild 491 SHA256 01dc75dc1590e0beb3f4ed7450e75c575fdebcf2bf18cbe2fe8ab22756830e9b SHA512 29ca6d9be20f7fbaf814e598a7e355e967a53cb3d7a6b5952ad20f7d0e9148b1b2ba9facc1a993531950d891c2dde990d42d8ef66328d9e2af2c02f0c869ebfc WHIRLPOOL c07162084a6c0d0e49fbdbb9e1b696ce02ca60f08823a3a2b2fa3e1c991f8f2afd1abd1c19c2d8aec74d7c624e103ffe77c8a6cd485048329ad814585da26f53
+EBUILD stdio-0.9.1.ebuild 491 SHA256 01dc75dc1590e0beb3f4ed7450e75c575fdebcf2bf18cbe2fe8ab22756830e9b SHA512 29ca6d9be20f7fbaf814e598a7e355e967a53cb3d7a6b5952ad20f7d0e9148b1b2ba9facc1a993531950d891c2dde990d42d8ef66328d9e2af2c02f0c869ebfc WHIRLPOOL c07162084a6c0d0e49fbdbb9e1b696ce02ca60f08823a3a2b2fa3e1c991f8f2afd1abd1c19c2d8aec74d7c624e103ffe77c8a6cd485048329ad814585da26f53
 MISC metadata.xml 328 SHA256 f073f589b512ca2e53e370eba4b00e0d635058ec4f3747d9d46db3ed766dbd21 SHA512 fdcaa73b9349a28b81f0bc9d4872edcfea9ae2b1194c0d1102a462aa5e2591d8d7af56b6946731ddadce713ddf8d8f7a0083d955922213eec4da42ee68e5e137 WHIRLPOOL 2d10bcc5b73fe289b248c7899dfc7f6e9c51d925e4fdbed3641a62d2bbc2aec2b32d04bfe7feda0e7543fd4d3c1d0f57667924d9767f9c6bf833f6f0dbbac99c
diff --git a/dev-ml/stdio/stdio-0.9.0.ebuild b/dev-ml/stdio/stdio-0.9.0-r1.ebuild
index 2002241b3dbb..7e8b8d66be2b 100644
--- a/dev-ml/stdio/stdio-0.9.0.ebuild
+++ b/dev-ml/stdio/stdio-0.9.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc"
 IUSE=""
 
-RDEPEND="dev-ml/base:="
+RDEPEND="dev-ml/base:= dev-ml/sexplib:="
 DEPEND="${RDEPEND} dev-ml/jbuilder"
 
 src_test() {
diff --git a/dev-ml/stdio/stdio-0.9.1.ebuild b/dev-ml/stdio/stdio-0.9.1.ebuild
new file mode 100644
index 000000000000..7e8b8d66be2b
--- /dev/null
+++ b/dev-ml/stdio/stdio-0.9.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit opam
+
+DESCRIPTION="Standard IO Library for OCaml"
+HOMEPAGE="https://github.com/janestreet/stdio"
+SRC_URI="https://github.com/janestreet/stdio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="dev-ml/base:= dev-ml/sexplib:="
+DEPEND="${RDEPEND} dev-ml/jbuilder"
+
+src_test() {
+	jbuilder runtest || die
+}