Merge updates from master

30 files changed, 210 insertions, 142 deletions

diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 8e8baed18ba8..4392e6f2b5ca 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,6 @@
 DIST ocaml-4.04.0.tar.gz 4057711 SHA256 03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512 288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d WHIRLPOOL 91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
 DIST ocaml-4.04.1.tar.gz 4061830 SHA256 9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512 d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103 WHIRLPOOL 56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
+DIST ocaml-4.04.2.tar.gz 4061873 SHA256 6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb WHIRLPOOL b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
 DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256 3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512 4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80 WHIRLPOOL c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77
 DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
 DIST ocaml-patches-9.tar.bz2 1700 SHA256 1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 WHIRLPOOL 185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild b/dev-lang/ocaml/ocaml-4.04.2.ebuild
new file mode 100644
index 000000000000..aad6abb1102d
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="8"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the ML family"
+HOMEPAGE="http://www.ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.gz
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	ncurses? ( sys-libs/ncurses:0= )
+	X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+	xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
+src_configure() {
+	export LC_ALL=C
+	local myconf=""
+
+	# Causes build failures because it builds some programs with -pg,
+	# bug #270920
+	filter-flags -fomit-frame-pointer
+	# Bug #285993
+	filter-mfpmath sse
+
+	# -ggdb3 & co makes it behave weirdly, breaks sexplib
+	replace-flags -ggdb* -ggdb
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use ncurses || myconf="${myconf} -no-curses"
+	use X || myconf="${myconf} -no-graph"
+	use flambda && myconf="${myconf} -flambda"
+
+	# ocaml uses a home-brewn configure script, preventing it to use econf.
+	RAW_LDFLAGS="$(raw-ldflags)" ./configure \
+		--prefix "${EPREFIX}"/usr \
+		--bindir "${EPREFIX}"/usr/bin \
+		--target-bindir "${EPREFIX}"/usr/bin \
+		--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
+		--mandir "${EPREFIX}"/usr/share/man \
+		-target "${CHOST}" \
+		-host "${CBUILD}" \
+		-cc "$(tc-getCC)" \
+		-as "$(tc-getAS)" \
+		-aspp "$(tc-getCC) -c" \
+		-partialld "$(tc-getLD) -r" \
+		--with-pthread ${myconf} || die "configure failed!"
+
+	# http://caml.inria.fr/mantis/view.php?id=4698
+	export CCLINKFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	emake world
+
+	# Native code generation can be disabled now
+	if use ocamlopt ; then
+		# bug #279968
+		emake opt
+		emake opt.opt
+	fi
+}
+
+src_test() {
+	if use ocamlopt ; then
+		emake -j1 tests
+	else
+		ewarn "${PN} testsuite requires ocamlopt useflag"
+	fi
+}
+
+src_install() {
+	emake BINDIR="${ED}"/usr/bin \
+		LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
+		MANDIR="${ED}"/usr/share/man \
+		install
+
+	# Symlink the headers to the right place
+	dodir /usr/include
+	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
+
+	dodoc Changes README.adoc
+
+	# Create and envd entry for latex input files
+	if use latex ; then
+		echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
+		doenvd "${T}"/99ocamldoc
+	fi
+
+	# Install ocaml-rebuild portage set
+	insinto /usr/share/portage/config/sets
+	doins "${FILESDIR}/ocaml.conf"
+}
diff --git a/dev-ml/OCaml-ImageMagick/Manifest b/dev-ml/OCaml-ImageMagick/Manifest
index 61f860f174e5..fbc7c20d3a7f 100644
--- a/dev-ml/OCaml-ImageMagick/Manifest
+++ b/dev-ml/OCaml-ImageMagick/Manifest
@@ -1 +1,2 @@
+DIST OCaml-ImageMagick-0.34-imagemagick7.patch.bz2 15950 SHA256 aec6a6bb1382a6c0513b14dcb93ddb923f52bb5a3d54139edd10e42a834d0793 SHA512 a5d1eb7baa001144cc618532b6446cae30974ee7f95455fb18de287731f1867ba767812a876510c0fc7944aa5259f4e60e9f68fa1364fac3a2dfb8f8c1f6a219 WHIRLPOOL 94147da60f7680bc3cd21c0a5290fe80c708dc3488db9ef7a0e7609a53a976ed94971e5a5c302fde592896d2e05e3c669c914925df53165b27e5ed39d68e13b0
 DIST OCaml-ImageMagick-0.34.tgz 64219 SHA256 7840f72b07d17756bdc12b1792e915ebc6197a2aab0a86baf0eba1dcb0a0c93e SHA512 cf1f979aed0aad1fb27dd6817adbc22c2f7c0d6d8c96a48d9532ce89c128b046ea7ac38ad96a5267a5920fccd0cd3631844e428e933143a405522ed5ebcbee39 WHIRLPOOL 2f861c9be8f587d7caf7181cef248e509ea8db10bcb6ff67b179d9dee1c0f53c1b61ae5b8b3122cc0fa279a8cc47478fdc570fb8ab05db6928f7ceaec54f8a44
diff --git a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
index c52f9249f0d2..e779844d33b2 100644
--- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@@ -3,23 +3,30 @@
 
 EAPI=6
 
-inherit findlib toolchain-funcs
+inherit findlib toolchain-funcs eutils
 
 DESCRIPTION="Provide the ImageMagick methods to OCaml"
 HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
-SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"
+SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz
+	mirror://gentoo/${P}-imagemagick7.patch.bz2
+"
 
 LICENSE="MIT"
-SLOT="0/${PV}"
+SLOT="0/7${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 # interactive tests
 RESTRICT="test"
 
-DEPEND="media-gfx/imagemagick:=
+DEPEND=">=media-gfx/imagemagick-7:=
 	dev-lang/ocaml:=[ocamlopt]"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${WORKDIR}/${P}-imagemagick7.patch"
+	default
+}
+
 src_configure() {
 	sed -e "s/gcc/$(tc-getCC)/" -i Makefile || die
 }
diff --git a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
index c4b2b1198563..5c2d435fef0b 100644
--- a/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
+++ b/dev-ml/bin-prot/bin-prot-0.9.0.ebuild
@@ -17,9 +17,11 @@ RDEPEND="
 	dev-ml/base:=
 	dev-ml/ppx_compare:=
 	dev-ml/ppx_custom_printf:=
+	dev-ml/ppx_core:=
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_fields_conv:=
 	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_type_conv:=
 	dev-ml/ppx_variants_conv:=
 	dev-ml/sexplib:=
 	dev-ml/ocaml-migrate-parsetree:=
diff --git a/dev-ml/camlp5/camlp5-6.17.ebuild b/dev-ml/camlp5/camlp5-6.17.ebuild
index bb868f3abf09..1e3bd458fdcd 100644
--- a/dev-ml/camlp5/camlp5-6.17.ebuild
+++ b/dev-ml/camlp5/camlp5-6.17.ebuild
@@ -34,6 +34,10 @@ src_prepare() {
 	for i in ${PATCHLIST} ; do
 		epatch "${DISTDIR}/${i}"
 	done
+	# ocaml 4.04.2 support
+	cp -a ocaml_stuff/4.04.1 ocaml_stuff/4.04.2 || die
+	cp ocaml_src/lib/versdep/4.04.{1,2}.ml || die
+	sed -i -e 's/4.04.1/4.04.2/'  ocaml_stuff/4.04.2/utils/pconfig.ml || die
 }
 
 src_configure() {
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
index 08b14c1e208d..05540723e56a 100644
--- a/dev-ml/mtime/Manifest
+++ b/dev-ml/mtime/Manifest
@@ -1,2 +1,3 @@
 DIST mtime-0.8.4.tbz 11705 SHA256 b0a1eb1fb2d30e413ab24f5261e099881cadbac5af440f53f2544e3a9846b5a9 SHA512 fc08df2abc3500d18db3c4bb9a67336b902483da24056fac2c9f0b4c93ac8860c29a59b47c1ade62f6f5b51ac32c7d16e31d5c9f8cb51900accf73ddeaf6d307 WHIRLPOOL 543168a929e4eaf158cd05420f9139664a4289c5ae1e69bf9081f842d97b08182c99dc3ac82b242afca4067f69b1efc53fb11c116056162871f59b988be2a8d5
 DIST mtime-1.0.0.tbz 15191 SHA256 dd9e2eaaa2e275e832d9acf3c84654eb02e74d449705f7d46739e2bac77657ac SHA512 8fb7c125e65f2edcfef937794138e3fa468805f7c728eb2dc8e071a9080dcb72952493b71f99ad8f04de52b491c9b84fd37924b9ec36c70ebe717e6e99b29c2b WHIRLPOOL 648dc5a833493dbd71756eaa4211255bc4f7617ead78047cfdb41990b9d21dd1d33dc1c46cabf5d51c40b7959f35647a9a8e737d3fe6669476d1303131b89d73
+DIST mtime-1.1.0.tbz 15467 SHA256 63362f4a8ffd9a86e3f107d57f7cbd4cf829b339fa2498177a83e51cb9a464e1 SHA512 8ed5dae589dd27fc6e748218a9d9fb9d7d954d231fc2100d61c1b336e0ed38a215bc608cdea9965547729177c78c868c1de6a5ceac6735686a3de1c4a791746c WHIRLPOOL 19644c0290ec97752501b8f527b7a53d5dfb59fbbf47fd43b3072d915e797ca7732ed635c6b8906d06bc527517f7be72e388914a01bd8dab6b22c51e0f277374
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
new file mode 100644
index 000000000000..02c8e3c21559
--- /dev/null
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="OCaml module to access monotonic wall-clock time"
+HOMEPAGE="http://erratique.ch/software/mtime https://github.com/dbuenzli/mtime"
+SRC_URI="http://erratique.ch/software/mtime/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript test"
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]
+	javascript? ( dev-ml/js_of_ocaml:= )
+"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-js_of_ocaml $(usex javascript true false) \
+		--tests $(usex test true false) \
+		|| die
+}
+
+src_test() {
+	ocaml pkg/pkg.ml test || die
+}
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/ocaml-ipaddr/Manifest b/dev-ml/ocaml-ipaddr/Manifest
index 9b52d5ed4a76..8c0a8bec7aae 100644
--- a/dev-ml/ocaml-ipaddr/Manifest
+++ b/dev-ml/ocaml-ipaddr/Manifest
@@ -1,3 +1 @@
-DIST ocaml-ipaddr-2.7.1.tar.gz 23652 SHA256 0d1d5fe983ff02ed09a0f03e5f1048c575d621599b42b5685d56f4da61186888 SHA512 9f640f10614666f3a7cc578e934b0424c1d6fdcdd2dc5620f4a8b4fa7799a07fdd7c4bbe4e91c4899d45612ce8d2d4cafc8bcd19e51253c6da5d12c504820903 WHIRLPOOL 5be5846d98fbec95c5d3ba47c3b59bbdd3c44e41d04270d0b0ca2331eb7e6aac3d79c4833bf8dd20edb2d0c9f03b3bc72c53f12e0d27fb9980bcf73dea2c17f4
-DIST ocaml-ipaddr-2.7.2.tar.gz 23698 SHA256 2dc1dc07bb62fe43382181a13f33b7ff1c0dbbeb6b591b7ab17ea32c7be0d256 SHA512 fe477bcdae82f6a259d99cb4191f942ba7a38d11c575fcaa92c2973c9cd0b3b2b008a1efdca73e11d94f892be2f84547c386bbfca95cfa78d2fefd83d77ca876 WHIRLPOOL bca829ebf37d6275631dea24b3264ec5103a625366e9357851068d90fd9fd6e7de6ad930638fa9acbc19f446a9e74cc2eaf8083f62114d3ea8680e8039f1e936
 DIST ocaml-ipaddr-2.8.0.tar.gz 22134 SHA256 bcbb9cfad7096d930beca46f9385fe7f556be47d1e83148cef77f954d70dabaa SHA512 1714ee4d6b2afa17b987844f37a9896f01d7b674770fa6804b03222dba656130f9ee0d2d1409b67e770e21f973682c7d1d5c550abb0a5d94bc0c04a1a97e8e3c WHIRLPOOL e773ff65e0b425fe9614f701a33d5011bc92012ca67819ecfdd6877444d81b210fc4b1f4e187c1cc32f34851382f8903b97658c6fb787d1d7957b8b9a79c2dc5
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.1.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.1.ebuild
deleted file mode 100644
index 0572510d7851..000000000000
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
-HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
-SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-
-RDEPEND="dev-ml/sexplib:=
-	dev-ml/ppx_sexp_conv:=
-	dev-lang/ocaml:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-	dev-ml/topkg
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test "true" "false") || die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		ipaddr.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.2.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.2.ebuild
deleted file mode 100644
index 95a33cb5272f..000000000000
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.7.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
-HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
-SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt test"
-
-RDEPEND="dev-ml/sexplib:=
-	dev-ml/ppx_sexp_conv:=
-	dev-lang/ocaml:=[ocamlopt?]
-"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild
-	dev-ml/topkg
-	dev-ml/findlib
-	test? ( dev-ml/ounit )
-"
-
-src_compile() {
-	ocaml pkg/pkg.ml build \
-		--tests $(usex test "true" "false") || die
-}
-
-src_test() {
-	ocaml pkg/pkg.ml test || die
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		ipaddr.install || die
-	dodoc CHANGES.md README.md
-}
diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
index 0892920b7620..963f7245bbd5 100644
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
+++ b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.8.0.ebuild
@@ -14,6 +14,8 @@ IUSE="+ocamlopt test"
 
 RDEPEND="dev-ml/sexplib:=
 	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_core:=
+	dev-ml/ppx_type_conv:=
 	dev-lang/ocaml:=[ocamlopt?]
 "
 DEPEND="${RDEPEND}
diff --git a/dev-ml/ocaml-uri/Manifest b/dev-ml/ocaml-uri/Manifest
index 5dc6bb6039a0..0b9754dc073f 100644
--- a/dev-ml/ocaml-uri/Manifest
+++ b/dev-ml/ocaml-uri/Manifest
@@ -1,2 +1 @@
-DIST ocaml-uri-1.9.2.tar.gz 256642 SHA256 8c3250d3b6bf872e02b888ba4b1d71fc2672a6a235b99e83113ddf749eca7f09 SHA512 c71cb8cdda7823139475c9f4d915fb41ccf621f1f2460eba15c537ff8655520ea6daf248e22e8e9f6dfb1a4a204753ee77f458549b35c0b5b6e26e31b07b0ea7 WHIRLPOOL 9ed0308b7fcfb9dded2519e3d02e3fff1c358cd28972af3ff617e36ad963f220125bd31ebacfa615de19745c69a91d0fc6acadee37e0f7f7a6709c949d301f4f
 DIST ocaml-uri-1.9.4.tar.gz 213917 SHA256 cdcecd5bc9fb74fc9ba76da63acd33bc5a7a7e5f066c5729d36cc1488d3f348f SHA512 c2314c55d1d89bb7824e6bd2aad57fa2bdc4889d5e6c0b4ce75f4ca33660d510d7ab125ff0f340f4688930f3ddac13193d34762f912cc70c4ce30aa206f32ddc WHIRLPOOL ff9cadecc800d37a651e17e0d4765c9796df046c96f74139866dd1386c9eb16241caa82e3aa440ae415bf2cc3b16a3f3a8577396c4709ba93f0923151b746c06
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
index 34e6384d8416..b6a6ada36e6c 100644
--- a/dev-ml/ocaml-uri/metadata.xml
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -5,9 +5,6 @@
         <email>ml@gentoo.org</email>
         <name>Gentoo ML Project</name>
     </maintainer>
-   <use>
-        <flag name="allservices">Compile support for all service types</flag>
-    </use>
     <upstream>
         <remote-id type="github">mirage/ocaml-uri</remote-id>
     </upstream>
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.2.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.2.ebuild
deleted file mode 100644
index 9440ac353da7..000000000000
--- a/dev-ml/ocaml-uri/ocaml-uri-1.9.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-OASIS_BUILD_DOCS=1
-OASIS_BUILD_TESTS=1
-
-inherit oasis
-
-DESCRIPTION="RFC3986 URI parsing library for OCaml"
-HOMEPAGE="https://github.com/mirage/ocaml-uri https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="allservices"
-
-RDEPEND="
-	dev-ml/ocaml-re:=
-	dev-ml/sexplib:=
-	dev-ml/ppx_sexp_conv:=
-	dev-ml/stringext:=
-	dev-ml/type-conv:=
-"
-DEPEND="
-	test? ( >=dev-ml/ounit-1.0.2 )
-	${RDEPEND}
-"
-
-src_configure() {
-	oasis_configure_opts="
-		$(use_enable allservices)
-	" oasis_src_configure
-}
-
-DOCS=( CHANGES README.md )
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
index c7251eb6912c..87566fc4d15e 100644
--- a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
+++ b/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
@@ -18,6 +18,8 @@ RDEPEND="
 	dev-ml/ocaml-re:=
 	dev-ml/sexplib:=
 	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_core:=
+	dev-ml/ppx_type_conv:=
 	dev-ml/stringext:=
 	dev-ml/type-conv:=
 	dev-lang/ocaml:=
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild
index 165ba8d32c59..a10d1aacfe37 100644
--- a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild
@@ -17,6 +17,7 @@ DEPEND="
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_metaquot:=
 	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_type_conv:=
 	dev-ml/ppx_traverse
 	dev-ml/ocaml-migrate-parsetree:=
 "
diff --git a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild
index eff75b699880..69e25ca36f12 100644
--- a/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_fields_conv/ppx_fields_conv-0.9.0-r1.ebuild
@@ -20,6 +20,7 @@ DEPEND="
 	dev-ml/ppx_type_conv:=
 	dev-ml/fieldslib:=
 	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_traverse_builtins:=
 "
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild
index 573ce0ffcdf1..68e2df835200 100644
--- a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild
+++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild
@@ -18,6 +18,7 @@ DEPEND="
 	dev-ml/ppx_core:=
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_metaquot:=
+	dev-ml/ppx_traverse_builtins:=
 	dev-ml/ocaml-migrate-parsetree:=
 "
 
diff --git a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild
index 6942e038325a..474e824f7f87 100644
--- a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild
+++ b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild
@@ -31,6 +31,7 @@ DEPEND="
 	dev-ml/ppx_sexp_message:=
 	dev-ml/ppx_sexp_value:=
 	dev-ml/ppx_typerep_conv:=
+	dev-ml/ppx_type_conv:=
 	dev-ml/ppx_variants_conv:=
 	dev-ml/ocaml-migrate-parsetree:=
 "
diff --git a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
index 1ed53355c24d..7fa06c0bbf4b 100644
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	dev-ml/ppx_optcomp:=
 	dev-ml/sexplib:=
 	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_traverse_builtins:=
 	"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
diff --git a/dev-python/PyQt4/PyQt4-4.12.ebuild b/dev-python/PyQt4/PyQt4-4.12.ebuild
index 9a6872181c88..3f6ed72fa428 100644
--- a/dev-python/PyQt4/PyQt4-4.12.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help kde multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index 351618c3101f..7fd8b39e3499 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/http-parser/http-parser-0.8.3.ebuild b/dev-python/http-parser/http-parser-0.8.3.ebuild
index f84984f81975..95f552ab60bb 100644
--- a/dev-python/http-parser/http-parser-0.8.3.ebuild
+++ b/dev-python/http-parser/http-parser-0.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd"
 IUSE="examples"
 
 RDEPEND=""
diff --git a/dev-python/notebook/notebook-4.4.1.ebuild b/dev-python/notebook/notebook-4.4.1.ebuild
index dccea4499421..ca67bd63999e 100644
--- a/dev-python/notebook/notebook-4.4.1.ebuild
+++ b/dev-python/notebook/notebook-4.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc test"
 RDEPEND="
 	>=dev-libs/mathjax-2.4
diff --git a/dev-python/pillow/pillow-3.4.2-r1.ebuild b/dev-python/pillow/pillow-3.4.2-r1.ebuild
index 75791c77906d..febde5742856 100644
--- a/dev-python/pillow/pillow-3.4.2-r1.ebuild
+++ b/dev-python/pillow/pillow-3.4.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
index a014d0eade95..6a20231e9340 100644
--- a/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples test"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index a143d5862878..60c307504a97 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A simple Python socket pool"
 HOMEPAGE="https://github.com/benoitc/socketpool/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="amd64 arm ppc ppc64 ~s390 ~sh x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~s390 ~sh x86"
 IUSE="examples test"
 LICENSE="|| ( MIT public-domain )"
 SLOT="0"
diff --git a/net-libs/libsrtp/libsrtp-1.5.4.ebuild b/net-libs/libsrtp/libsrtp-1.5.4.ebuild
index 96cc6433c3d4..2cea7278e552 100644
--- a/net-libs/libsrtp/libsrtp-1.5.4.ebuild
+++ b/net-libs/libsrtp/libsrtp-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="aesicm console debug doc libressl openssl static-libs syslog test"
 
 RDEPEND="
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index 4d2e5cbdd02a..f3c68394f2f4 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -177,7 +177,6 @@ devil
 gts
 anthy
 ace
-qt4
 R
 sdl
 tk