net-libs/ignition-transport: bump to 4.0.0

Package-Manager: Portage-2.3.20, Repoman-2.3.6

3 files changed, 62 insertions, 0 deletions

diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 3c0b0411f418..60280941d264 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1 +1,2 @@
 DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555
+DIST ignition-transport4-4.0.0.tar.bz2 396662 BLAKE2B cb4c56954ddcd863d60941c43e38624747ca07e6cb5c7404309012dc9d22fb8a053e1113b117a0ee8447e32b6b52318b5b4844a050e4b8c1feccc2de391c46bf SHA512 90facd527e953d3319b4b3b7c5efa610d6c965fcaaf053b8b32039825fccca89c17f153ffec5c0562d4d3d534741f3d6c1a603eb2c75fd5cb217bf22a6d6e503
diff --git a/net-libs/ignition-transport/files/zmq.patch b/net-libs/ignition-transport/files/zmq.patch
new file mode 100644
index 000000000000..ddbf8f113064
--- /dev/null
+++ b/net-libs/ignition-transport/files/zmq.patch
@@ -0,0 +1,31 @@
+Index: ignition-transport4-4.0.0/src/NodeShared.cc
+===================================================================
+--- ignition-transport4-4.0.0.orig/src/NodeShared.cc
++++ ignition-transport4-4.0.0/src/NodeShared.cc
+@@ -92,7 +92,8 @@ bool userPass(std::string &_user, std::s
+ // Helper to send messages
+ int sendHelper(zmq::socket_t &_pub, const std::string &_data, int _type)
+ {
+-  zmq::message_t msg(_data.data(), _data.size());
++  zmq::message_t msg(_data.size());
++  memcpy(msg.data(), _data.data(), _data.size());
+   return _pub.send(msg, _type);
+ }
+ 
+@@ -278,10 +279,13 @@ bool NodeShared::Publish(
+   {
+     // Create the messages.
+     // Note that we use zero copy for passing the message data (msg2).
+-    zmq::message_t msg0(_topic.data(), _topic.size()),
+-                   msg1(this->myAddress.data(), this->myAddress.size()),
++    zmq::message_t msg0(_topic.size()),
++                   msg1(this->myAddress.size()),
+                    msg2(_data, _dataSize, _ffn, nullptr),
+-                   msg3(_msgType.data(), _msgType.size());
++                   msg3(_msgType.size());
++    memcpy(msg0.data(), _topic.data(), _topic.size());
++    memcpy(msg1.data(), this->myAddress.data(), this->myAddress.size());
++    memcpy(msg3.data(), _msgType.data(), _msgType.size());
+ 
+     // Send the messages
+     std::lock_guard<std::recursive_mutex> lock(this->mutex);
diff --git a/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild b/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild
new file mode 100644
index 000000000000..7fc18b97a88a
--- /dev/null
+++ b/net-libs/ignition-transport/ignition-transport-4.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils vcs-snapshot flag-o-matic
+
+DESCRIPTION="Combines ZeroMQ with Protobufs to create a fast and efficient message passing system"
+HOMEPAGE="http://ignitionrobotics.org/libraries/transport"
+SRC_URI="http://gazebosim.org/distributions/ign-transport/releases/${PN}4-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="4/4"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	net-libs/ignition-msgs:1=
+	dev-libs/protobuf:=
+	>=net-libs/zeromq-3.2.0:=
+	sys-apps/util-linux
+	net-libs/cppzmq
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	>=dev-util/ignition-cmake-0.4
+	virtual/pkgconfig"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+S="${WORKDIR}/${PN}4-${PV}"
+PATCHES=( "${FILESDIR}/zmq.patch" )