Merge updates from master

79 files changed, 672 insertions, 450 deletions

diff --git a/dev-libs/libmowgli/libmowgli-2.0.0.ebuild b/dev-libs/libmowgli/libmowgli-2.0.0.ebuild
index a0e95bda4481..539f6ea27b85 100644
--- a/dev-libs/libmowgli/libmowgli-2.0.0.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.0.0.ebuild
@@ -11,7 +11,7 @@ IUSE="ssl"
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RDEPEND="ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}"
 DOCS="AUTHORS README doc/BOOST doc/design-concepts.txt"
diff --git a/dev-ml/alcotest/Manifest b/dev-ml/alcotest/Manifest
new file mode 100644
index 000000000000..9a585ee2ca56
--- /dev/null
+++ b/dev-ml/alcotest/Manifest
@@ -0,0 +1 @@
+DIST alcotest-0.7.2.tar.gz 24781 SHA256 75eac2c9b9c1f9e07d8c4de43ba8e852bd59ef1d7d322cd9c036a075335ef472 SHA512 3448c7d82c200f0cf2ac97f7f49060c350c0719124b24079b5babb48b1d3e0b0508ada0b273e1963dc07dc4cc072b0a589096c39b8b6d8a4adf7e011418dd4a3 WHIRLPOOL d1345d9c3481663fa29d99cf8483bc2e11251a088bd589472eb83f8483b7b3db6130098560de7cb3d00f0741c68c0d0060ae0b602a8f2af51950c0199b0ee612
diff --git a/dev-ml/alcotest/alcotest-0.7.2.ebuild b/dev-ml/alcotest/alcotest-0.7.2.ebuild
new file mode 100644
index 000000000000..8b176af1f7e0
--- /dev/null
+++ b/dev-ml/alcotest/alcotest-0.7.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A lightweight and colourful test framework"
+HOMEPAGE="https://github.com/mirage/alcotest/"
+SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-lang/ocaml:=[ocamlopt]
+	dev-ml/fmt:=
+	dev-ml/astring:=
+	dev-ml/cmdliner:=
+	dev-ml/result:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+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}" \
+		${PN}.install || die
+	dodoc CHANGES.md README.md
+}
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/alcotest/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/astring/Manifest b/dev-ml/astring/Manifest
new file mode 100644
index 000000000000..ba3029212735
--- /dev/null
+++ b/dev-ml/astring/Manifest
@@ -0,0 +1 @@
+DIST astring-0.8.3.tbz 38710 SHA256 206646340d86ffcca900d0a3fbded2140c0efc4b74a84f84dc92667a07e3b247 SHA512 c7230e47b7ef14e6040fb18284a3d5aa8da1428b721cf91a7f17104cfb853be24b9c2aaa0b118bf3e050158aa8748311435417c6cf9014d260fb4379e4ead3e1 WHIRLPOOL 433897bd4e1d3e58424fbc7e7914a89164aab22ec7c2a77befd449ba2e557fbdbe495995485621afcdee69291f43a12d382a9ab26622812cb9b80d082bf7f5c9
diff --git a/dev-ml/astring/astring-0.8.3.ebuild b/dev-ml/astring/astring-0.8.3.ebuild
new file mode 100644
index 000000000000..be3d4ffadc4f
--- /dev/null
+++ b/dev-ml/astring/astring-0.8.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Alternative String module for OCaml"
+HOMEPAGE="http://erratique.ch/software/astring https://github.com/dbuenzli/astring"
+SRC_URI="http://erratique.ch/software/astring/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-lang/ocaml:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build || 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/astring/metadata.xml b/dev-ml/astring/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/astring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/fmt/Manifest b/dev-ml/fmt/Manifest
new file mode 100644
index 000000000000..0343c82d36d0
--- /dev/null
+++ b/dev-ml/fmt/Manifest
@@ -0,0 +1 @@
+DIST fmt-0.8.0.tbz 14965 SHA256 fd221052a9d2c9be0a8f32d14b2cb35d72ec6f7cd828244759392adbec8ac79b SHA512 5287ff80343ab7f2b33e87b48ff4301e1152b54da1f1de6d8ac235f909cd83e8c9219fd46dbbe239aa6736b406c884141b3ab7578d6a3b2ff289d7756a09ec44 WHIRLPOOL 06eac9e3c3f97f196d2727bd07bf06ccbe4761b77c51fa25bab90575b40db612caf58f4b7685905f67a0ad36c82aa241c2db215c85e574930d1c19e2a6ee5176
diff --git a/dev-ml/fmt/fmt-0.8.0.ebuild b/dev-ml/fmt/fmt-0.8.0.ebuild
new file mode 100644
index 000000000000..71ca3f32f575
--- /dev/null
+++ b/dev-ml/fmt/fmt-0.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Combinators to devise OCaml Format pretty-printing functions"
+HOMEPAGE="http://erratique.ch/software/fmt https://github.com/dbuenzli/fmt"
+SRC_URI="http://erratique.ch/software/fmt/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/result:=[ocamlopt]
+	dev-lang/ocaml:=[ocamlopt]
+	dev-ml/cmdliner:=[ocamlopt]"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib"
+
+src_compile() {
+	ocaml pkg/pkg.ml build || die
+}
+
+src_test() {
+	ocamlbuild -use-ocamlfind test/tests.otarget || die
+	./test.native || die
+	./test.byte   || 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/fmt/metadata.xml b/dev-ml/fmt/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/fmt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
index b92851b00bc7..cd5f3935fafc 100644
--- a/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
+++ b/dev-ml/gen_js_api/gen_js_api-1.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/LexiFi/gen_js_api"
 SRC_URI="https://github.com/LexiFi/gen_js_api/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ml/logs/Manifest b/dev-ml/logs/Manifest
new file mode 100644
index 000000000000..976c4cd6db2f
--- /dev/null
+++ b/dev-ml/logs/Manifest
@@ -0,0 +1 @@
+DIST logs-0.6.2.tbz 18558 SHA256 a320ef34eda51694be23f2a383d83f9ae6a8430fd0ef8cec1fa8c58be5b10bce SHA512 a669e373652bac6789626ad1d58e414c6d156c646bf0706c9d55b04151850113d45a5c28077707514d1a27d46fcc0f90b39b8652ce7a3980f79675e9874db8b4 WHIRLPOOL 0bccd2561d7a454018d67b651083cf82d9f866f40dc39f04f28219e3aea0fb0db43b0e7bb45ae00932e709ef600fdce56a1dc14935ca70d97ba94445f5a7a129
diff --git a/dev-ml/logs/logs-0.6.2.ebuild b/dev-ml/logs/logs-0.6.2.ebuild
new file mode 100644
index 000000000000..6f93da39eddf
--- /dev/null
+++ b/dev-ml/logs/logs-0.6.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit findlib
+
+DESCRIPTION="Logging infrastructure for OCaml"
+HOMEPAGE="http://erratique.ch/software/logs https://github.com/dbuenzli/logs"
+SRC_URI="http://erratique.ch/software/logs/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="javascript fmt cli lwt test"
+
+RDEPEND="
+	dev-ml/result:=[ocamlopt]
+	dev-lang/ocaml:=[ocamlopt]
+	javascript? ( dev-ml/js_of_ocaml:= )
+	fmt? ( dev-ml/fmt:= )
+	cli? ( dev-ml/cmdliner:=[ocamlopt] )
+	lwt? ( dev-ml/lwt:= )
+"
+DEPEND="${RDEPEND}
+	dev-ml/opam
+	dev-ml/topkg
+	dev-ml/ocamlbuild
+	dev-ml/findlib
+	test? ( dev-ml/mtime )
+"
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-js_of_ocaml $(usex javascript true false) \
+		--with-fmt $(usex fmt true false) \
+		--with-cmdliner $(usex cli true false) \
+		--with-lwt $(usex fmt 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/logs/metadata.xml b/dev-ml/logs/metadata.xml
new file mode 100644
index 000000000000..af32ee706cd0
--- /dev/null
+++ b/dev-ml/logs/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+  <use>
+	  <flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag>
+	  <flag name="fmt">Enables the Logs_fmt reporter.</flag>
+	  <flag name="lwt">Enables the Logs_lwt library that provides Lwt logging functions.</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-ml/mtime/Manifest b/dev-ml/mtime/Manifest
new file mode 100644
index 000000000000..d4cd096f59eb
--- /dev/null
+++ b/dev-ml/mtime/Manifest
@@ -0,0 +1 @@
+DIST mtime-0.8.4.tbz 11705 SHA256 b0a1eb1fb2d30e413ab24f5261e099881cadbac5af440f53f2544e3a9846b5a9 SHA512 fc08df2abc3500d18db3c4bb9a67336b902483da24056fac2c9f0b4c93ac8860c29a59b47c1ade62f6f5b51ac32c7d16e31d5c9f8cb51900accf73ddeaf6d307 WHIRLPOOL 543168a929e4eaf158cd05420f9139664a4289c5ae1e69bf9081f842d97b08182c99dc3ac82b242afca4067f69b1efc53fb11c116056162871f59b988be2a8d5
diff --git a/dev-ml/mtime/files/firstinstall.patch b/dev-ml/mtime/files/firstinstall.patch
new file mode 100644
index 000000000000..4a7ca696021c
--- /dev/null
+++ b/dev-ml/mtime/files/firstinstall.patch
@@ -0,0 +1,13 @@
+Index: mtime-0.8.4/myocamlbuild.ml
+===================================================================
+--- mtime-0.8.4.orig/myocamlbuild.ml
++++ mtime-0.8.4/myocamlbuild.ml
+@@ -34,7 +34,7 @@ let () =
+       flag ["library"; "ocaml"; "byte"; "record_mtime_os_stubs"]
+         (S ([A "-dllib"; A "-lmtime_stubs"] @ system_support_lib));
+       flag ["library"; "ocaml"; (* byte and native *)  "record_mtime_os_stubs"]
+-        (S ([A "-cclib"; A "-lmtime_stubs"] @ system_support_lib));
++      (S ([A "-cclib"; A "-Lsrc-os"; A "-cclib"; A "-lmtime_stubs"] @ system_support_lib));
+ 
+       ocaml_lib ~tag_name:"use_mtime_os" ~dir:"src-os" "src-os/mtime";
+       flag ["link"; "ocaml"; "use_mtime_os"] (S [A "-ccopt"; A "-Lsrc-os"]);
diff --git a/dev-ml/mtime/metadata.xml b/dev-ml/mtime/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/mtime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/mtime/mtime-0.8.4.ebuild b/dev-ml/mtime/mtime-0.8.4.ebuild
new file mode 100644
index 000000000000..d80d2c83ad3e
--- /dev/null
+++ b/dev-ml/mtime/mtime-0.8.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_prepare() {
+	epatch "${FILESDIR}/firstinstall.patch"
+}
+
+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-conduit/Manifest b/dev-ml/ocaml-conduit/Manifest
new file mode 100644
index 000000000000..56c7c8e077a9
--- /dev/null
+++ b/dev-ml/ocaml-conduit/Manifest
@@ -0,0 +1 @@
+DIST ocaml-conduit-0.14.5.tar.gz 38471 SHA256 00aba333c05866bb712f7890c6f9fd457b85cf592d28adc6636413032683f86f SHA512 c2de6518588e3555cd40dfc6c1ce6d809dc570ddb6a07fb8ccce1797469e9c28ea1a633d4a1b360bf15cdb95e6231ecb0be8bd44e4654baa5268f09519096b52 WHIRLPOOL 5e052d7b9d34d76662496739a6934bf64c1930ca64b2160aa8cbefe0237bd0bb3438a187c3dd05d841b7b475325afcb32bb6fb20e0b61b885c16f4b0b3259aea
diff --git a/dev-ml/ocaml-conduit/metadata.xml b/dev-ml/ocaml-conduit/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-conduit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-conduit/ocaml-conduit-0.14.5.ebuild b/dev-ml/ocaml-conduit/ocaml-conduit-0.14.5.ebuild
new file mode 100644
index 000000000000..6402be1841e6
--- /dev/null
+++ b/dev-ml/ocaml-conduit/ocaml-conduit-0.14.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Dereference URIs into communication channels for Async or Lwt"
+HOMEPAGE="https://github.com/mirage/ocaml-conduit"
+SRC_URI="https://github.com/mirage/ocaml-conduit/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/sexplib:=
+	dev-ml/stringext:=
+	dev-ml/ocaml-uri:=
+	dev-ml/logs:=
+	dev-ml/ocaml-cstruct:=
+	dev-ml/ocaml-ipaddr:=
+
+	dev-ml/lwt:=
+	dev-ml/async:=
+	dev-ml/ocaml-dns:=
+	dev-ml/ocaml-ssl:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/findlib
+	dev-ml/ocamlbuild
+	dev-ml/ppx_driver
+	dev-ml/ppx_optcomp
+	dev-ml/ppx_sexp_conv
+"
+
+DOCS=( TODO.md README.md CHANGES )
+
+src_install() {
+	findlib_src_preinst
+	default
+}
diff --git a/dev-ml/ocaml-magic-mime/Manifest b/dev-ml/ocaml-magic-mime/Manifest
new file mode 100644
index 000000000000..3723d580cee0
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/Manifest
@@ -0,0 +1 @@
+DIST ocaml-magic-mime-1.0.0.tar.gz 53937 SHA256 a9ae72476e7b8dbd70462a10b289cb29ea8a2b1b0e6e31c8faa9e5447a51e159 SHA512 e6a050e0adc465d174083b101b66805e3261b0498cd20d19bd4d2da52859d6c792f8e13e1c787d54f81e1ff65048f4fb3c38367f1a60c8e5c94367f5f685dc8e WHIRLPOOL be87b1b7d0f5426360f4c565933ab7eae572a71f045dbaeff6c2ee8fb7a02e8e0a3e6c3a9843cdedde02d9c78e5f2b973b9bb5768fbc267a4852277984a9e440
diff --git a/dev-ml/ocaml-magic-mime/metadata.xml b/dev-ml/ocaml-magic-mime/metadata.xml
new file mode 100644
index 000000000000..ffac4d7ebc01
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
new file mode 100644
index 000000000000..51f5f36e361c
--- /dev/null
+++ b/dev-ml/ocaml-magic-mime/ocaml-magic-mime-1.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit oasis
+
+DESCRIPTION="Convert file extensions to MIME types"
+HOMEPAGE="https://github.com/mirage/ocaml-magic-mime"
+SRC_URI="https://github.com/mirage/ocaml-magic-mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild b/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild
index 06fc2ec1bfd6..52ce7c11fa6e 100644
--- a/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild
+++ b/dev-ml/ocaml-uint/ocaml-uint-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://forge.ocamlcore.org/projects/ocaml-uint/"
 SRC_URI="https://forge.ocamlcore.org/frs/download.php/1516/${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ml/onanomsg/onanomsg-1.0.ebuild b/dev-ml/onanomsg/onanomsg-1.0.ebuild
index fe9038e90de5..5cc50a878290 100644
--- a/dev-ml/onanomsg/onanomsg-1.0.ebuild
+++ b/dev-ml/onanomsg/onanomsg-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/rgrinberg/onanomsg"
 SRC_URI="https://github.com/rgrinberg/onanomsg/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="WTFPL-2"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+lwt +ocamlopt test"
 
diff --git a/dev-ml/opam/opam-1.3.0.ebuild b/dev-ml/opam/opam-1.3.0.ebuild
index 6d7f7d32857e..685ccb7d06e1 100644
--- a/dev-ml/opam/opam-1.3.0.ebuild
+++ b/dev-ml/opam/opam-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@ inherit eutils
 DESCRIPTION="A source-based package manager for OCaml"
 HOMEPAGE="http://opam.ocaml.org/"
 LICENSE="LGPL-3-with-linking-exception"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
diff --git a/dev-ml/xml-light/xml-light-2.2-r1.ebuild b/dev-ml/xml-light/xml-light-2.2-r1.ebuild
deleted file mode 100644
index b2f8489ad204..000000000000
--- a/dev-ml/xml-light/xml-light-2.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib
-
-DESCRIPTION="Minimal Xml parser and printer for OCaml"
-HOMEPAGE="http://tech.motion-twin.com/xmllight.html"
-SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-DEPEND="app-arch/unzip
-	dev-lang/ocaml
-	doc? ( dev-ml/ocaml-doc )"
-RDEPEND="dev-lang/ocaml"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
-	epatch
-}
-
-src_compile() {
-	emake -j1
-	if use doc;then
-		emake doc
-	fi
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/ocaml
-	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml install
-	dodoc README
-	if use doc; then
-		emake doc
-		dohtml doc/*
-	fi
-}
diff --git a/dev-ml/xml-light/xml-light-2.2-r2.ebuild b/dev-ml/xml-light/xml-light-2.2-r2.ebuild
deleted file mode 100644
index 4f2636a5aa6e..000000000000
--- a/dev-ml/xml-light/xml-light-2.2-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Minimal Xml parser and printer for OCaml"
-HOMEPAGE="http://tech.motion-twin.com/xmllight.html"
-SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-lang/ocaml:="
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
-	epatch
-}
-
-src_compile() {
-	emake -j1
-	if use doc;then
-		emake doc
-	fi
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/ocaml/${PN}
-	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} install
-	cat > "${D}"/usr/$(get_libdir)/ocaml/${PN}/META << EOF
-name="${PN}"
-version="${PV}"
-description="${DESCRIPTION}"
-requires=""
-archive(byte) = "xml-light.cma"
-EOF
-	dodoc README
-	if use doc; then
-		emake doc
-		dohtml doc/*
-	fi
-}
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index a75247169d03..de82bc732bf6 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,2 +1,3 @@
 DIST rosdistro-0.4.7.tar.gz 42265 SHA256 7b98e5c82ce81bd8080f159a7c907bca8bf77f6cb4bae8a3265f44e3d73b838f SHA512 adc841b19ad247f44d52cb819851715c94a73fc99ac175c0ee5656f69b86f7630a84259a9c96fa20a687ad32fa9e8e9f77802ae7b70700e53c87ee938bac2cac WHIRLPOOL 85d36fae44f895176a2ef151129baa86a9eef53700496dda2129d74d40fe67f0dbd4109df0ac7c534db1b3c712eafa73bcf3deabdd3f2dda3b5777d96a70ea69
 DIST rosdistro-0.5.0.tar.gz 48017 SHA256 dbf98013051b8ebd0e940828bb4a66c0d6fc1ec3ef36467f44636ee86d0422bf SHA512 e5a64442c56c7b60d1f334e42896172ccd07b87fbf9b5f877528073069ce63939482a5257e5dab8c16be633c044a744419017953b5dec4d9664221cf841776a8 WHIRLPOOL 4a5165340c9bcc8c46f72e70998886ec43c94a15b5c62a6a0af0c030166e369ab769fda03819b084384615cf3ad2d43f89961c73ad8ac9b835e687880b2b0a48
+DIST rosdistro-0.6.1.tar.gz 48699 SHA256 51c9a3a5ff4931310c6c7cf5a23a2c64b2432ed9154a159a9ca3ce55c608600f SHA512 9f7c9eea737da443b1daaacde6bcea163ac2ffc707efb23016fe77c68423ee192e0610b9aa1c8a4b07735d1784e30a509dc78cf256061fcc4de75ed4c4244f75 WHIRLPOOL 3dca25a0cd68efa41e21d71d1528213f9ca54719ea3b1dc3cb8e90b6a932d98d97874d4cf6ef3630f3413a7a15b6004bbba8e3aa72d509d11836d3a6cee79519
diff --git a/dev-python/rosdistro/rosdistro-0.6.1.ebuild b/dev-python/rosdistro/rosdistro-0.6.1.ebuild
new file mode 100644
index 000000000000..6f235cc43c15
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
index 2b6bb4c36e37..c60d4ae67187 100644
--- a/dev-ros/cmake_modules/Manifest
+++ b/dev-ros/cmake_modules/Manifest
@@ -1 +1,2 @@
 DIST cmake_modules-0.4.0.tar.gz 17379 SHA256 8d95669b37c6b9a3bef85d6c374cfd1d7ea55aef3951b870d135ed91c458a95c SHA512 60bcc800541d6280e3a20c016ac9489efb98e136ed0cc4b13685c1b43001d74ea75b334df8a7b6da414c17ecd7ad8398f4bb6a8fe0bb75155430b47d045a2462 WHIRLPOOL ac3dcb75fd68d5d46a83c29c5b7b55a3dfb6b5329160e8d3057ad4ec50c1b4ac9fe5106b24d08aee5305fe2f66c7ccdeb2a42fff36929727b161ae78ab296aac
+DIST cmake_modules-0.4.1.tar.gz 18057 SHA256 1a141f44541e4b23af68166ed3dcb8c274c325be68db40399d5d8388e92e3997 SHA512 7bc0ab1c89686cfbabbf5fd5bf1685c8eef7325c62a7ecd5ef38a14b54eb80c65306b70b30bef4a001d4081e6c43e75a39fc38e5e1b6227a6725093417ba4cf2 WHIRLPOOL 7240635435b47b8f754c4f0b2fefc95c4da59791ace82344b9d3f995b1374a59c80aa3080e31da1e661a49471010043ade0492e57219dd1174517a9fad96afd1
diff --git a/dev-ros/cmake_modules/cmake_modules-0.4.1.ebuild b/dev-ros/cmake_modules/cmake_modules-0.4.1.ebuild
new file mode 100644
index 000000000000..ba3fca0c94f9
--- /dev/null
+++ b/dev-ros/cmake_modules/cmake_modules-0.4.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/cmake_modules"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/mk/Manifest b/dev-ros/mk/Manifest
index f13e13501cf3..ee298b0cdfac 100644
--- a/dev-ros/mk/Manifest
+++ b/dev-ros/mk/Manifest
@@ -5,3 +5,4 @@ DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb795
 DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.12.3.ebuild b/dev-ros/mk/mk-1.14.0.ebuild
index ed54e9e820eb..42ed046c7583 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.12.3.ebuild
+++ b/dev-ros/mk/mk-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,11 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
+ROS_SUBDIR=core/${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+DESCRIPTION="A collection of .mk include files for building ROS architectural elements"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index f13e13501cf3..ee298b0cdfac 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -5,3 +5,4 @@ DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb795
 DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.2.ebuild b/dev-ros/rosbash/rosbash-1.14.0.ebuild
index 1ef9c9e74019..dc7ce1305e4c 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.2.ebuild
+++ b/dev-ros/rosbash/rosbash-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,14 +7,14 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
 
 inherit ros-catkin
 
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+DESCRIPTION="Assorted shell commands for using ros with bash"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )
diff --git a/dev-ros/rosboost_cfg/Manifest b/dev-ros/rosboost_cfg/Manifest
index f13e13501cf3..ed42a1f8b984 100644
--- a/dev-ros/rosboost_cfg/Manifest
+++ b/dev-ros/rosboost_cfg/Manifest
@@ -1,7 +1 @@
-DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
-DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
-DIST ros-1.13.1.tar.gz 165211 SHA256 2860d84fd72930c847e57ae8a0c6bdc960a010e9c01688759ff1382ec1a74be3 SHA512 7902fa33b4442feadd11ac8b965fbc7b94bbf9126320681bc83a067c5a2031f062ce0fe7585e482cac61c81cf2ef1b5dd92a37a4243908095d76869585962218 WHIRLPOOL 9f38f12b168ca8cbecae52322e9d0a5bfe6f2d10bed6b0ca133510b4002bf9ebfd7978b9f50d43fdbc0e33b685ee88297f806b26826fa25c6afac5c0ebe9b914
-DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb7956b25fee635b3c58237f2a SHA512 d6a407ba1916667e7cae0f16f87d2a0ac49bc019195e423289e0f3380ca50404a21bcd8ee6212005bc3fa528ee7e8ae5dd0d993c5f213e5690509926f7984e26 WHIRLPOOL f06b225c5cde0bf86d915edd51d84178b5b17c713107b0d3bc79d9523363b47de68483d5f6f834ba454ddff57b41c77e5b3fa2ca1fac5eb604e15195d0d5e888
-DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
-DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
-DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.1.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.13.1.ebuild
deleted file mode 100644
index ed54e9e820eb..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.3.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.13.3.ebuild
deleted file mode 100644
index 1ef9c9e74019..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.4.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.13.4.ebuild
deleted file mode 100644
index 1ef9c9e74019..000000000000
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.5.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.0.ebuild
index 1082bba4e3a5..395e0fd19c1d 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.13.5.ebuild
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-1.14.0.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild b/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
index ed54e9e820eb..395e0fd19c1d 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
+++ b/dev-ros/rosboost_cfg/rosboost_cfg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosbuild/Manifest b/dev-ros/rosbuild/Manifest
index f13e13501cf3..ee298b0cdfac 100644
--- a/dev-ros/rosbuild/Manifest
+++ b/dev-ros/rosbuild/Manifest
@@ -5,3 +5,4 @@ DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb795
 DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosboost_cfg/rosboost_cfg-1.12.5.ebuild b/dev-ros/rosbuild/rosbuild-1.14.0.ebuild
index ed54e9e820eb..099a664d86ae 100644
--- a/dev-ros/rosboost_cfg/rosboost_cfg-1.12.5.ebuild
+++ b/dev-ros/rosbuild/rosbuild-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,11 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python{2_7,3_4} )
+ROS_SUBDIR=core/${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tool for determining cflags/lflags/etc. of boost on your system"
+DESCRIPTION="Scripts for managing the CMake-based build system for ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/rosclean/Manifest b/dev-ros/rosclean/Manifest
index 6ebf17b2546a..28b5f255d298 100644
--- a/dev-ros/rosclean/Manifest
+++ b/dev-ros/rosclean/Manifest
@@ -1,2 +1,3 @@
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosmake/rosmake-1.12.3.ebuild b/dev-ros/rosclean/rosclean-1.14.0.ebuild
index 79d3f391e4f7..3bdb71d90d48 100644
--- a/dev-ros/rosmake/rosmake-1.12.3.ebuild
+++ b/dev-ros/rosclean/rosclean-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,12 +6,12 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="ROS dependency aware build tool"
+DESCRIPTION="Cleanup filesystem resources (e.g. log files)"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -20,3 +20,4 @@ RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
+PATCHES=( "${FILESDIR}/bb.patch" )
diff --git a/dev-ros/roscreate/Manifest b/dev-ros/roscreate/Manifest
index f13e13501cf3..ed42a1f8b984 100644
--- a/dev-ros/roscreate/Manifest
+++ b/dev-ros/roscreate/Manifest
@@ -1,7 +1 @@
-DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
-DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
-DIST ros-1.13.1.tar.gz 165211 SHA256 2860d84fd72930c847e57ae8a0c6bdc960a010e9c01688759ff1382ec1a74be3 SHA512 7902fa33b4442feadd11ac8b965fbc7b94bbf9126320681bc83a067c5a2031f062ce0fe7585e482cac61c81cf2ef1b5dd92a37a4243908095d76869585962218 WHIRLPOOL 9f38f12b168ca8cbecae52322e9d0a5bfe6f2d10bed6b0ca133510b4002bf9ebfd7978b9f50d43fdbc0e33b685ee88297f806b26826fa25c6afac5c0ebe9b914
-DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb7956b25fee635b3c58237f2a SHA512 d6a407ba1916667e7cae0f16f87d2a0ac49bc019195e423289e0f3380ca50404a21bcd8ee6212005bc3fa528ee7e8ae5dd0d993c5f213e5690509926f7984e26 WHIRLPOOL f06b225c5cde0bf86d915edd51d84178b5b17c713107b0d3bc79d9523363b47de68483d5f6f834ba454ddff57b41c77e5b3fa2ca1fac5eb604e15195d0d5e888
-DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
-DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
-DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/roscreate/roscreate-1.12.3.ebuild b/dev-ros/roscreate/roscreate-1.12.3.ebuild
deleted file mode 100644
index 85d31c976ae4..000000000000
--- a/dev-ros/roscreate/roscreate-1.12.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.13.1.ebuild b/dev-ros/roscreate/roscreate-1.13.1.ebuild
deleted file mode 100644
index 85d31c976ae4..000000000000
--- a/dev-ros/roscreate/roscreate-1.13.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.13.2.ebuild b/dev-ros/roscreate/roscreate-1.13.2.ebuild
deleted file mode 100644
index 0b915bb3ac54..000000000000
--- a/dev-ros/roscreate/roscreate-1.13.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.13.3.ebuild b/dev-ros/roscreate/roscreate-1.13.3.ebuild
deleted file mode 100644
index 0b915bb3ac54..000000000000
--- a/dev-ros/roscreate/roscreate-1.13.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.13.4.ebuild b/dev-ros/roscreate/roscreate-1.13.4.ebuild
deleted file mode 100644
index 0b915bb3ac54..000000000000
--- a/dev-ros/roscreate/roscreate-1.13.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/roscreate/roscreate-1.13.5.ebuild b/dev-ros/roscreate/roscreate-1.14.0.ebuild
index 1824c85cccf1..13d30e871bcc 100644
--- a/dev-ros/roscreate/roscreate-1.13.5.ebuild
+++ b/dev-ros/roscreate/roscreate-1.14.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/roscreate/roscreate-9999.ebuild b/dev-ros/roscreate/roscreate-9999.ebuild
index 85d31c976ae4..13d30e871bcc 100644
--- a/dev-ros/roscreate/roscreate-9999.ebuild
+++ b/dev-ros/roscreate/roscreate-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/roslang/Manifest b/dev-ros/roslang/Manifest
index f13e13501cf3..ee298b0cdfac 100644
--- a/dev-ros/roslang/Manifest
+++ b/dev-ros/roslang/Manifest
@@ -5,3 +5,4 @@ DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb795
 DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/roslang/roslang-1.14.0.ebuild b/dev-ros/roslang/roslang-1.14.0.ebuild
new file mode 100644
index 000000000000..5a25d54a5ab4
--- /dev/null
+++ b/dev-ros/roslang/roslang-1.14.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common package for all ROS client libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roslib/Manifest b/dev-ros/roslib/Manifest
index 6ebf17b2546a..28b5f255d298 100644
--- a/dev-ros/roslib/Manifest
+++ b/dev-ros/roslib/Manifest
@@ -1,2 +1,3 @@
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/roslib/roslib-1.14.0.ebuild b/dev-ros/roslib/roslib-1.14.0.ebuild
new file mode 100644
index 000000000000..fa8282812874
--- /dev/null
+++ b/dev-ros/roslib/roslib-1.14.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=core/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Base dependencies and support libraries for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-ros/rospack
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/rosmake/Manifest b/dev-ros/rosmake/Manifest
index f13e13501cf3..ed42a1f8b984 100644
--- a/dev-ros/rosmake/Manifest
+++ b/dev-ros/rosmake/Manifest
@@ -1,7 +1 @@
-DIST ros-1.12.3.tar.gz 162506 SHA256 49b9368e901d69f464b46c9ff0d12843d413fe20c4271225dbb75169bb82a47e SHA512 fe740f357959ed2cabcf0d902c7f1ebe6a7dedd11376ec76e5f47383b0b29b15127306255bea9adb3a48b2872a681a10302f9b0c4da4625c31bcc78522b66d7c WHIRLPOOL d57a877f7b7dc2a6613d3ea07b59e740e25bfffbcec51fa4ce826ccdc9f95dd9aed121736f46338068f9cf06b52a6abc8462ce663bbd4519e7d93f16422995f5
-DIST ros-1.12.5.tar.gz 162845 SHA256 13233fce9ad605c9a9d7da7c40df8babf6bf1ca6b5e7605b57aa451fb03ee83c SHA512 db67da9ba13afa516aea64d2d42cbfd07ddd7f87d5a6db7506a9f80af8eea0ac2bd85251a10b8f07a7384d3de869c46a354fa003d8e834a0ab5fdf26ed991314 WHIRLPOOL bfe4f06f318d5d39d5d3690fa9fdcb75ad622018ee4ad527d9be2ca60b0096c4dde5632d089e0de817337e26bbf2ca169724d0fe634587802cb10cc0ad0db254
-DIST ros-1.13.1.tar.gz 165211 SHA256 2860d84fd72930c847e57ae8a0c6bdc960a010e9c01688759ff1382ec1a74be3 SHA512 7902fa33b4442feadd11ac8b965fbc7b94bbf9126320681bc83a067c5a2031f062ce0fe7585e482cac61c81cf2ef1b5dd92a37a4243908095d76869585962218 WHIRLPOOL 9f38f12b168ca8cbecae52322e9d0a5bfe6f2d10bed6b0ca133510b4002bf9ebfd7978b9f50d43fdbc0e33b685ee88297f806b26826fa25c6afac5c0ebe9b914
-DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb7956b25fee635b3c58237f2a SHA512 d6a407ba1916667e7cae0f16f87d2a0ac49bc019195e423289e0f3380ca50404a21bcd8ee6212005bc3fa528ee7e8ae5dd0d993c5f213e5690509926f7984e26 WHIRLPOOL f06b225c5cde0bf86d915edd51d84178b5b17c713107b0d3bc79d9523363b47de68483d5f6f834ba454ddff57b41c77e5b3fa2ca1fac5eb604e15195d0d5e888
-DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
-DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
-DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/rosmake/rosmake-1.12.5.ebuild b/dev-ros/rosmake/rosmake-1.12.5.ebuild
deleted file mode 100644
index 79d3f391e4f7..000000000000
--- a/dev-ros/rosmake/rosmake-1.12.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.13.1.ebuild b/dev-ros/rosmake/rosmake-1.13.1.ebuild
deleted file mode 100644
index 79d3f391e4f7..000000000000
--- a/dev-ros/rosmake/rosmake-1.13.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.13.2.ebuild b/dev-ros/rosmake/rosmake-1.13.2.ebuild
deleted file mode 100644
index 7fffaf03234f..000000000000
--- a/dev-ros/rosmake/rosmake-1.13.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.13.3.ebuild b/dev-ros/rosmake/rosmake-1.13.3.ebuild
deleted file mode 100644
index 7fffaf03234f..000000000000
--- a/dev-ros/rosmake/rosmake-1.13.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.13.4.ebuild b/dev-ros/rosmake/rosmake-1.13.4.ebuild
deleted file mode 100644
index 7fffaf03234f..000000000000
--- a/dev-ros/rosmake/rosmake-1.13.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS dependency aware build tool"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/rospkg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/rosmake/rosmake-1.13.5.ebuild b/dev-ros/rosmake/rosmake-1.14.0.ebuild
index 2ad02c5839de..cad8df8e2386 100644
--- a/dev-ros/rosmake/rosmake-1.13.5.ebuild
+++ b/dev-ros/rosmake/rosmake-1.14.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/rosmake/rosmake-9999.ebuild b/dev-ros/rosmake/rosmake-9999.ebuild
index 79d3f391e4f7..cad8df8e2386 100644
--- a/dev-ros/rosmake/rosmake-9999.ebuild
+++ b/dev-ros/rosmake/rosmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/rosunit/Manifest b/dev-ros/rosunit/Manifest
index 6ebf17b2546a..28b5f255d298 100644
--- a/dev-ros/rosunit/Manifest
+++ b/dev-ros/rosunit/Manifest
@@ -1,2 +1,3 @@
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/dev-ros/roscreate/roscreate-1.12.5.ebuild b/dev-ros/rosunit/rosunit-1.14.0.ebuild
index 85d31c976ae4..7c5c7199379f 100644
--- a/dev-ros/roscreate/roscreate-1.12.5.ebuild
+++ b/dev-ros/rosunit/rosunit-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,19 +6,20 @@ EAPI=5
 
 ROS_REPO_URI="https://github.com/ros/ros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tool that assists in the creation of ROS filesystem resources"
+DESCRIPTION="Unit-testing package for ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]"
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
 "
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 93086aa123a7..a90a8da03a35 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -218,6 +218,11 @@ ros-catkin_src_compile() {
 # Decorator around cmake-utils_src_test to ensure tests are built before running them.
 ros-catkin_src_test_internal() {
 	cd "${BUILD_DIR}" || die
+	# Regenerate env for tests, PYTHONPATH is not set properly otherwise...
+	if [ -f catkin_generated/generate_cached_setup.py ] ; then
+		einfo "Regenerating setup_cached.sh for tests"
+		${PYTHON:-python} catkin_generated/generate_cached_setup.py || die
+	fi
 	# Using cmake-utils_src_make with nonfatal does not work and breaks e.g.
 	# dev-ros/rviz.
 	if nonfatal emake tests -n &> /dev/null ; then
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 1da4f2640195..7d6b7ff5fc5e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
 DIST mkvtoolnix-9.6.0.tar.xz 3810216 SHA256 ebab8dcc59533d248b127d375286eb47880a222ef68ff7a10e1c87d49dbd86bb SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436 WHIRLPOOL f90056b595402315651754bf4428762a99a665f8ce78d7eb8d6d5ad3bb8bc95e19b130c154c52c2d1281028ebf78c5834abedf068601382a3fcca9ea2c37aa2a
 DIST mkvtoolnix-9.7.1.tar.xz 3824684 SHA256 b2b8821e2d74df0f765c97f93ddd1dbfb062f3c22b969cfa04d1bb5cb638a88e SHA512 dec886e6a53abc76ae0f9ccff3e122b7a267afd3493f41eb006e1a29b22b0a7cca386271fb576e7b863d7ea23605da918a0ce8bb3ffc887e00b1bd07e04b73bc WHIRLPOOL f2347d8f5a4182f3cd0239c7fbf4cc8c13bea677cdcd10f53c258d85c2035e3d535974f91e5c567722990153ce50b3377f23545ce045fa695af357c2ca3a3552
 DIST mkvtoolnix-9.8.0.tar.xz 3790212 SHA256 494b2fb9ff83a858d8849baecdd3320456717923bb7a854d31a02a49640228db SHA512 214f378cec45bea606c516e5ca2472704bad3a50fcb337fc931d9ec789ba9367b25e0e97a506ac6b0d3802d97e6c22435e2c54c309a5a6f57402f1c54c888479 WHIRLPOOL 3ae3970d02eb43b4f06df83bfcbf32342438d0223c9fa1d2985f29e7853a69f9d21bfc4f1b1ecedfac944004480524e8554a207e29ac9daa9124c45d75fea1b4
+DIST mkvtoolnix-9.9.0.tar.xz 3688304 SHA256 f06c9359bd197b5de6556a05506f0ea9ddab72045b72f1ed04b1807e4e042043 SHA512 a00162abd75cf7d34ec14555da4fd80e114473e2a34323f9e1404c807e312ebdc516614643c02e5c22be0e3927e0c3f9ab7ad043d24dc5fd7176cf0719503484 WHIRLPOOL 7f6422f77a61593896325c3032eac7d26c4fa1e319ed2b457e1cba59a3f780980e466987882610b84d6f99ace6c6df1ae626b47f4bd7498d6a7471cf224ed4d0
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.9.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.9.0.ebuild
new file mode 100644
index 000000000000..cffd4c63f415
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-9.9.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
+
+DESCRIPTION="Tools to create, alter, and inspect Matroska files"
+HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
+SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug pch test qt5"
+
+RDEPEND="
+	>=dev-libs/boost-1.46.0:=
+	>=dev-libs/libebml-1.3.3:=
+	dev-libs/jsoncpp:=
+	dev-libs/pugixml
+	media-libs/flac
+	>=media-libs/libmatroska-1.4.4:=
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-apps/file
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-ruby/rake
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/po4a
+	test? ( dev-cpp/gtest )
+"
+
+pkg_pretend() {
+	# https://bugs.gentoo.org/419257
+	local ver=4.6
+	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
+	if ! version_is_at_least ${ver} $(gcc-version); then
+		eerror ${msg}
+		die ${msg}
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use qt5 ; then
+		# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+		myconf+=(
+			--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+			--with-uic=/usr/$(get_libdir)/qt5/bin/uic
+			--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+		)
+	fi
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable qt5 qt) \
+		$(usex pch "" --disable-precompiled-headers) \
+		"${myconf[@]}" \
+		--disable-optimization \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-boost="${EPREFIX}"/usr \
+		--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	rake V=1 -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	rake V=1 -j$(makeopts_jobs) tests:unit || die
+	rake V=1 -j$(makeopts_jobs) tests:run_unit || die
+}
+
+src_install() {
+	DESTDIR="${D}" rake -j$(makeopts_jobs) install || die
+
+	dodoc AUTHORS ChangeLog README.md
+	doman doc/man/*.1
+}
diff --git a/net-misc/asterisk/asterisk-11.25.1.ebuild b/net-misc/asterisk/asterisk-11.25.1.ebuild
index fb7c4b9af247..1f6ebb43fb00 100644
--- a/net-misc/asterisk/asterisk-11.25.1.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-13.13.1.ebuild b/net-misc/asterisk/asterisk-13.13.1.ebuild
index b1debdef08cb..c4294edb71fc 100644
--- a/net-misc/asterisk/asterisk-13.13.1.ebuild
+++ b/net-misc/asterisk/asterisk-13.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.04.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild
index 4a04cf36e8bd..d96e2da8eda4 100644
--- a/net-misc/dahdi-tools/dahdi-tools-2.10.2.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-2.10.2.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
 # $Id$
 
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="ppp"
 
 DEPEND="dev-libs/newt
diff --git a/net-misc/putty/putty-0.68.ebuild b/net-misc/putty/putty-0.68.ebuild
index d1db63a86c9b..2088f9f8e0bb 100644
--- a/net-misc/putty/putty-0.68.ebuild
+++ b/net-misc/putty/putty-0.68.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="doc +gtk ipv6 kerberos"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
diff --git a/ros-meta/ros/Manifest b/ros-meta/ros/Manifest
index f13e13501cf3..ee298b0cdfac 100644
--- a/ros-meta/ros/Manifest
+++ b/ros-meta/ros/Manifest
@@ -5,3 +5,4 @@ DIST ros-1.13.2.tar.gz 165502 SHA256 439fc4319009583eab5c4db0f25549dbb972bffb795
 DIST ros-1.13.3.tar.gz 165919 SHA256 294b33d01ec1016731e157bd0a604ed74189d5c964112b6d063bd5ef182d5eaf SHA512 0f09560d526e9a016984774e9c32978b347e99bfcf7ca74c00379a5cd2191e4b51675f6156090cb19a3626818a6babcd9b850f4a5b7ac0b249c6fe34c767630e WHIRLPOOL 143114407a49fcc2e58da8e644c8775e2afd6d7cbcbdcd0917936271b720126b3a0f0790602cf3d33070e0397185c224d43c50e5463d632c9460cc75ab83e6f9
 DIST ros-1.13.4.tar.gz 165984 SHA256 dd8b763c6d5eda17f46ddafddfbaa980584a1b3e7ae345c2b25606a052393541 SHA512 380bdf94a1cfde0981afe17bbcb45c17bcb6f5e8087b83394b372c9178ee33ba130f5347a39e2a71ce3b92eef2666c85480f41afd40807a0314cc606d83df6d8 WHIRLPOOL 1dbc20748864836cf19516fee6bd2338b4a1e93c40fbe212117533b45daa40c712bf405dc6e966088d862caa691336a7a8da96bc0d7e957ec24231c395264f36
 DIST ros-1.13.5.tar.gz 167351 SHA256 892703a33dc3e703cf504e5f3c772e55ccbba5d78f4b5eab75f33cea3614b48a SHA512 710b7d39d12f9990369f59e0af29ad506268d7482970a987793a38f9ad934a56ebe40bec461020482b0497df2dc169f9d42fb23742eba93d6de13e000be1f40d WHIRLPOOL 086fbfed5b9424dbccb1eba35311690bf4924cc06d6454cb4911eccb21397bd8b21434318eb6eae1843a3a22ef8a618421906b3e698b009f3f36e1a95265396e
+DIST ros-1.14.0.tar.gz 167371 SHA256 42d2a91e867684b3bd0cf9132e5d6dc5bc996086e5ac7baaeeec9c51005282eb SHA512 b3353eeb88b1e5db456ae796a9b869e540e71a7ff94327c7b2c0cfdc58af599793f4b4e36ec54a80059d938ea1d27ca87f4093ea2621c9267a642f99db3acb31 WHIRLPOOL 142dda77e1d9cf9b5fdab9bcdace8eb9fdeb19060eaff8af16bda27d925c00ffc401bf0a41017aa4d81325dc6703ac9571a54c17e433910c751a2080c2637355
diff --git a/ros-meta/ros/ros-1.14.0.ebuild b/ros-meta/ros/ros-1.14.0.ebuild
new file mode 100644
index 000000000000..bc36ca002bc9
--- /dev/null
+++ b/ros-meta/ros/ros-1.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=ros
+
+inherit ros-catkin
+
+DESCRIPTION="ROS packaging system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbash
+	dev-ros/rosboost_cfg
+	dev-ros/rosclean
+	dev-ros/roscreate
+	dev-ros/rosmake
+	dev-ros/rosunit
+
+	dev-ros/mk
+	dev-ros/rosbuild
+	dev-ros/roslang
+	dev-ros/roslib
+"
+DEPEND="${RDEPEND}"
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index a3a45faf4a53..73063c3da5d1 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="doc infiniband static-libs systemd xml"
 
 # TODO: support those new configure flags