gentoo resync : 30.12.2017

8 files changed, 39 insertions, 119 deletions

diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 354abab603b3..b2c594f5dd91 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,12 +1,5 @@
-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
+AUX logging.patch 1413 BLAKE2B a483c85345e4ce5f0a05b144fd1b7372336b9c1b662adc97f8523ff35a511c4dac79ea3e2007b25d08f14e8a72215c9210c8d10a3d995bd553efd119c557b857 SHA512 9416943424d475d1a1598ead2f0886e71da3b66d0e49a0b88b00443808579d441a21c892ad4f0eb8acc6e334973976e543942504a9d7cd96f465ed278e1c2a0a
 DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c3980ebf97241910123abd430a48ae0636a6ddfb6c191bea2905454644c7ec340e26049d8faddca39783bef13d60b SHA512 91af2de897851061eda140d6c96ec88171f1fd1cd7549b6df1ac570e066603c7bb721a58cb19487657387753433d67ad22421408a237d1ffb5ea580c0cf3eeb3
-EBUILD rosbag_storage-1.13.0.ebuild 534 BLAKE2B d42f38ddb49f5d796ed949ca6903c327893c09a72e34dab73e0836f5b5ff3f3cbbaa239c92faf5d788fd80aa60511b943294d3a724f05c358a16c9b53176e2a4 SHA512 a9d16d3774e1e139469ba675e7880b7e456c15049807904cf091be98eb0542532487e2ddeb3496beab78c3a2ccd55fba66454625187b71873381f44caeb60f60
-EBUILD rosbag_storage-1.13.1.ebuild 534 BLAKE2B d42f38ddb49f5d796ed949ca6903c327893c09a72e34dab73e0836f5b5ff3f3cbbaa239c92faf5d788fd80aa60511b943294d3a724f05c358a16c9b53176e2a4 SHA512 a9d16d3774e1e139469ba675e7880b7e456c15049807904cf091be98eb0542532487e2ddeb3496beab78c3a2ccd55fba66454625187b71873381f44caeb60f60
-EBUILD rosbag_storage-1.13.2.ebuild 534 BLAKE2B d42f38ddb49f5d796ed949ca6903c327893c09a72e34dab73e0836f5b5ff3f3cbbaa239c92faf5d788fd80aa60511b943294d3a724f05c358a16c9b53176e2a4 SHA512 a9d16d3774e1e139469ba675e7880b7e456c15049807904cf091be98eb0542532487e2ddeb3496beab78c3a2ccd55fba66454625187b71873381f44caeb60f60
-EBUILD rosbag_storage-1.13.4.ebuild 534 BLAKE2B d42f38ddb49f5d796ed949ca6903c327893c09a72e34dab73e0836f5b5ff3f3cbbaa239c92faf5d788fd80aa60511b943294d3a724f05c358a16c9b53176e2a4 SHA512 a9d16d3774e1e139469ba675e7880b7e456c15049807904cf091be98eb0542532487e2ddeb3496beab78c3a2ccd55fba66454625187b71873381f44caeb60f60
-EBUILD rosbag_storage-1.13.5.ebuild 534 BLAKE2B d42f38ddb49f5d796ed949ca6903c327893c09a72e34dab73e0836f5b5ff3f3cbbaa239c92faf5d788fd80aa60511b943294d3a724f05c358a16c9b53176e2a4 SHA512 a9d16d3774e1e139469ba675e7880b7e456c15049807904cf091be98eb0542532487e2ddeb3496beab78c3a2ccd55fba66454625187b71873381f44caeb60f60
-EBUILD rosbag_storage-9999.ebuild 534 BLAKE2B 16cd2dd566c08189cf046b28d4f22dc930603a6d0cd87faee525c70cbb26df6e75203ba9c6307d840bc8bd96fd990d1951ff41e6629d333bdf933f77c6fd8e06 SHA512 e221ab040e377a24f3af60e473fc7555fc29ff4f28ad47fd549f060bd857d4b9e2a06f0d5f0860314c2e7ac391726d9fadb8e2453080ca75f1fcab23151d8110
+EBUILD rosbag_storage-1.13.5-r1.ebuild 601 BLAKE2B daacb65932d99179656da5421499edfb4220da7af7a36db1df5c2c92e482bec2797c26c4099b59590c5e067ecf272b8196cb38e02f2e903006b1ccd98ff6b00c SHA512 90346da2e41f9a8872fade4baf35337a898cdd0016180d428674545d7c203950fa242646bc043707908ec0dbd18843dca7ce4008a6cb0597ae2116e087dea99c
+EBUILD rosbag_storage-9999.ebuild 561 BLAKE2B 15e7ad41222dfdb28ae020427b69bf33bdcd1ceddf691af8276bb3a71900fd17b111caad7f8e3e90b800f3461d291c90f1a411a4a5aa07767e51a82330af9c1b SHA512 6d62fd37d0e4ae687ff233328693ab233aa81decd4ebe0ae956f92da52ccf827a2c73ef3771dade3ed21b08328a5fb6ea9210bc6ef02859e9c20c57fc86a3e43
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/files/logging.patch b/dev-ros/rosbag_storage/files/logging.patch
new file mode 100644
index 000000000000..300367a28ab4
--- /dev/null
+++ b/dev-ros/rosbag_storage/files/logging.patch
@@ -0,0 +1,32 @@
+commit f7c7b3c28a09feeee643c10c6a8c4aff7684dda7
+Author: Mikael Arguedas <mikael@osrfoundation.org>
+Date:   Sat Nov 18 19:13:56 2017 -0800
+
+    use namespaced macros instead of deprecated macros (#1239)
+
+diff --git a/tools/rosbag_storage/src/bz2_stream.cpp b/tools/rosbag_storage/src/bz2_stream.cpp
+index 78e17538..53bc9d52 100644
+--- a/tools/rosbag_storage/src/bz2_stream.cpp
++++ b/tools/rosbag_storage/src/bz2_stream.cpp
+@@ -127,7 +127,7 @@ void BZ2Stream::read(void* ptr, size_t size) {
+     case BZ_OK: return;
+     case BZ_STREAM_END:
+         if (getUnused() || getUnusedLength() > 0)
+-            logError("unused data already available");
++            CONSOLE_BRIDGE_logError("unused data already available");
+         else {
+             char* unused;
+             int nUnused;
+diff --git a/tools/rosbag_storage/src/lz4_stream.cpp b/tools/rosbag_storage/src/lz4_stream.cpp
+index 297bcf7b..d13f241b 100644
+--- a/tools/rosbag_storage/src/lz4_stream.cpp
++++ b/tools/rosbag_storage/src/lz4_stream.cpp
+@@ -176,7 +176,7 @@ void LZ4Stream::read(void* ptr, size_t size) {
+     case ROSLZ4_OK: break;
+     case ROSLZ4_STREAM_END:
+         if (getUnused() || getUnusedLength() > 0)
+-            logError("unused data already available");
++            CONSOLE_BRIDGE_logError("unused data already available");
+         else {
+             setUnused(lz4s_.input_next);
+             setUnusedLength(lz4s_.input_left);
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.1.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.1.ebuild
deleted file mode 100644
index 6ce50df1d110..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.13.1.ebuild
+++ /dev/null
@@ -1,27 +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="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.2.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.2.ebuild
deleted file mode 100644
index 6ce50df1d110..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.13.2.ebuild
+++ /dev/null
@@ -1,27 +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="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.4.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.4.ebuild
deleted file mode 100644
index 6ce50df1d110..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.13.4.ebuild
+++ /dev/null
@@ -1,27 +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="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.0.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild
index 6ce50df1d110..b7be0886b40a 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-1.13.0.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.13.5-r1.ebuild
@@ -23,5 +23,7 @@ RDEPEND="
 	dev-ros/roslz4
 	dev-libs/boost:=
 	app-arch/bzip2
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/logging.patch" )
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.13.5.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.13.5.ebuild
deleted file mode 100644
index 6ce50df1d110..000000000000
--- a/dev-ros/rosbag_storage/rosbag_storage-1.13.5.ebuild
+++ /dev/null
@@ -1,27 +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="Set of tools for recording from and playing back ROS message"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/console_bridge
-	dev-ros/cpp_common
-	dev-ros/roscpp_serialization
-	dev-ros/roscpp_traits
-	dev-ros/rostime
-	dev-ros/roslz4
-	dev-libs/boost:=
-	app-arch/bzip2
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild b/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
index 972d0ec4fc84..8bdd40b1ae4e 100644
--- a/dev-ros/rosbag_storage/rosbag_storage-9999.ebuild
+++ b/dev-ros/rosbag_storage/rosbag_storage-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
@@ -23,5 +23,6 @@ RDEPEND="
 	dev-ros/roslz4
 	dev-libs/boost:=
 	app-arch/bzip2
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"