11 files changed, 52 insertions, 118 deletions
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index 2193d772e351..429e62b32cdb 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
+	<upstream>
+		<remote-id type="bitbucket">camlspotter/camlimages</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index ce0c8dfacfd7..c96de25010f3 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -1,4 +1 @@
-DIST menhir-20141215.tar.gz 556231 SHA256 2592967c123a31e1b6566ab9f6034e7a0a709d57d547097f05693baf96a46fa4 SHA512 1fff6b987016be37eaca0bb3fea7ec0c498c1448d076e991e1555718cf760318a8d710622af930175f234f49f8dd767ce62cc880c33458958ceeb1bda4817243 WHIRLPOOL 28e6018ce127b28e362aaf1fe030240253cb2ffb0a52d9b34e81c71882ae517376aa3df6c5d19c6db13819260f667f5708522486a74bc498bad3dac11378b56c
-DIST menhir-20150914.tar.gz 626388 SHA256 a3057ec0867377ceaf9caecf69d331440d9c0fb70e39ade619a7856aa67d535d SHA512 7717fcc63ae938eb7c8ae3a5e7d279a357735c0e3b062d9060cc70d3016640e1427d25ee8182e3e034c678d9b0e706fe219f707dd4d14689457f321b135b1fef WHIRLPOOL d66204d753d0677f9eb51d09641f9148077e62caa7ae042665697036457724040950bbb190df6bd029224a0607a67cac8f4597927b4f667ca09091e07d09f7bd
-DIST menhir-20150921.tar.gz 627213 SHA256 4d8588dc847ef33f3af64d30e19bc791a57f61cda2b7086267bc8743ea4a2622 SHA512 a3100819cef6577c2806ebab765c966c11acd9fc9de061e64ef1bf4ca8b0076b0b878f12abf951a3c5882216f173936f2899444ca4126c477fa9cbef231c6b4e WHIRLPOOL cec19d79e7b79ea3dc2159673082931c8c360a865078d0af0bdd152fd1e481adb7218caf7f404005e6653493d04fda7659c1aa3b7527bbf8e0b75f284ff676d0
-DIST menhir-20151005.tar.gz 627178 SHA256 154f2537472c65e3e395de87484020cc9aedee5898b9c8756cd02245b3a568b0 SHA512 5275732b7d8699b23a470716900a9c28f4123bd85f18d582bf69a839009009782a680bb65fd7e543515898ea5899fd2b1c8eca5c776067b70ef450093d437f82 WHIRLPOOL b500268821f8b14c7cd46447c84c73d72a12365e1d991babf037746fbf76b18f41bdb0ed812d469ef7de7c2e8966f4151272773d2cd3b3fce250bc21b506dee0
+DIST menhir-20151012.tar.gz 627290 SHA256 c7d4e8cf8e3b009577794c5c01f590379201c77fdc61a832e714beffe7cf22be SHA512 04c10a171fdc24078b6340484314c771b97967a91f506a882bdae741bcc2464ccf3e7f5982339f8cc836abdb0066dc7bcd58a38edbc730a89daf935979fee79c WHIRLPOOL 49b8b0ff0e094e6a5429d747d4ced5ee5515a2f77812f508bd9da872653539ff5540639f6a5a812e4999a7a815bb62b9a6534a71f476dc495a0297ef8f89d737
diff --git a/dev-ml/menhir/menhir-20150914.ebuild b/dev-ml/menhir/menhir-20150914.ebuild
deleted file mode 100644
index a8d4107fe611..000000000000
--- a/dev-ml/menhir/menhir-20150914.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-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="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-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 AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20150921.ebuild b/dev-ml/menhir/menhir-20150921.ebuild
deleted file mode 100644
index a8d4107fe611..000000000000
--- a/dev-ml/menhir/menhir-20150921.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-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="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-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 AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20151005.ebuild b/dev-ml/menhir/menhir-20151005.ebuild
deleted file mode 100644
index a8d4107fe611..000000000000
--- a/dev-ml/menhir/menhir-20151005.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-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="QPL-1.0 LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples +ocamlopt"
-
-DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-
-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 AUTHORS CHANGES
-}
diff --git a/dev-ml/menhir/menhir-20141215.ebuild b/dev-ml/menhir/menhir-20151012.ebuild
index a8d4107fe611..a8d4107fe611 100644
--- a/dev-ml/menhir/menhir-20141215.ebuild
+++ b/dev-ml/menhir/menhir-20151012.ebuild
diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index b3e9b2788cec..413ab237e08e 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
+	<herd>ml</herd>
 	<longdescription lang="en">
 Ocamldap is an implementation of the Light Weight Directory Access Protocol,
 and a set of useful tools built around it. It includes high level libraries
@@ -18,4 +18,7 @@ unlike a search filter you can also ask ocamldap to MAKE an object satisfy its
 conditions. This can be really useful in distributed managment applications.
 Needless to say, more on this in the Documentation section.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">deplai_j/ocamldap</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ml/ocplib-endian/Manifest b/dev-ml/ocplib-endian/Manifest
new file mode 100644
index 000000000000..57464cb670bf
--- /dev/null
+++ b/dev-ml/ocplib-endian/Manifest
@@ -0,0 +1 @@
+DIST ocplib-endian-0.8.tar.gz 56733 SHA256 34a9ffda92459ae0ccd0b6e97cd947ed59f565f5a5776f51e18f5fec27c8ea44 SHA512 6978e9e306faf115d1b732e221dad8a1eea1c2eae12b5ca6f5462ee8b603900fcc585dc5a20e0a35fa793cf3d9fe50833b284a4385bc3d251e86457bf54a8697 WHIRLPOOL 9f595128d0c1281c56c70ef76522afa721d5b7e81199218b6509d9aa4b8a7c32b5f64b1d6b3dd65c9c7dc5a638233f3e46ef7ed1de88614f62d2a6a6c70e3be6
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
new file mode 100644
index 000000000000..a33970c685ba
--- /dev/null
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>ml</herd>
+    <herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>tomboy64@sina.cn</email>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocplib-endian/ocplib-endian-0.8.ebuild b/dev-ml/ocplib-endian/ocplib-endian-0.8.ebuild
new file mode 100644
index 000000000000..445b2f8b8bda
--- /dev/null
+++ b/dev-ml/ocplib-endian/ocplib-endian-0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Optimised functions to read and write int16/32/64 from strings, bytes and bigarrays"
+HOMEPAGE="https://github.com/OCamlPro/ocplib-endian"
+SRC_URI="https://github.com/OCamlPro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/ocaml-4.01
+	>=dev-ml/cppo-1.1.0
+"
+RDEPEND=""
+
+DOCS=( CHANGES.md COPYING.txt README.md )
diff --git a/dev-ml/odns/odns-0.3.ebuild b/dev-ml/odns/odns-0.3-r1.ebuild
index b2671781a3e2..0b3b02fea7f8 100644
--- a/dev-ml/odns/odns-0.3.ebuild
+++ b/dev-ml/odns/odns-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,11 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt]"
+# It is ancient and upstream is dead. Consider using ocaml-dns instead.
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt]
+	!dev-ml/ocaml-dns
+"
 DEPEND="${RDEPEND}"
 
 CLIBS="" # Workaround for bug #422683