summaryrefslogtreecommitdiff
path: root/dev-ros/rosconsole
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
commitf70601e0934acd62f6c5d06c5ede4cc607179514 (patch)
tree0b337390375de04b950fc4b45edc0f895a4701a4 /dev-ros/rosconsole
parentb2be182d49eea46686b5cf2680d457df61e89dc4 (diff)
gentoo resync : 07.07.2018
Diffstat (limited to 'dev-ros/rosconsole')
-rw-r--r--dev-ros/rosconsole/Manifest23
-rw-r--r--dev-ros/rosconsole/files/vector.patch20
-rw-r--r--dev-ros/rosconsole/metadata.xml2
-rw-r--r--dev-ros/rosconsole/rosconsole-1.12.5.ebuild39
-rw-r--r--dev-ros/rosconsole/rosconsole-1.12.6.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.12.7.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.13.1.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.13.2.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.13.4.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.13.5.ebuild38
-rw-r--r--dev-ros/rosconsole/rosconsole-1.13.7.ebuild (renamed from dev-ros/rosconsole/rosconsole-1.13.0.ebuild)5
-rw-r--r--dev-ros/rosconsole/rosconsole-9999.ebuild5
12 files changed, 9 insertions, 313 deletions
diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest
index b152e327f363..1b27df3fb126 100644
--- a/dev-ros/rosconsole/Manifest
+++ b/dev-ros/rosconsole/Manifest
@@ -1,21 +1,6 @@
-AUX vector.patch 700 BLAKE2B 0626f486c3263814c9cd9c93e7ddc29e97a83272c96d38eb695275b06562d18fc465d5dcf1bc9a0490309a6a02f7773d36a1fd9b1a0d11414a8adf35b04aa7c5 SHA512 ff774a57bc350939a92ffab36446e8c2a0561e1b133007a794e6144ddeefbb30418876d2ed790ddbfef397093558313d43fecce33274345f7bdebe63a0e2ec52
-DIST ros_comm-1.12.5.tar.gz 966478 BLAKE2B b421902b99ffff0bf8aa19397353f5ab66b23861d09ef13c266504bca04776c99e6f47a780b521627fcf5be016b67fcfc688196ac6f34187410887782befc148 SHA512 0d97eac0b0cf200a1e217597176d55c82249e2e7b9f3c4706dce84068a65c6642e099fb16c69d33b62d6c780d2c2775b7330fb497bc936f9d4bc73a2b5ba12ca
-DIST ros_comm-1.12.6.tar.gz 967763 BLAKE2B 43bb71fa1c98d741acbd355a349584ea42c629fd987b3eb492edacceba75a67596d27eca311453ac0865e68e0d441f50568f028f7c7a5744e26390083e3aefc3 SHA512 1987c6362ae0c7c019a226223c73a7aefdc14a3fc66469ab6cdf9c41e9efdf4d7b7d4932af2a52f2082d716342a307b2e415c0ab45f77dfd9a7c1e4274deab5c
-DIST ros_comm-1.12.7.tar.gz 974568 BLAKE2B 8c3ece3a200de84fc9557468de87dddad145f3412655fe082a4efa3a0701c98646d098c72f3da0cf5cbbd901c52e70d0dc19c19485f11f564eeb2c089615a949 SHA512 7cfc5bf231e8e388102f192d46bd902a2b92d4620938379b362efd250c48f317f5ba6e0aee7398c841392f56c2b79f933ad5ec60eb69492add90fa2ca86a3a8f
-DIST ros_comm-1.13.0.tar.gz 974811 BLAKE2B 7fb00bd6fb270aea945cd68ed6a8e372eef0f21a5ab570bef79afff3dc09777c0221c96d5789a14bc58e5130bc1d2fb38c38d260ef70b9b72381b4657ddcde7f SHA512 8cd0f8cb40d51293946a87da0614921150aa87d168e0d38981f0b7eef3c0f514f14ff613efd192c9c898b3a90fedd0cba21a9f337a197377fd946f427369c60b
-DIST ros_comm-1.13.1.tar.gz 1005522 BLAKE2B 5c459893ed362b80facf6e57d12ebfacf1acd5d6e51c266deacf439c78ce7059e34d669e676fd73b8b3f641b3b8ec24500b7a91733d1f4a3a93c5dc911c4fd87 SHA512 92248a91d7b7b6defd8607d70e5a09c43c9bc242cfc5574acd5b08c3f9b765144c848c0f72551bb2e19789a345c31f43ed420a9e3e7fbe38bf47adeb7c52a9d7
-DIST ros_comm-1.13.2.tar.gz 1007451 BLAKE2B 8963267f7cbe625a1160c3d8bdf34dd9c0b1102612632d8c7af7ac32aba507adb116eb3d33353b6302072fcac6ab312e095b4fdc023ecbe5d6591a2912b6aa82 SHA512 eac7ee469bbdb622bc69e5239dea7e7dc97bec7b7e51a8ee49f18756cba753387e884ccd651e201e01985d23f908828c7ae94c311889557caeb742ddcad2e1b9
-DIST ros_comm-1.13.4.tar.gz 1013412 BLAKE2B 0f5a33ae9c5c3bd3c04e26903c4ee7dff2d30f896fbca620100b9db58e8a338cbe79a9305dedb9e8d6f4a9c13b823e5016178db228bb2661eadb6864e20fad40 SHA512 6057afa5b79da661ecdc60459462fe09a7a90b5e43cbf6c5bdfa4095f07e00356eb13c9cab460b91a0c84b789ccf0753c09666ad24fb4b3aec967cb407cf81ce
-DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
-EBUILD rosconsole-1.12.5.ebuild 828 BLAKE2B e29a3a389028d513a848fa8775e5af5f917998c4aa0f6f0d102bed4f082d5a83a55722de1f6e98a350d04adb290f8fd71b12a8e8bc90a6b946d804a95eefbc9a SHA512 fb28469ec9ea38e830b9390be614f30c90d2bbf0cde0339d7f326e008179a73b5f814dccc5a086fa91f9541844e4b330eb330667064fae846af71ca60949e50a
-EBUILD rosconsole-1.12.6.ebuild 789 BLAKE2B 93b8b8384a5f5f89fd5e5ad0d19b1708e344853f52e1a19b0777628971bd3fd07f6b746ad45c135519c6493baecaddd5ab2f47f997a0219e6da3320c9ad6a13d SHA512 21261df402cda22d8f94a7a377348def3995625be6ef1935bbc9af3d858660b453ed798525a8bc0c7b5b33bbc8842b8ba722a2e84cff148f1ba9378585372ede
-EBUILD rosconsole-1.12.7.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
-EBUILD rosconsole-1.13.0.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
-EBUILD rosconsole-1.13.1.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
-EBUILD rosconsole-1.13.2.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
-EBUILD rosconsole-1.13.4.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
-EBUILD rosconsole-1.13.5.ebuild 789 BLAKE2B 9fcccb20b80b62ff402e3792e04cbcb53ea15b41fb4415ae6cc4b4c4f9f0e0efc421c2d43f72d0d1ff99a45404e61ec9b2325a6a451e33b69985b1366188b8ab SHA512 9dcaa45739e2aa5c65e1a4929019577c7fe16f34da326df87f68f243df4a67654f6b6db4c5320e271f4ca08c09d01ac5799a462398325397a3c89ada9e7e060b
+DIST rosconsole-1.13.7.tar.gz 24202 BLAKE2B bee6d4a9a682fe045a233989373e8a283c26d85bd4d746c2363798cd61f168e368afef81872437363b55a44080e6c926b4f3fd9c66fa9e2bf078454a675336ea SHA512 e0e17641011de5a3b58ddc7ac984042463f375f76174ff6bfa8a6c95d7889e33e702156f7ec0d7628f9f37a1d062f0291367ee81025dd9989320d5d24c35b387
EBUILD rosconsole-1.13.6.ebuild 789 BLAKE2B f7e1468717fd6c8cf1829fcdc53838807478f0a3c3d3dcbd465e6d73aadb31aa5c48d7137cb29cdf2b6b91d8194a6ffab1c3fef094547290ad4270e4a7c12425 SHA512 0979b156f8a4a0458064a0cf9c92d01603a455d4f56d863603bcb863ec7c81aea317dbc71c6cfb64b02e16d6369e3ca635ab20deeaaa924bc835a5915a129fa0
-EBUILD rosconsole-9999.ebuild 789 BLAKE2B c748512aa3000741ebf9a4e65b96b773fa11837f786618eff4aeb78f0b68277950ba2659b67fe5907550f46fbf513647129062d0387ef6586589543b100a0754 SHA512 cc63348b5f297e2ac0a808ca9345dd008f19bfabb66187b34014e8f7f9bf328d4c4e12f61cc3bb18c23b8295aaf7236819992944a1d9d130c184d4e677931b12
-MISC metadata.xml 506 BLAKE2B 8f06ce63dfe5a9efb05feb0fb939e33131413252a5d441719383a83219f0637bd9c2d2c1ee2c94b3a3bcb1ea34cc573f6e010935c69c547d9a3269ee23b0fb74 SHA512 84b404de2f1df9eba8d51450637b11e19d7ffb6d55133ce44a643b39b939437ef7228ac7369923ffd84317fc3690e8179a9fda438e94683eda63b13f8dd9d165
+EBUILD rosconsole-1.13.7.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
+EBUILD rosconsole-9999.ebuild 768 BLAKE2B 37be9672eca809f1d87e07f24ecf6b304e9319fa2b02dc55a65566f852fa3886673a99a2fb4996d898554876383e5e62e4d51aed618a4c58a1fab9d0b0a6b816 SHA512 cf432c484a52e4b4c59a01cf4a1f6b0cd76dab279cf8d616c1a32eb752c827b8167362e7656a0194e9494f8b3922f5692115d8f6ed1d9b93202fa008a70991e3
+MISC metadata.xml 508 BLAKE2B 5641aa17bb1302f29cbbe3015007bcbff004d8681223ab9140296209f1ea7995340b3a21890dcaacb3f15020b3431660bf1124fdccc5697bd9222f6b7ebf2d76 SHA512 cc34b9588999d9e10ee8537f509b7ae72b100e477b9f545fad31043eabf0a9f27913b608e4d198ca4b99d5fc1643332fe28ea065181fb3a195472a6726c272a2
diff --git a/dev-ros/rosconsole/files/vector.patch b/dev-ros/rosconsole/files/vector.patch
deleted file mode 100644
index 0b62a883089b..000000000000
--- a/dev-ros/rosconsole/files/vector.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 74674c49a64abbdcdd5aeea016997af2959c6f05
-Author: Hodorgasm <nsane457@gmail.com>
-Date: Mon Oct 3 20:32:20 2016 -0400
-
- Add '#Include <vector>' to fix building on GCC-6
-
- Don't rely on transitive header inclusion to declare std::vector as building with GCC-6 fails due to no '#Include <vector>' statement.
-
-diff --git a/tools/rosconsole/include/ros/console.h b/tools/rosconsole/include/ros/console.h
-index 4d2a86b..28901d7 100644
---- a/tools/rosconsole/include/ros/console.h
-+++ b/tools/rosconsole/include/ros/console.h
-@@ -40,6 +40,7 @@
- #include <cstdarg>
- #include <ros/macros.h>
- #include <map>
-+#include <vector>
-
- #ifdef ROSCONSOLE_BACKEND_LOG4CXX
- #include "log4cxx/level.h"
diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
index 58fa95f0d2b4..e28dbe6cf442 100644
--- a/dev-ros/rosconsole/metadata.xml
+++ b/dev-ros/rosconsole/metadata.xml
@@ -10,6 +10,6 @@
<flag name="log4cxx">Use <pkg>dev-libs/log4cxx</pkg> as log backend.</flag>
</use>
<upstream>
- <remote-id type="github">ros/ros_comm</remote-id>
+ <remote-id type="github">ros/rosconsole</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild b/dev-ros/rosconsole/rosconsole-1.12.5.ebuild
deleted file mode 100644
index b5e961658c14..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.12.5.ebuild
+++ /dev/null
@@ -1,39 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/vector.patch" )
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.12.6.ebuild b/dev-ros/rosconsole/rosconsole-1.12.6.ebuild
deleted file mode 100644
index 4453728bd320..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.12.6.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.12.7.ebuild b/dev-ros/rosconsole/rosconsole-1.12.7.ebuild
deleted file mode 100644
index f6a79d44be2f..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.12.7.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.1.ebuild b/dev-ros/rosconsole/rosconsole-1.13.1.ebuild
deleted file mode 100644
index f6a79d44be2f..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.1.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.2.ebuild b/dev-ros/rosconsole/rosconsole-1.13.2.ebuild
deleted file mode 100644
index f6a79d44be2f..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.2.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.4.ebuild b/dev-ros/rosconsole/rosconsole-1.13.4.ebuild
deleted file mode 100644
index f6a79d44be2f..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.4.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.5.ebuild b/dev-ros/rosconsole/rosconsole-1.13.5.ebuild
deleted file mode 100644
index f6a79d44be2f..000000000000
--- a/dev-ros/rosconsole/rosconsole-1.13.5.ebuild
+++ /dev/null
@@ -1,38 +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_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS console output library"
-LICENSE="BSD"
-SLOT="0"
-IUSE="+log4cxx glog"
-
-RDEPEND="
- dev-ros/cpp_common
- dev-ros/rostime
- dev-ros/rosunit
- dev-libs/boost:=[threads]
- log4cxx? ( dev-libs/log4cxx )
- !log4cxx? ( glog? ( dev-cpp/glog ) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local ROSCONSOLE_BACKEND=""
- if use log4cxx; then
- ROSCONSOLE_BACKEND="log4cxx"
- elif use glog; then
- ROSCONSOLE_BACKEND="glog"
- else
- ROSCONSOLE_BACKEND="print"
- fi
- local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" )
- ros-catkin_src_configure
-}
diff --git a/dev-ros/rosconsole/rosconsole-1.13.0.ebuild b/dev-ros/rosconsole/rosconsole-1.13.7.ebuild
index f6a79d44be2f..184a614f8a0c 100644
--- a/dev-ros/rosconsole/rosconsole-1.13.0.ebuild
+++ b/dev-ros/rosconsole/rosconsole-1.13.7.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_comm"
+ROS_REPO_URI="https://github.com/ros/rosconsole"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
inherit ros-catkin
diff --git a/dev-ros/rosconsole/rosconsole-9999.ebuild b/dev-ros/rosconsole/rosconsole-9999.ebuild
index cdd4d121a1ce..184a614f8a0c 100644
--- a/dev-ros/rosconsole/rosconsole-9999.ebuild
+++ b/dev-ros/rosconsole/rosconsole-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-ROS_REPO_URI="https://github.com/ros/ros_comm"
+ROS_REPO_URI="https://github.com/ros/rosconsole"
KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
inherit ros-catkin