diff --git a/dev-ros/rosbash/Manifest b/dev-ros/rosbash/Manifest
index ee298b0cdfacf..ed42a1f8b9848 100644
--- a/dev-ros/rosbash/Manifest
+++ b/dev-ros/rosbash/Manifest
@@ -1,8 +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/rosbash/files/catkin_prefix.patch b/dev-ros/rosbash/files/catkin_prefix.patch
deleted file mode 100644
index fce54f5488561..0000000000000
--- a/dev-ros/rosbash/files/catkin_prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rosbash/scripts/rosrun
-===================================================================
---- rosbash.orig/scripts/rosrun
-+++ rosbash/scripts/rosrun
-@@ -47,7 +47,7 @@ case $2 in
-     ;;
- esac
- 
--if [[ -n $CMAKE_PREFIX_PATH ]]; then
-+if [[ -n $CMAKE_PREFIX_PATH || -n $CATKIN_PREFIX_PATH ]]; then
-   catkin_package_libexec_dir=`catkin_find --without-underlays --libexec --share $1 2> /dev/null`
-   debug "Looking in catkin libexec dir: $catkin_package_libexec_dir"
- fi
diff --git a/dev-ros/rosbash/rosbash-1.12.3.ebuild b/dev-ros/rosbash/rosbash-1.12.3.ebuild
deleted file mode 100644
index dd7c7206ed25c..0000000000000
--- a/dev-ros/rosbash/rosbash-1.12.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix.patch" )
diff --git a/dev-ros/rosbash/rosbash-1.12.5.ebuild b/dev-ros/rosbash/rosbash-1.12.5.ebuild
deleted file mode 100644
index f77828f9bf963..0000000000000
--- a/dev-ros/rosbash/rosbash-1.12.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-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/rosbash/rosbash-1.13.1.ebuild b/dev-ros/rosbash/rosbash-1.13.1.ebuild
deleted file mode 100644
index f77828f9bf963..0000000000000
--- a/dev-ros/rosbash/rosbash-1.13.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-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/rosbash/rosbash-1.13.2.ebuild b/dev-ros/rosbash/rosbash-1.13.2.ebuild
deleted file mode 100644
index 74eaa336277eb..0000000000000
--- a/dev-ros/rosbash/rosbash-1.13.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-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/rosbash/rosbash-1.13.3.ebuild b/dev-ros/rosbash/rosbash-1.13.3.ebuild
deleted file mode 100644
index 74eaa336277eb..0000000000000
--- a/dev-ros/rosbash/rosbash-1.13.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-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/rosbash/rosbash-1.13.4.ebuild b/dev-ros/rosbash/rosbash-1.13.4.ebuild
deleted file mode 100644
index 74eaa336277eb..0000000000000
--- a/dev-ros/rosbash/rosbash-1.13.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-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/rosbash/rosbash-1.13.5.ebuild b/dev-ros/rosbash/rosbash-1.13.5.ebuild
deleted file mode 100644
index 50dcfac83ec68..0000000000000
--- a/dev-ros/rosbash/rosbash-1.13.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/ros"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted shell commands for using ros with bash"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/catkin_prefix2.patch" )