gentoo resync : 29.05.2018

14 files changed, 27 insertions, 65 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index b31ef77f4a84..9dec6b4df931 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/class_loader/Manifest b/dev-ros/class_loader/Manifest
index 3a42e0e095d2..ceeffc5902ae 100644
--- a/dev-ros/class_loader/Manifest
+++ b/dev-ros/class_loader/Manifest
@@ -1,6 +1,4 @@
-DIST class_loader-0.4.0.tar.gz 32163 BLAKE2B f86e3903628cc797e935bb83b49d3f3baf1330bf6431402e7c4c38be802596a6e26767ea7089fa3f1a833f3e22b49f8a72b24675c2502810efb2a6d9104cb611 SHA512 3d07ba3a85b0c2b2153776ca55fe6b83a14c39fe7f62e4d7e6b66e1000fb0365f967e0a04c0c918ee99d730ea0b4fff6bec63ac00ad04d8c1574008297390346
 DIST class_loader-0.4.1.tar.gz 33110 BLAKE2B 61a93af542124799ddc7341bdd330ca8cd13046fc6a0ce765818bfce09def49b93c351180278c80c32e9449ce46b520ab91153bb4d9630e809623106efdc1f76 SHA512 954ad1e76a8b2b679d4cdd46e4c29471dbdaae18be580bd5babe576c89265c473fb218253338667d51f68bf26780a48d934e476a30983cb986bec4ffadec28d1
-EBUILD class_loader-0.4.0.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
-EBUILD class_loader-0.4.1.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
-EBUILD class_loader-9999.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
+EBUILD class_loader-0.4.1-r1.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
+EBUILD class_loader-9999.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
 MISC metadata.xml 330 BLAKE2B ee09655fb1ba4eb6310f6ada92765e7a7aeab4cf9c9c3acfc29c54e6248543270aff3f089b13df31bb0b9f4e17c28f9dc82d469a481769989aa410fd392619e1 SHA512 9577bebad3f9dc042eb4d055bda37a837948682da8a73dee93d847b9224227edbb51ca6cdd4002ff0c076387d8aee43428e6c16cfb13fce6a0ee8502b3eab406
diff --git a/dev-ros/class_loader/class_loader-0.4.0.ebuild b/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
index bd6d17ac0ef4..16fdc81a521a 100644
--- a/dev-ros/class_loader/class_loader-0.4.0.ebuild
+++ b/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
@@ -10,7 +10,7 @@ inherit ros-catkin
 
 DESCRIPTION="ROS-independent package for loading plugins"
 LICENSE="BSD"
-SLOT="0/melodic"
+SLOT="0/melodic2"
 IUSE=""
 
 RDEPEND="dev-libs/poco
diff --git a/dev-ros/class_loader/class_loader-0.4.1.ebuild b/dev-ros/class_loader/class_loader-0.4.1.ebuild
deleted file mode 100644
index bd6d17ac0ef4..000000000000
--- a/dev-ros/class_loader/class_loader-0.4.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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/class_loader"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-independent package for loading plugins"
-LICENSE="BSD"
-SLOT="0/melodic"
-IUSE=""
-
-RDEPEND="dev-libs/poco
-	dev-libs/boost:=[threads]
-	dev-ros/cmake_modules
-	dev-libs/console_bridge:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/class_loader/class_loader-9999.ebuild b/dev-ros/class_loader/class_loader-9999.ebuild
index bd6d17ac0ef4..16fdc81a521a 100644
--- a/dev-ros/class_loader/class_loader-9999.ebuild
+++ b/dev-ros/class_loader/class_loader-9999.ebuild
@@ -10,7 +10,7 @@ inherit ros-catkin
 
 DESCRIPTION="ROS-independent package for loading plugins"
 LICENSE="BSD"
-SLOT="0/melodic"
+SLOT="0/melodic2"
 IUSE=""
 
 RDEPEND="dev-libs/poco
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
index 4058170995ec..7aae46634c37 100644
--- a/dev-ros/depthimage_to_laserscan/Manifest
+++ b/dev-ros/depthimage_to_laserscan/Manifest
@@ -1,5 +1,6 @@
 AUX isnan.patch 672 BLAKE2B 714348340fb583106891e467fb24815cb95e389ef863b39c8ed5d6250c2fc5d5467cf565590b0fa1e163c440fd6e282f6320d77395b676876bd51526a755e454 SHA512 c4993894868cbfbd66374b4062f43e7d58ef8e3d725024b06146144809cd059d6a01ba502626876089847688a58f1f069f8dfb788e657ac7c1a79e9cb8200a7b
+AUX pluginlib.patch 616 BLAKE2B 7ba7ce7e1af6b5f97987011a5f65edc200bcb56904cda31bbfb3e35a5a0ae5250bdef3d207cbcf7cd67a83a0aa04858162116631fdc1399159188d3168338d19 SHA512 f0ad07597c7b375e7b7ba566e19c21ef73a8cee9f7f124b0819056d061dd7a6e6b5a583ac6d9bfd66ced8e6bf4823e11867581789e2c82aa455e229291f26244
 DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 BLAKE2B f8b69ce10311e39eaf963c42fd6ea653c8b0fe1c2381ab128d575d490d236b03d8667a213e8e9eb9423c4a9244697fb9746ebe8385ac0142776e47063fe9e5bf SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9
-EBUILD depthimage_to_laserscan-1.0.7-r2.ebuild 703 BLAKE2B 7acf10df77fdb79ab792b653c6de5bc2b9f799d6c084c25dc6c6ad55d404e6aa40de825abfbc1e9a7db6a037a20319875feb380b6fd3162a213a6e92abb3cb18 SHA512 b004eee3ec7de4bac264025bfa5978e7a77e29b3a962728e88aca41112728eeecb0dc6ff37feba0cae50ecaae487634b16d3a3f5410ad3020828343f41554fca
-EBUILD depthimage_to_laserscan-9999.ebuild 665 BLAKE2B bb8c492339f3773329d2d6bbe4abd533be25cf2adf39a730938d5c1a708d1c90578aa1f34d58022332879802eaf0af86125be2231cc6c9dcc0a04ede76ad20e8 SHA512 7fd8905772a03102ff69041d333efc1b61b5648d5f263312d3b194b2e6b386a59fd582e6efbaccb363599516f7441baf9cc9ccac792fa81b364fd2ce4362c860
+EBUILD depthimage_to_laserscan-1.0.7-r2.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
+EBUILD depthimage_to_laserscan-9999.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
 MISC metadata.xml 352 BLAKE2B 925e18de2139370d06d242cbf4c2d15f2d201df3c28036169eb868defaad60ef0e38814cae627c43efbe5efddfa21e311053970f7ad0b648650df538c1817a10 SHA512 3eafc06a8ac658f3f29903c2f23b88b53b2dd5b1a70fecb8788a4027646c5367a3d0384179c0ca1e75e58a8081ce53c00ae6def249f48a7fc7c2ea0365408d2c
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
index b0b3cce5f4e8..2e621e904b7b 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.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
@@ -25,4 +25,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/isnan.patch" )
+PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
index 9a1d9908c4d6..2e621e904b7b 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.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
@@ -25,3 +25,4 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/files/pluginlib.patch b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
new file mode 100644
index 000000000000..a367cd40c5f6
--- /dev/null
+++ b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
@@ -0,0 +1,11 @@
+Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
+===================================================================
+--- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScanNodelet.cpp
++++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
+@@ -57,5 +57,5 @@ private:
+ }
+ 
+ #include <pluginlib/class_list_macros.h>
+-PLUGINLIB_DECLARE_CLASS(depthimage_to_laserscan, DepthImageToLaserScanNodelet, depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet);
++PLUGINLIB_EXPORT_CLASS(depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet)
+ 
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index feecc0144de9..f8b82d41ac30 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,6 +1,5 @@
 AUX qt5.patch 3068 BLAKE2B 0ff205aab12c65b94ee200f770a30c3c34252237d536374f6684606f3cad170fd3045c80b8de021fea538d06f33c4495b5ecc10ebbac2d3a0d470be11cbf148f SHA512 26f6bbcd939f3119cbb6de237c1ba76703cb02ac6af22fa5c7ed1a9022b5c33c785d4891c12e14ddaee949b09283c0500984fd0455b3c69a4cae51192b8b98c1
 DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-EBUILD hector_geotiff-0.3.5-r1.ebuild 749 BLAKE2B 6ede762fc12278d52f79168d5613be850c400de58b63d1de2d0f84709b8acd03c1597b93c10b280c59514e8328e65843ff8c5aff83b9aeb8e6703adf55f82370 SHA512 ba23c37d0609bc44bf77a14856cb11d47cee6cfdc4edeb188f5a9b3f764b42b6640e2adec8288f87b9a9b153134955a7c1aa382a720436255a3a9fccba36c776
 EBUILD hector_geotiff-0.3.5-r2.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
 EBUILD hector_geotiff-9999.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild
deleted file mode 100644
index 44e33566e42d..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,30 +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/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/nodelet/Manifest b/dev-ros/nodelet/Manifest
index 96e96c476434..f43a5092ea67 100644
--- a/dev-ros/nodelet/Manifest
+++ b/dev-ros/nodelet/Manifest
@@ -1,4 +1,4 @@
 DIST nodelet_core-1.9.16.tar.gz 44194 BLAKE2B e174ae42d7a6e91f20dee25c8740f0c339b660040d11e2231a350b1f0ca4f37ab48e1811f0aa66a8365f3c280e4ba923aa7f0a2e0997400b2b8ea1775d6fa780 SHA512 36408735028e6034f551e331da8379f5d9dd37128f749830cd5654298fc02c3fdc609e82cdb314cefcb06bd6d36eb6b37f6efa468487ee8068a4da6d0b8c1787
-EBUILD nodelet-1.9.16.ebuild 773 BLAKE2B 300411bd7d68db4838619ca169e5330c79058cd718fcdc87acf5f9cf31e02061e60f9986b3c53bde78962a1ec3cd05b324b826b10c5dc69a4c8457385ec6a272 SHA512 11c98294e8b8d55618ee01a6ef863dcc380ca1e573acbf9ffffb75b4b55247bb6321b68adea1970b840b69890a10e96c585e0b86cc1325cbbf31cd3916be0e3c
-EBUILD nodelet-9999.ebuild 773 BLAKE2B fa0e603abfa7a4d93b486bbcffba6ed199f21f0f650e1bcbb3ca4db8049413a8e277cc2076e791eb0844c153cb1194d7373b6bc8b59c94bed632103db89e56a5 SHA512 df06c98e644d085814eb8d0db432d8473cc9b949b13581125549f93e572c29c7435bff4651a91cf236e42ee8b8db4a1a2cc6922253aa36be6cb7284eede9f355
+EBUILD nodelet-1.9.16-r1.ebuild 797 BLAKE2B 5bc7cf23ead3bd64bfe192fb43c3c7eec94960d0f3a6242ad274f5709a6a33e7380d95fa37b8a12bb75011a3708ba335c69c657f5f47f4f0c0cc7c6436a49059 SHA512 c497582b976626cd2d74ab19c534b53e8c08e29ddb20e00da6f18b69894fa0a070fd36c6800315c221d5b0fed9f5bda1219c269617b63aa2bff9f7118e4948a3
+EBUILD nodelet-9999.ebuild 797 BLAKE2B 5bc7cf23ead3bd64bfe192fb43c3c7eec94960d0f3a6242ad274f5709a6a33e7380d95fa37b8a12bb75011a3708ba335c69c657f5f47f4f0c0cc7c6436a49059 SHA512 c497582b976626cd2d74ab19c534b53e8c08e29ddb20e00da6f18b69894fa0a070fd36c6800315c221d5b0fed9f5bda1219c269617b63aa2bff9f7118e4948a3
 MISC metadata.xml 330 BLAKE2B 7f8d8593aa2f28cd25f2c1a7d21fce8f09b3f97ff1fe72bbe532c3f1f3da5ef3c4611c7318ee3638a0e7591a01881ee517b1a484fe5182904d7f3849ebe697a0 SHA512 d1fd92493c64f5d10c309bdf2e9bcfb9faac89cecd7937ef9876a469f4440c5bfa8fec93b316e47a68e68cd44d465be52a7c2a345e2075679dc7045572e9c266
diff --git a/dev-ros/nodelet/nodelet-1.9.16.ebuild b/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild
index 3b7cd9993272..8dc05c79a9af 100644
--- a/dev-ros/nodelet/nodelet-1.9.16.ebuild
+++ b/dev-ros/nodelet/nodelet-1.9.16-r1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-libs/boost:=
 	sys-apps/util-linux
+	dev-ros/class_loader:=
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
 "
diff --git a/dev-ros/nodelet/nodelet-9999.ebuild b/dev-ros/nodelet/nodelet-9999.ebuild
index 94c0ffd3b95f..8dc05c79a9af 100644
--- a/dev-ros/nodelet/nodelet-9999.ebuild
+++ b/dev-ros/nodelet/nodelet-9999.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
@@ -26,6 +26,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-libs/boost:=
 	sys-apps/util-linux
+	dev-ros/class_loader:=
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-python/rospkg[${PYTHON_USEDEP}]
 "