Merge updates from master

38 files changed, 607 insertions, 291 deletions

diff --git a/dev-ml/ocaml-bigstring/Manifest b/dev-ml/ocaml-bigstring/Manifest
new file mode 100644
index 000000000000..312dc11f276a
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/Manifest
@@ -0,0 +1 @@
+DIST ocaml-bigstring-0.1.1.tar.gz 7671 SHA256 d09dad10711d5bf4e48601e09702186f5c1d12c7772e44e3ab9394d3839f2b27 SHA512 96aee494b9407b556b6eb554b0da66e24622f77d88aae6d822da60a3fb21477da8e7ae120f95f4f3c742b085ca4838f10ca0c8b2bcc4d23e35fd7de6af8532b3 WHIRLPOOL 59d3c570b024f292122052e9bbc9a8306032250cd95ecc18f9fcf6ebdf89ebc7db0060825cae18ad2271f99d75c1713d176a8b9bd1a457193f77d976aad49333
diff --git a/dev-ml/ocaml-bigstring/metadata.xml b/dev-ml/ocaml-bigstring/metadata.xml
new file mode 100644
index 000000000000..2e4acd905351
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">c-cube/ocaml-bigstring</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild b/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild
new file mode 100644
index 000000000000..84098f18ecbe
--- /dev/null
+++ b/dev-ml/ocaml-bigstring/ocaml-bigstring-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit findlib
+
+DESCRIPTION="Overlay over bigarrays of chars"
+HOMEPAGE="https://github.com/c-cube/ocaml-bigstring/"
+SRC_URI="https://github.com/c-cube/ocaml-bigstring/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# ocamlfind: Package `QTest2Lib' not found
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/ocaml:=
+"
+DEPEND="${RDEPEND}
+	dev-ml/ocamlbuild
+	test? ( dev-ml/iTeML )
+"
+
+src_install() {
+	findlib_src_preinst
+	default
+}
diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
index cb342539a991..b407c11aa26b 100644
--- a/dev-ml/ocaml-containers/Manifest
+++ b/dev-ml/ocaml-containers/Manifest
@@ -1,3 +1 @@
-DIST ocaml-containers-0.22.1.tar.gz 429672 SHA256 2ef64e8ed93211dfd4f8cd594943db3cde81ee0400b17703d8a7993128634622 SHA512 9294d43485cd17998f9d0c758ee0ffdc187ea78f1f456c0b06a57a9401c6de529e9e68bad12908b2b0da5f22fca64835acb90f3dfd6ee3403bb7c3c301cd6821 WHIRLPOOL 67844578447b321439223b5f560258cb5d5417135dfdbfdaf2fa10e104beb764e9ca6ae0ab774864c974d928e75aa5aedc7e90ea5659d910f33349a7ec4b568b
-DIST ocaml-containers-1.0.tar.gz 378474 SHA256 d31239782eda4ffddc6358add3089e3a389aab7682b8202fd7db90075a703e75 SHA512 a22bd66c522f734c6081d1675af3d110cf1e9b4d3bd066aa9366c25fc840890a4ef779fa68ded84ef1b09df37fa7c217dfed1c15b1243f511ebfd24d7f0d2590 WHIRLPOOL a883d3052b400f66905441720164ee68e51353a4940ddcec0d05bef08533549dad7d428fce05d49a235a5a6586b3aca23ec757cf5abff6f4d84d5b75b8751569
-DIST ocaml-containers-1.1.tar.gz 284852 SHA256 b8255217d5e797fe40d997b59558f1152a55f59a621c963ba7da5a00242e2f3d SHA512 8a01ae019fcebf540972e64fed70abec7a0af8a7686bbc230734e5717cb2c4dfdb239ac145126e8243da9770475e34147fd631f6344947145b3c2a41d10e6152 WHIRLPOOL 479385c85b34805087b56d158be10849251fec0c00e00f73ba7886a76a2e09080995aa62e49795abe34a01c52d7a6789d5041c5cb497f65e323cac2fb4ef6cf3
+DIST ocaml-containers-1.2.tar.gz 293774 SHA256 1c7825fbefaf90c3f9f9367ce0abda95f1dda242b1db560ed51c75ef0c6b5b15 SHA512 c5d94760a51a94aca1482ce3720450bce4448090609737a5be50f99c8884441df4676da953b31bdb8f10dd2fca3235b6e9e8d1580bd3fa917b03408a9a14b28d WHIRLPOOL a365c6992d926d2c4045da0a39052c7eba71eb3c937eca126a186e393fefdf199fe1e40f5cde21539df914e235ce8e3dcd7712da86160a2ef1631cf223c3be65
diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.22.1.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.22.1.ebuild
deleted file mode 100644
index 068999363bfe..000000000000
--- a/dev-ml/ocaml-containers/ocaml-containers-0.22.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-ml/result:=
-	>=dev-ml/sequence-0.9:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo
-	test? ( dev-ml/iTeML )"
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.0.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.0.ebuild
deleted file mode 100644
index 1952f9059c1c..000000000000
--- a/dev-ml/ocaml-containers/ocaml-containers-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-# Breaks onanomsg, its sole revdep
-#KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-ml/result:=
-	>=dev-ml/sequence-0.9:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo
-	test? ( dev-ml/iTeML )"
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.1.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
index 363fc9ba1463..33e8871a4f73 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-1.1.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
@@ -14,8 +14,7 @@ SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD-2"
 SLOT="0/${PV}"
-# Breaks onanomsg, its sole revdep
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-ml/onanomsg/files/bigstring.patch b/dev-ml/onanomsg/files/bigstring.patch
new file mode 100644
index 000000000000..311fa2ee7495
--- /dev/null
+++ b/dev-ml/onanomsg/files/bigstring.patch
@@ -0,0 +1,218 @@
+Index: onanomsg-1.0/lib/nanomsg.ml
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg.ml
++++ onanomsg-1.0/lib/nanomsg.ml
+@@ -209,7 +209,7 @@ let recv_fd sock =
+   (Obj.magic fd : Unix.file_descr)
+ 
+ let send_bigstring_buf ?(block=true) sock buf pos len =
+-  if pos < 0 || len < 0 || pos + len > CCBigstring.size buf
++  if pos < 0 || len < 0 || pos + len > Bigstring.size buf
+   then invalid_arg "bounds";
+   let nn_buf = nn_allocmsg (size_of_int len) 0 in
+   match nn_buf with
+@@ -218,12 +218,12 @@ let send_bigstring_buf ?(block=true) soc
+     let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+     let ba = Ctypes.(bigarray_of_ptr array1 len
+                        Bigarray.char @@ from_voidp char nn_buf) in
+-    CCBigstring.blit buf pos ba 0 len;
++    Bigstring.blit buf pos ba 0 len;
+     ignore @@ raise_notequal len
+       (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block))
+ 
+ let send_bigstring ?(block=true) sock buf =
+-  send_bigstring_buf ~block sock buf 0 @@ CCBigstring.size buf
++  send_bigstring_buf ~block sock buf 0 @@ Bigstring.size buf
+ 
+ let send_bytes_buf ?(block=true) sock buf pos len =
+   if pos < 0 || len < 0 || pos + len > Bytes.length buf
+@@ -235,7 +235,7 @@ let send_bytes_buf ?(block=true) sock bu
+     let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+     let ba = Ctypes.(bigarray_of_ptr array1 len
+                        Bigarray.char @@ from_voidp char nn_buf) in
+-    CCBigstring.blit_of_bytes buf pos ba 0 len;
++    Bigstring.blit_of_bytes buf pos ba 0 len;
+     ignore @@ raise_notequal len
+       (fun () -> nn_send sock nn_buf_p nn_msg (int_of_bool block))
+ 
+@@ -266,16 +266,16 @@ let recv ?(block=true) sock f =
+ let recv_bytes_buf ?(block=true) sock buf pos =
+   recv ~block sock
+     (fun ba ->
+-       let len = CCBigstring.size ba in
+-       CCBigstring.(blit_to_bytes ba 0 buf pos len);
++       let len = Bigstring.size ba in
++       Bigstring.(blit_to_bytes ba 0 buf pos len);
+        len
+     )
+ 
+ let recv_bytes ?(block=true) sock =
+   recv ~block sock (fun ba ->
+-      let len = CCBigstring.size ba in
++      let len = Bigstring.size ba in
+       let buf = Bytes.create len in
+-      CCBigstring.blit_to_bytes ba 0 buf 0 len;
++      Bigstring.blit_to_bytes ba 0 buf 0 len;
+       buf)
+ 
+ let recv_string ?(block=true) sock =
+Index: onanomsg-1.0/lib/nanomsg.mli
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg.mli
++++ onanomsg-1.0/lib/nanomsg.mli
+@@ -45,8 +45,8 @@ val close : socket -> unit
+ 
+ (** {2 Zero-copy I/O} *)
+ 
+-val send_bigstring : ?block:bool -> socket -> CCBigstring.t -> unit
+-val send_bigstring_buf : ?block:bool -> socket -> CCBigstring.t -> int -> int -> unit
++val send_bigstring : ?block:bool -> socket -> Bigstring.t -> unit
++val send_bigstring_buf : ?block:bool -> socket -> Bigstring.t -> int -> int -> unit
+ 
+ val send_string : ?block:bool -> socket -> string -> unit
+ val send_string_buf : ?block:bool -> socket -> string -> int -> int -> unit
+@@ -54,7 +54,7 @@ val send_string_buf : ?block:bool -> soc
+ val send_bytes : ?block:bool -> socket -> Bytes.t -> unit
+ val send_bytes_buf : ?block:bool -> socket -> Bytes.t -> int -> int -> unit
+ 
+-val recv : ?block:bool -> socket -> (CCBigstring.t -> 'a) -> 'a
++val recv : ?block:bool -> socket -> (Bigstring.t -> 'a) -> 'a
+ (** [recv ?block sock f] applies [f] to the received message. The
+     argument of [f] gets unallocated after [f] returns, so make sure
+     [f] {b never} let a reference to its argument escape. *)
+Index: onanomsg-1.0/lib/nanomsg_lwt.ml
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg_lwt.ml
++++ onanomsg-1.0/lib/nanomsg_lwt.ml
+@@ -25,7 +25,7 @@ let raise_negative sock io_event f = rai
+ let raise_notequal sock io_event v f = raise_if sock io_event (fun x -> x <> v) f
+ 
+ let send_bigstring_buf sock buf pos len =
+-  if pos < 0 || len < 0 || pos + len > CCBigstring.size buf
++  if pos < 0 || len < 0 || pos + len > Bigstring.size buf
+   then invalid_arg "bounds";
+   let nn_buf = nn_allocmsg (size_of_int len) 0 in
+   match nn_buf with
+@@ -34,14 +34,14 @@ let send_bigstring_buf sock buf pos len
+     let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+     let ba = Ctypes.(bigarray_of_ptr array1 len
+                        Bigarray.char @@ from_voidp char nn_buf) in
+-    CCBigstring.blit buf pos ba 0 len;
++    Bigstring.blit buf pos ba 0 len;
+     raise_notequal sock Lwt_unix.Write len
+       (fun () -> nn_send (Obj.magic sock : int) nn_buf_p nn_msg
+           Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written ->
+     ignore nb_written
+ 
+ let send_bigstring sock buf =
+-  send_bigstring_buf sock buf 0 @@ CCBigstring.size buf
++  send_bigstring_buf sock buf 0 @@ Bigstring.size buf
+ 
+ let send_bytes_buf sock buf pos len =
+   if pos < 0 || len < 0 || pos + len > Bytes.length buf
+@@ -53,7 +53,7 @@ let send_bytes_buf sock buf pos len =
+     let nn_buf_p = Ctypes.(allocate (ptr void) nn_buf) in
+     let ba = Ctypes.(bigarray_of_ptr array1 len
+                        Bigarray.char @@ from_voidp char nn_buf) in
+-    CCBigstring.blit_of_bytes buf pos ba 0 len;
++    Bigstring.blit_of_bytes buf pos ba 0 len;
+     raise_notequal sock Lwt_unix.Write len
+       (fun () -> nn_send (Obj.magic sock : int)  nn_buf_p nn_msg
+           Symbol.(value_of_name_exn "NN_DONTWAIT")) >|= fun nb_written ->
+@@ -84,16 +84,16 @@ let recv sock f =
+ 
+ let recv_bytes_buf sock buf pos =
+   recv sock (fun ba ->
+-      let len = CCBigstring.size ba in
+-      CCBigstring.blit_to_bytes ba 0 buf pos len;
++      let len = Bigstring.size ba in
++      Bigstring.blit_to_bytes ba 0 buf pos len;
+       Lwt.return len
+     )
+ 
+ let recv_bytes sock =
+   recv sock (fun ba ->
+-      let len = CCBigstring.size ba in
++      let len = Bigstring.size ba in
+       let buf = Bytes.create len in
+-      CCBigstring.blit_to_bytes ba 0 buf 0 len;
++      Bigstring.blit_to_bytes ba 0 buf 0 len;
+       Lwt.return buf
+     )
+ 
+Index: onanomsg-1.0/lib/nanomsg_lwt.mli
+===================================================================
+--- onanomsg-1.0.orig/lib/nanomsg_lwt.mli
++++ onanomsg-1.0/lib/nanomsg_lwt.mli
+@@ -4,8 +4,8 @@ open Nanomsg
+ 
+ (** {2 Zero-copy I/O} *)
+ 
+-val send_bigstring : socket -> CCBigstring.t -> unit Lwt.t
+-val send_bigstring_buf : socket -> CCBigstring.t -> int -> int -> unit Lwt.t
++val send_bigstring : socket -> Bigstring.t -> unit Lwt.t
++val send_bigstring_buf : socket -> Bigstring.t -> int -> int -> unit Lwt.t
+ 
+ val send_string : socket -> string -> unit Lwt.t
+ val send_string_buf : socket -> string -> int -> int -> unit Lwt.t
+@@ -13,7 +13,7 @@ val send_string_buf : socket -> string -
+ val send_bytes : socket -> Bytes.t -> unit Lwt.t
+ val send_bytes_buf : socket -> Bytes.t -> int -> int -> unit Lwt.t
+ 
+-val recv : socket -> (CCBigstring.t -> 'a Lwt.t) -> 'a Lwt.t
++val recv : socket -> (Bigstring.t -> 'a Lwt.t) -> 'a Lwt.t
+ (** [recv sock f] applies [f] to the received message. The
+     argument of [f] gets unallocated after [f] returns, so make sure
+     [f] {b never} let a reference to its argument escape. *)
+Index: onanomsg-1.0/_tags
+===================================================================
+--- onanomsg-1.0.orig/_tags
++++ onanomsg-1.0/_tags
+@@ -4,7 +4,7 @@ true: debug, bin_annot, safe_string
+ <lwt>: include
+ <lib_test>: include
+ 
+-<lib/nanomsg*>: package(containers.bigarray), \
++<lib/nanomsg*>: package(bigstring), \
+ 		package(ctypes), \
+ 		package(ipaddr), \
+ 		package(ppx_deriving.std), \
+@@ -13,7 +13,7 @@ true: debug, bin_annot, safe_string
+ 
+ <lib/nanomsg_lwt.*>: package(lwt.unix), package(lwt.ppx)
+ 
+-<lib_test/*>: package(containers.bigarray), \
++<lib_test/*>: package(bigstring), \
+ 	      package(ctypes.foreign), \
+ 	      package(ipaddr), \
+ 	      package(lwt.unix), \
+@@ -21,7 +21,7 @@ true: debug, bin_annot, safe_string
+ 	      package(oUnit), \
+ 	      package(containers)
+ 
+-<examples/*>: package(containers.bigarray), \
++<examples/*>: package(bigstring), \
+ 	      package(ctypes.foreign), \
+ 	      package(ipaddr), \
+-	      package(containers)
+\ No newline at end of file
++	      package(containers)
+Index: onanomsg-1.0/pkg/META
+===================================================================
+--- onanomsg-1.0.orig/pkg/META
++++ onanomsg-1.0/pkg/META
+@@ -1,6 +1,6 @@
+ version = "1.0"
+ description = "Bindings to nanomsg"
+-requires = "ctypes.foreign ipaddr ppx_deriving.std containers containers.bigarray"
++requires = "ctypes.foreign ipaddr ppx_deriving.std containers bigstring"
+ archive(byte) = "nanomsg.cma"
+ archive(byte, plugin) = "nanomsg.cma"
+ archive(native) = "nanomsg.cmxa"
+@@ -15,4 +15,4 @@ package "lwt" (
+  archive(native) = "nanomsg_lwt.cmxa"
+  archive(native, plugin) = "nanomsg_lwt.cmxs"
+  exists_if = "nanomsg_lwt.cma"
+-)
+\ No newline at end of file
++)
diff --git a/dev-ml/onanomsg/onanomsg-1.0.ebuild b/dev-ml/onanomsg/onanomsg-1.0-r1.ebuild
index 902a0e6f6c38..38e22c1fbe07 100644
--- a/dev-ml/onanomsg/onanomsg-1.0.ebuild
+++ b/dev-ml/onanomsg/onanomsg-1.0-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=5
 
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="nanomsg bindings for OCaml"
 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/${PV}"
+SLOT="0/${PV}-bigstring"
 KEYWORDS="~amd64"
 IUSE="+lwt +ocamlopt test"
 
@@ -21,12 +21,18 @@ RDEPEND="
 	dev-ml/ocaml-ipaddr:=[ocamlopt?]
 	dev-ml/ppx_deriving:=[ocamlopt?]
 	dev-ml/ocaml-containers:=[ocamlopt?]
+	dev-ml/ocaml-bigstring:=
 	lwt? ( dev-ml/lwt:=[ocamlopt?] )
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit )
 "
 
+src_prepare() {
+	epatch "${FILESDIR}/bigstring.patch"
+	default
+}
+
 src_compile() {
 	ocaml pkg/build.ml \
 		native=$(usex ocamlopt true false) \
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 8cbf63afdd5b..1382e4ada545 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,6 +1,2 @@
 DIST qjackctl-0.3.10.tar.gz 487678 SHA256 5cdd937c44e5c737f3d2c2063ada015cac2fc8ed0cdbcb90d0ba747087270132 SHA512 1d7c310967cd112aad2caa79684b40b90070e5ce78fe2fd71f0a159ff835a8ccb4806dd140237c05d369ec782965472616aca67fc649cf1ba232535dc8b3104f WHIRLPOOL 7a6cb86992d4dafc0dc43bb8587285c0a2db64649c29fb9a4236f050f89ac9df4cd1d6b7083b980a6121bb508eb98da3b48b3d4eca96d655d75bf737e107f9ab
-DIST qjackctl-0.4.0.tar.gz 500534 SHA256 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a SHA512 dff5d6bd153cc92149e7a16820ab061f70090eca7a15f8f79ac7b9316e7c279f61e800cfbfc7ec4ce0a13721e717f9f18b98611c22c2a134830111c865d3d001 WHIRLPOOL ae607775d75825355d405b6b3e41ae25793b4a698735d847c9617e6af2eef8dd73cf4ed104e7941c1d014ebeb02d48d128cb363241898ab9ffcb5752ae59464e
-DIST qjackctl-0.4.1.tar.gz 824293 SHA256 98024e1ea9f55ac16c290feda051d6494b2261e83f6a918f0fa583b509e2bfd1 SHA512 99de2de422a82a1dbc26dd2d2548afd31a50dc650f2dbe177a26edfe3808a2f66a2206120535edaec8314f3ef25b2dfe6fadfdfb11b814ffe311185c68252881 WHIRLPOOL bfe04a75ba323fd2cf7c8e715ba9a0623bcaadcc47ad74f387aff381036c77d8fec269bfa341783e17a4580fda8f652fa30f52deeb61c857eed817588ab21367
-DIST qjackctl-0.4.2.tar.gz 824383 SHA256 cf1c4aff22f8410feba9122e447b1e28c8fa2c71b12cfc0551755d351f9eaf5e SHA512 743b8a02fb0b83a4516622aeec054d67f5cda6d8ffcc5727d3709695996c5e0054ba0af77919e43c0288fbb2259395c129d79f89b24bba6d4c0dd5cdbaa5712d WHIRLPOOL ba63c2b532b451df8d422ba6e7819082ea913964453b61f20bcbf11a5537e6f12b05dc0ee672badd84078fdf683ef8f265e883310818c1247a39ac734689eaf4
-DIST qjackctl-0.4.3.tar.gz 824852 SHA256 6bfdc3452f3c48d1ce40bd4164be0caa1c716474fbd3fb408d3308dfadf79e07 SHA512 e77e06164784d5a6027704beaf8bcb934495bf3a0c8e6487c0fbc7fc884cf824699a83b5e0f58a9e5ae5a810872c7d09de3d2c2addcbdb1cd67206415979a949 WHIRLPOOL ebf5ca4abc1ae7cf7bc0c52e842d7e9d468d9d19bb12fecacf551abe848d7834edc0a1de0c9d702401610978fe06c6d99547c88cafafe06d4da97673df1b6e8a
 DIST qjackctl-0.4.4.tar.gz 831637 SHA256 531db2f7eca654fd8769a1281dccb54ebca57a0b2a575734d1bafc3896a46ba5 SHA512 91005ad4dbbeaaab582de9d3ac7d125732720df9225129267a490254851217d739fa781ea5eaab8a4fa4ebb1d62eb323def88fb3f1723ca7e51e2bf4392026b6 WHIRLPOOL 560de5c4be04fafce2844e7ca6e9d4bd8e7f02c306f14675bb72fed49ec1b304d4035ba1c5a76ee8653fc691787bfbf62ae01e336bc238cc661b47c834beca67
diff --git a/media-sound/qjackctl/files/qjackctl-0.4.0-qobject-include.patch b/media-sound/qjackctl/files/qjackctl-0.4.0-qobject-include.patch
deleted file mode 100644
index 429b5b983d90..000000000000
--- a/media-sound/qjackctl/files/qjackctl-0.4.0-qobject-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru qjackctl-0.4.0/src/qjackctlPatchbayRack.h qjackctl-0.4.0-zx2c4/src/qjackctlPatchbayRack.h
---- qjackctl-0.4.0/src/qjackctlPatchbayRack.h	2015-07-15 15:30:36.801752820 +0200
-+++ qjackctl-0.4.0-zx2c4/src/qjackctlPatchbayRack.h	2015-08-28 10:53:45.711811995 +0200
-@@ -24,6 +24,7 @@
- 
- #include "qjackctlAbout.h"
- 
-+#include <QObject>
- #include <QStringList>
- 
- #include <jack/jack.h>
diff --git a/media-sound/qjackctl/qjackctl-0.4.0.ebuild b/media-sound/qjackctl/qjackctl-0.4.0.ebuild
deleted file mode 100644
index 72106ca33671..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio +qt5"
-
-RDEPEND="
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 )
-	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qobject-include.patch"
-}
-
-src_configure() {
-	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
-	econf \
-		$(use_with !qt5 qt4 $(qt4_get_bindir)) \
-		$(use_with qt5 qt5 $(qt5_get_bindir)) \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qjackctl/qjackctl-0.4.1-r2.ebuild b/media-sound/qjackctl/qjackctl-0.4.1-r2.ebuild
deleted file mode 100644
index d08a2dcaa1f2..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio +qt5"
-
-RDEPEND="
-	virtual/jack
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf \
-		$(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \
-		$(use_with qt5 qt5 "$(qt5_get_bindir)/..") \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qjackctl/qjackctl-0.4.2.ebuild b/media-sound/qjackctl/qjackctl-0.4.2.ebuild
deleted file mode 100644
index e8ee1b58b9c2..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio +qt5"
-
-RDEPEND="
-	virtual/jack
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
-	alsa? ( media-libs/alsa-lib )
-	dbus? (
-		qt5? ( dev-qt/qtdbus:5 )
-		!qt5? ( dev-qt/qtdbus:4 )
-	)
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf \
-		$(use_with !qt5 qt4 "$(qt4_get_bindir)/..") \
-		$(use_with qt5 qt5 "$(qt5_get_bindir)/..") \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	# Emulate what the Makefile does, so that we can get the correct
-	# compiler used.
-	if use qt5 ; then
-		eqmake5 ${PN}.pro -o ${PN}.mak
-	else
-		eqmake4 ${PN}.pro -o ${PN}.mak
-	fi
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild b/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild
deleted file mode 100644
index 2b39eb099165..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="http://qjackctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--with-qt5="$(qt5_get_bindir)/.." \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
index 7e07b91695d5..17a0a497f317 100644
--- a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
+	append-cxxflags '-std=c++11'
 	export PATH="$(qt5_get_bindir):${PATH}"
 	econf --enable-qt5
 }
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index b669c5c61f5e..fae669b937c6 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,3 +1,4 @@
 DIST qsampler-0.4.0.tar.gz 243065 SHA256 4f45e80dca00593ad7d9703125e300f98a6f4dce5216985b07f26f3f76ba80e4 SHA512 42c235396cf68bd811fa251fd6f112a835ce1769130823163fa1a0e517431922b941aa56bc88f22890e6d6326b38765a2f3ced8e67a78d3420600f85e827d467 WHIRLPOOL 330769bd6615ec9a909914e1f3559f5999bbfa9e3d9de85432c12656459e5956a2ea547737b7ef72d8545d2b91da710289ce83e2cff6a9fdd5aee28a5e208818
 DIST qsampler-0.4.1.tar.gz 243377 SHA256 2e2315b8b4c1c33512618a2a3c0d6dfdb5ee10914cc9eac5deb2f5c0d9bcb08d SHA512 ffa6e2feb11f9a96580fb1803b6ddb5c56ae475c1f04b5bfa94b1403c29ed0e14f8f60e9166ca166d5b478184c37337b0de0e098a54f74a90f951260d070ce14 WHIRLPOOL b4cfed615681d621b100b0f22525fbdedda8b5907888b16660959e324cbb7c91941c123bf7dc04625f7fdf50ca064a88513bc47dad1052a7b9778c2464e631ba
 DIST qsampler-0.4.2.tar.gz 244794 SHA256 b5b4193dc2ef3b4947fb43aa82b28aca056f0babfe0d0b1a94f65d63d11dd5c9 SHA512 edebbc801e177cce44aa4e8cdc9db9e9e5c6cb35b75f33c4c15cae5920fa869053748075179c3b4d68956e30b05e5c94513419af567e60f27ca222f77fa41f30 WHIRLPOOL 945bee93f9a3dd5f5953dd28a3356bb9bacf6479a4afb8a1a8c7e66f5b7ce18e673cb6a58cf21dc64eae88a69c9b8b8948fa76c3fb026407d6903bd8333b38b2
+DIST qsampler-0.4.3.tar.gz 246314 SHA256 d1857eed701f6a58be2c5d2cce318b58fcf467daca5d9b6646fefb270448e1f1 SHA512 015b747bd7c796341c6516fec68dd3b12725f461f7e5e3898b24862af556d69d67d73354f0aaf3bfbca069ebe67de34121350dcd3ee8161ec12e6bae80227fb9 WHIRLPOOL 81d66f658a45fbf7c44bc3024bae6c744008426b39a3c6f9c247cebaf35098418921e32343f6c757e51a65bea0fe49427ab92882604d3a09c5992ccf6266b9f8
diff --git a/media-sound/qsampler/qsampler-0.4.3.ebuild b/media-sound/qsampler/qsampler-0.4.3.ebuild
new file mode 100644
index 000000000000..6eebb29abc59
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://qsampler.sourceforge.net http://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+DEPEND="${DEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf $(use_enable debug) \
+		$(use_enable libgig) \
+		--disable-qt4
+	cd "${S}/src"
+	eqmake5 src.pro -o Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
+	doman ${PN}.1
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 5d86c4d910d9..94be024b89f8 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,3 +1,4 @@
 DIST qsynth-0.3.9.tar.gz 255130 SHA256 eb2050d0f7a8011b9ac20f82fec88faf2237a2475dfefc424cb4944399b17e22 SHA512 7702dc9eb3d38d338dcab5587e02e9fcdaffbe6188437e3b0f54b07499553f7a7d083f233cd21963a908578108f82c0d904b68da2f156ca0ab489e989b5787a8 WHIRLPOOL 621b53fbf251e4b35dcdefb6b63e6ed124fc12dccad6148f077914bd25931cc8ea10a8dfb959b5ad4ae8a451686c63dedeb060b8a68d7a3d6e72e2d5c437104a
 DIST qsynth-0.4.2.tar.gz 252394 SHA256 25a59769e20a5af971f197f4be7233cedbbfa7c7a7ee54c9f49b6b4a8e4ef8f2 SHA512 d951969b6a4ea185b9c732867559000e91e73b69fcd19974d406516ce79c0040b598ee578cc10aa2ed199f652535e061fe8178c8b37651438e605a0bc3ee674e WHIRLPOOL a95a7ec9ecac41962e9b81dfa10f18df962ad3a6046fccf5b7073a17f05802568bacc37252b4fbb05c41a038fcf3047d57eb178a8a524f5e5a3019ec47f3deb7
 DIST qsynth-0.4.3.tar.gz 258870 SHA256 de27097a6e5e68799e0ab72641682b3c8f3d7bc404d2ba38e2ca66e952aab0c8 SHA512 940a664e279890a0a5eaa557376fc10b60c13527ac813be8c3c6b29d04adf8b4c447846a7032c1f37ce6b8213093a7c1891fa7649371edb3cabc7142784b6782 WHIRLPOOL ddc3eb52421d1785551ffe80bea05cef86880192a20e9de20e61719e31ca2eb79503753551bfcf0ee53fd527fca5750e3f0872bf50439ea7bc70d8602150f910
+DIST qsynth-0.4.4.tar.gz 260482 SHA256 0ef914447b1f3a3ecd9c38101f06fc9c67e1d8367202a3f7a494f5d167b40e62 SHA512 8995881ab992b8d02f83797093d406391327a362d0c331d0c8e023e1695baff5acb589be08427a25563f159067a8965c89be114ce74583db98e5a816f73aa9f0 WHIRLPOOL aea2556c5b142923d047d8a09c8534d534aa10bae9ef5c04778976e0adc1a7207c66b87d6711ec30616c7b33c5d1a9b844afee1fa59973e0fde45ae239a4a65d
diff --git a/media-sound/qsynth/qsynth-0.4.4.ebuild b/media-sound/qsynth/qsynth-0.4.4.ebuild
new file mode 100644
index 000000000000..bafc0a80dd0a
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.4.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/ros-meta/desktop/Manifest b/ros-meta/desktop/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/desktop/Manifest
+++ b/ros-meta/desktop/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/desktop/desktop-1.3.1.ebuild b/ros-meta/desktop/desktop-1.3.1.ebuild
new file mode 100644
index 000000000000..57ee10fc02b5
--- /dev/null
+++ b/ros-meta/desktop/desktop-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for a basic ROS desktop install"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/robot
+	ros-meta/viz
+	dev-ros/roslint
+	ros-meta/visualization_tutorials
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop/desktop-9999.ebuild b/ros-meta/desktop/desktop-9999.ebuild
index 6ca330e23b94..57ee10fc02b5 100644
--- a/ros-meta/desktop/desktop-9999.ebuild
+++ b/ros-meta/desktop/desktop-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
 
 EAPI=5
@@ -18,7 +18,6 @@ RDEPEND="
 	ros-meta/robot
 	ros-meta/viz
 	dev-ros/roslint
-	dev-ros/urdf_tutorial
 	ros-meta/visualization_tutorials
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/Manifest b/ros-meta/desktop_full/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/desktop_full/Manifest
+++ b/ros-meta/desktop_full/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/desktop_full/desktop_full-1.3.1.ebuild b/ros-meta/desktop_full/desktop_full-1.3.1.ebuild
new file mode 100644
index 000000000000..5d7cc244f8fe
--- /dev/null
+++ b/ros-meta/desktop_full/desktop_full-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for ROS complete desktop install"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/desktop
+	ros-meta/perception
+	ros-meta/simulators
+	dev-ros/urdf_tutorial
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/desktop_full/desktop_full-9999.ebuild b/ros-meta/desktop_full/desktop_full-9999.ebuild
index 0958a0238dc7..5d7cc244f8fe 100644
--- a/ros-meta/desktop_full/desktop_full-9999.ebuild
+++ b/ros-meta/desktop_full/desktop_full-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
 
 EAPI=5
@@ -18,5 +18,6 @@ RDEPEND="
 	ros-meta/desktop
 	ros-meta/perception
 	ros-meta/simulators
+	dev-ros/urdf_tutorial
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/perception/Manifest b/ros-meta/perception/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/perception/Manifest
+++ b/ros-meta/perception/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/perception/perception-1.3.1.ebuild b/ros-meta/perception/perception-1.3.1.ebuild
new file mode 100644
index 000000000000..79538b393c6c
--- /dev/null
+++ b/ros-meta/perception/perception-1.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for ROS perception stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/ros_base
+	ros-meta/image_common
+	ros-meta/image_pipeline
+	ros-meta/image_transport_plugins
+	ros-meta/laser_pipeline
+	ros-meta/perception_pcl
+	ros-meta/vision_opencv
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/robot/Manifest b/ros-meta/robot/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/robot/Manifest
+++ b/ros-meta/robot/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/robot/robot-1.3.1.ebuild b/ros-meta/robot/robot-1.3.1.ebuild
new file mode 100644
index 000000000000..eb8af7a172af
--- /dev/null
+++ b/ros-meta/robot/robot-1.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage which extends ros_base and includes ROS libaries for any robot hardware"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/ros_base
+	dev-ros/control_msgs
+	ros-meta/diagnostics
+	dev-ros/filters
+	ros-meta/geometry
+	ros-meta/robot_model
+	dev-ros/robot_state_publisher
+	dev-ros/xacro
+	ros-meta/executive_smach
+	dev-ros/actionlib
+	ros-meta/bond_core
+	dev-ros/class_loader
+	dev-ros/dynamic_reconfigure
+	ros-meta/common_tutorials
+	ros-meta/nodelet_core
+	dev-ros/pluginlib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_base/Manifest b/ros-meta/ros_base/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/ros_base/Manifest
+++ b/ros-meta/ros_base/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/ros_base/ros_base-1.3.1.ebuild b/ros-meta/ros_base/ros_base-1.3.1.ebuild
new file mode 100644
index 000000000000..daf30c8a83fb
--- /dev/null
+++ b/ros-meta/ros_base/ros_base-1.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage which extends ros_core and includes other basic non-robot tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib
+	ros-meta/bond_core
+	dev-ros/class_loader
+	dev-ros/dynamic_reconfigure
+	ros-meta/common_tutorials
+	ros-meta/nodelet_core
+	dev-ros/pluginlib
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/ros_core/Manifest b/ros-meta/ros_core/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/ros_core/Manifest
+++ b/ros-meta/ros_core/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/ros_core/ros_core-1.3.1.ebuild b/ros-meta/ros_core/ros_core-1.3.1.ebuild
new file mode 100644
index 000000000000..aea8dc9115a1
--- /dev/null
+++ b/ros-meta/ros_core/ros_core-1.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage to aggregate the packages required to use core ROS concepts"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-util/catkin
+	dev-ros/cmake_modules
+	ros-meta/common_msgs
+	dev-ros/gencpp
+	dev-ros/geneus
+	dev-ros/genlisp
+	dev-ros/genpy
+	dev-ros/gennodejs
+	dev-ros/genmsg
+	dev-ros/message_generation
+	dev-ros/message_runtime
+	ros-meta/ros
+	ros-meta/ros_comm
+	dev-ros/rosconsole_bridge
+	ros-meta/roscpp_core
+	dev-ros/rosgraph_msgs
+	dev-ros/rospack
+	dev-ros/std_msgs
+	dev-ros/std_srvs
+	ros-meta/ros_tutorials
+	dev-ros/roslisp
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/simulators/Manifest b/ros-meta/simulators/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/simulators/Manifest
+++ b/ros-meta/simulators/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/simulators/simulators-1.3.1.ebuild b/ros-meta/simulators/simulators-1.3.1.ebuild
new file mode 100644
index 000000000000..3f32b3bffea3
--- /dev/null
+++ b/ros-meta/simulators/simulators-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for ROS simulation packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/robot
+	ros-meta/gazebo_ros_pkgs
+	ros-meta/rqt_common_plugins
+	ros-meta/rqt_robot_plugins
+	dev-ros/stage_ros
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/viz/Manifest b/ros-meta/viz/Manifest
index 6b600216a5db..87d1b1dd6780 100644
--- a/ros-meta/viz/Manifest
+++ b/ros-meta/viz/Manifest
@@ -1,2 +1,3 @@
 DIST metapackages-1.2.0.tar.gz 1803 SHA256 02360aefee1a3ec8506cb475be00a053827d422fed26d123764b4d6b18b0a5c5 SHA512 a004a1323c93e191b98a4fe665409fb57396fb06c19e9205817f2467e171bfba10a86713978e13739632e04f148b476e582c6f1fd3c859b4936980923f204e80 WHIRLPOOL 1bb4a73678613dd6fe6b0d1225b3fd967fbb476e5736949846f3297febf727f41c9d3e71565b13dcc90d36d57a6cf012a3cdad509ed4364bb87de7e372c69a79
 DIST metapackages-1.3.0.tar.gz 1813 SHA256 7cf9e193e22493ad11e2352188808500e3900b5de72660bfc9516d58aa51ec85 SHA512 290bbe4aafa9f720ebcfda7a346750fa20c5adb077e10374f9c7cebf5acb2a279f864ad1a51cf8a1a75a7d371844f8a48b62d7ac69761870c1ea1b7db0199c12 WHIRLPOOL 6f0aa0391437d59a13fba6de378216630a087ac5a6dcd259ef9f81a524b118d2d688afed947342a2ae8af01dd58e0237e36897a7b5608389d43e749a005da34e
+DIST metapackages-1.3.1.tar.gz 1813 SHA256 dbea7e7f34f9334c9ef94d415e5f5230942423aae9810032d054e883963d9c76 SHA512 4a6cbc288f3e15632a3c8ab7e2375d59ce2f20f17aa89471919584b6c856aabe9cd661297806ceaefcfc2eabe3110a8a0aa30308daf75f8c36e1462b7bc409c1 WHIRLPOOL e927ee221b5d792166eb8b984499338b64dc2738a3ce598d5d8173d2981d92b45a153c333dec9cbd854f535bb41934135fdfc5578d82954f27730f9183298a0a
diff --git a/ros-meta/viz/viz-1.3.1.ebuild b/ros-meta/viz/viz-1.3.1.ebuild
new file mode 100644
index 000000000000..02d5fff22972
--- /dev/null
+++ b/ros-meta/viz/viz-1.3.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/metapackages"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for ROS visualization packages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	ros-meta/ros_base
+	ros-meta/rqt_common_plugins
+	ros-meta/rqt_robot_plugins
+	dev-ros/rviz
+"
+DEPEND="${RDEPEND}"