gentoo resync : 07.01.2018

6 files changed, 26 insertions, 41 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index caaa4dab9f75..0000e43f6afa 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ignition-msgs/Manifest b/net-libs/ignition-msgs/Manifest
index 7414db84170b..9373bf6cb6e0 100644
--- a/net-libs/ignition-msgs/Manifest
+++ b/net-libs/ignition-msgs/Manifest
@@ -1,3 +1,5 @@
 DIST ignition-msgs-0.7.0.tar.bz2 327753 BLAKE2B 7709b7fe5bc8d3ebd16ae30ac91d088a7e3891bc378f24ca48b34b88c541c3583182c3d9d3d6c72b7005f01ae5383f6391b4e754adb26f8ab06e9a31680e99dd SHA512 78b35eb6c9b53bd567d227191009cfb8628afa70f244cf05ad9440f370aa9c51a649160c9c65d13e81a48a3a34553614e9835e9a37fb91cad330c363f0a5f62f
+DIST ignition-msgs-1.0.0.tar.bz2 315469 BLAKE2B a481f740ffb0795e64d1fa222ea4925e09839d56212f5218b4849c6f49a3e3a899af757ac1ad1997a95b57a401bac831a754ffa351cd142e6e9cbf07e7bae0ac SHA512 3ec16d68c35b1c7d77373eb3ed72304f5a990f57fc15a91f49af49bf0c6b43e6f31e888e4b0a8308cc63840aa995dd423d5b23d28a98f132b4be13c46f5d7d6e
 EBUILD ignition-msgs-0.7.0.ebuild 901 BLAKE2B fa49ae9ffcf70f138afb7cb844ccb581b4ba27cde86627925473ed8c874445608ab635024cee3b341b09c9743f8b087e7ef419e3bfa5a7ac6bee1f602a6e7f3a SHA512 58e5851d77dfb52085c7f3311829a9076d8f3a54d1917aff7587d054e164646f10e47f7ea540eff93b19cfa3a829f6993b28a291501ec45be2e85a7ea6b11489
+EBUILD ignition-msgs-1.0.0.ebuild 652 BLAKE2B dbea1b7abe06c9326cc719f7000db982cfee55e918c71aa32e01649bf3a751cdd00c790efb9c7bfb61f627fa1b16f456ec0ea98cf0eff945f1a7ae81e191215a SHA512 c1dbc7a56426767b4e7e77f4e2eb6749f6b2e6240daf5f5fb645954843fa78328ee1c0efd5fbe96b21835b8cd1eac3376b1f053aa509d4709dfeac438ecade1f
 MISC metadata.xml 342 BLAKE2B 8d111972a5a99679d9ad258649ea0308bc682663888b6228e92948dd88ee3e6d19bf04d940801f5d3ca069ba9173f248d557c2d44f304c86c074c3f68b0d9341 SHA512 4ec21d1b2f7525d07b3bbc624ec55edf1282652c74ee548e77c1b25c0242b0f01f846bdbe2203dca8c0217f25e5fc50ad6ff57f33694ea223941c8aaa8bc35fe
diff --git a/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild b/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
new file mode 100644
index 000000000000..6b7fa14bffae
--- /dev/null
+++ b/net-libs/ignition-msgs/ignition-msgs-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Protobuf messages and functions for robot applications"
+HOMEPAGE="http://ignitionrobotics.org/libraries/messages https://bitbucket.org/ignitionrobotics/ign-msgs"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-msgs/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+	sci-libs/ignition-math:4=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-util/ignition-cmake[${MULTILIB_USEDEP}]"
+CMAKE_BUILD_TYPE=RelWithDebInfo
diff --git a/net-libs/ignition-transport/Manifest b/net-libs/ignition-transport/Manifest
index 1dc3bbe39cb7..b9a7c877385e 100644
--- a/net-libs/ignition-transport/Manifest
+++ b/net-libs/ignition-transport/Manifest
@@ -1,5 +1,3 @@
-DIST ignition-transport3-3.0.1.tar.bz2 384679 BLAKE2B 1aace81c8d708dc06dedb53453718b019b1472c6c787fddb3b76c9e97cf2d518db2e037c20451b10c31db8a31d87b70f93c8339515a98f376bb660798bf07cd8 SHA512 a2e80d3b5a8b0ca327bd8892d1177f8316d3e2dbbb6f064626e00eb5e67572519377290973527d69ab4a8ff3970c350a7066625429d3a8403a5be8d491fb89c6
 DIST ignition-transport3-3.1.0.tar.bz2 385946 BLAKE2B 0ae44f0e1cd17369de9ee39f0d128ee5edbc68c1be672be5476d7cf8c161f59c069af63cec1966f6e0ba1c9e56ade0563b6546f7f285bdc49b6941939e2a4379 SHA512 438ab49f1c506e098c00becccf1856b3e0129d60f9aca32f713a74b38aefb178833353ff479c8512e7ffec812bdc0a06eb7f28f09766dc0cc5a9707184151555
-EBUILD ignition-transport-3.0.1.ebuild 1049 BLAKE2B 4dadc025a21222df813cddadc068aaed5d83c81c405842096ad4fc2cc37185eb2206557c61864590683346a755fbbce5ce0b1d851540c7b23bf25deee19eea82 SHA512 0f327196dcff9067c14c14b8287bff381654f6ec84687bd3bf2c953c0b5e006eb0f535655c9d35d358a83b0373a012fc0cde14e994c1d68e89ac4a3f943c84ca
-EBUILD ignition-transport-3.1.0.ebuild 1049 BLAKE2B 4dadc025a21222df813cddadc068aaed5d83c81c405842096ad4fc2cc37185eb2206557c61864590683346a755fbbce5ce0b1d851540c7b23bf25deee19eea82 SHA512 0f327196dcff9067c14c14b8287bff381654f6ec84687bd3bf2c953c0b5e006eb0f535655c9d35d358a83b0373a012fc0cde14e994c1d68e89ac4a3f943c84ca
+EBUILD ignition-transport-3.1.0-r1.ebuild 1050 BLAKE2B 01636b931f62d40c81a83040c3679d7ac5d7db582536f1cce86511ee2ece4aaf54d22545993eb2877a5820fa2044e63bb7f2ce2d56482e366e6626aeda1abad9 SHA512 0f693828d0a4ac3751570d6ea58b0bff3010f4a84e4d2290cd905139c6ceaa9685f8219d44162c046fab2377fdb96ba9386d447abceb9b64977d9bb2c9b8bc89
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/net-libs/ignition-transport/ignition-transport-3.0.1.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
index 8c6b71bda1c3..d90f82ffa1b4 100644
--- a/net-libs/ignition-transport/ignition-transport-3.0.1.ebuild
+++ b/net-libs/ignition-transport/ignition-transport-3.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-	net-libs/ignition-msgs:=
+	net-libs/ignition-msgs:0=
 	dev-libs/protobuf:=
 	>=net-libs/zeromq-3.2.0:=
 	sys-apps/util-linux
diff --git a/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild b/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild
deleted file mode 100644
index 8c6b71bda1c3..000000000000
--- a/net-libs/ignition-transport/ignition-transport-3.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 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}3-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="3/3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	net-libs/ignition-msgs:=
-	dev-libs/protobuf:=
-	>=net-libs/zeromq-3.2.0:=
-	sys-apps/util-linux
-	net-libs/cppzmq
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-CMAKE_BUILD_TYPE=RelWithDebInfo
-S="${WORKDIR}/${PN}3-${PV}"
-
-src_configure() {
-	# upstream appends this conditionally...
-	append-flags "-fPIC"
-	echo "set (CMAKE_C_FLAGS_ALL \"${CXXFLAGS} \${CMAKE_C_FLAGS_ALL}\")" > "${S}/cmake/HostCFlags.cmake"
-	sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die
-	cmake-utils_src_configure
-}