gentoo resync : 25.08.2018

3 files changed, 2 insertions, 24 deletions

diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
index e2857316951f..5c498e07e2f6 100644
--- a/dev-ros/laser_proc/Manifest
+++ b/dev-ros/laser_proc/Manifest
@@ -1,5 +1,4 @@
-AUX pluginlib.patch 755 BLAKE2B 08c2fa02501668ca9ce503ab9167879d7925293cdd1c77388c09cbf8d6fbc3fc7517713483a62002fed346e84dd1e1c335bde05b36cc557da175a5b6f5fe93f9 SHA512 0327f914470299ac69ca99bcccdf8672d62ad573aa551d8a161392f8ceb21ff08f320db28e51650a32f759296159543a900d1d161d3e91f24159a9005b742e22
-DIST laser_proc-0.1.4.tar.gz 6865 BLAKE2B 4709c976a3438a54f1e28f0e615bea503deeb5a3f54bae02804242dd54bd63e4418943309abe19cc34928ba3920bc7b84bc7ba8511a273357b3120c8221f0bdf SHA512 0a9ae28d9ad213f7227027c24b951d0a68799edc662e98e593090a7d01ab0a33671a2a26eeb3fdaf2f77a3d639a2274641c11e478c2f0689327a1fa66601b95a
-EBUILD laser_proc-0.1.4-r1.ebuild 593 BLAKE2B d0434e59fd670903ab4f1e48b472e659839b93fb2c9e1bd167575056f3c66e60635b7cf9ff8f475e8faac4e07fc64a244914af55e0babad1dee98f0739fc0e20 SHA512 0a42afd435557f6a64b8e6b23f0c45f5045662df8782bab104687bd4633f3d830e4ec67d78f6616a75ab9e21de8b8b66b74f0753ddb324ab5152f5b218948431
+DIST laser_proc-0.1.5.tar.gz 6924 BLAKE2B 75b06134a1d4a68ad54447355962959e0ae9ba5f2df889b3740cc3dfed48ea3ae22e3098a7f0973ac4e0c6ec089eddb9fc7784aee96cac3662bef8a873c60735 SHA512 96062485b2ca7467aa5c54b04463fe89eb91a726ad79055831c7dc1dfad19e42b0759703eec5b659475ad1d09f95f3703b30343655e590db29100ee8b0ebaa87
+EBUILD laser_proc-0.1.5.ebuild 551 BLAKE2B 41ddab0ac8a75a39137107962a0a93f75aa6b7dd7113bbc88ec2a4b2062a534a03f49001c05fe5b2a72287e3d87afecc39d23a7e6511c73998ac7de7ddd6d599 SHA512 953e4e22ef895406eb4a5ef9ea691c3adfd06b342fe7fdf4c7569af54b7d93e5e8939536db747eb75ead8341614d6f40c383c97b1565620f83b176b99404c03b
 EBUILD laser_proc-9999.ebuild 551 BLAKE2B b11840887b254f7212d6ddb80267c1ef51fc66c4f7f0817c09b2e00ac207592608285f23a442d5af57a948e0972cd5bc1baf182b47fb8e2191cb45f41027d0b7 SHA512 abfaf7d5f5544b829a93b00dffad30bbd6dd4e8e859ee8d29885f2a921b5c5b97f88c5b9ba12f52ccda0a70bcdb61e4cff82b15b31dfba5515c7455280f951e2
 MISC metadata.xml 339 BLAKE2B 3cd1bb1057e014c06068a8bbe24e0186d454d11123a6658e1576b04d62283e30a6f9aae45f3d09beb81499f32c5f1af598d1a526e4da1b6ab5ec89f6eb55a1b6 SHA512 78c716d120dc9a894dee02b01757f746407c982097ba048522eae320ba8e5f83632bb81f693549d4440b3ff47f47739b67ad19df0e8f67c24ff414e79dac99eb
diff --git a/dev-ros/laser_proc/files/pluginlib.patch b/dev-ros/laser_proc/files/pluginlib.patch
deleted file mode 100644
index cf34946597fa..000000000000
--- a/dev-ros/laser_proc/files/pluginlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 2d81f874dc4f2a78d66284f3f32d6efe0bace4e3 Mon Sep 17 00:00:00 2001
-From: Mikael Arguedas <mikael@osrfoundation.org>
-Date: Thu, 26 Oct 2017 18:11:55 -0700
-Subject: [PATCH] update to use non deprecated pluginlib macro
-
----
- src/LaserProcNodelet.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/LaserProcNodelet.cpp b/src/LaserProcNodelet.cpp
-index 177d088..5e07e39 100644
---- a/src/LaserProcNodelet.cpp
-+++ b/src/LaserProcNodelet.cpp
-@@ -57,5 +57,5 @@ class LaserProcNodelet : public nodelet::Nodelet
- }
- 
- #include <pluginlib/class_list_macros.h>
--PLUGINLIB_DECLARE_CLASS(laser_proc, LaserProcNodelet, laser_proc::LaserProcNodelet, nodelet::Nodelet);
-+PLUGINLIB_EXPORT_CLASS(laser_proc::LaserProcNodelet, nodelet::Nodelet)
- 
diff --git a/dev-ros/laser_proc/laser_proc-0.1.4-r1.ebuild b/dev-ros/laser_proc/laser_proc-0.1.5.ebuild
index 56bf959350e3..f21077e89fd5 100644
--- a/dev-ros/laser_proc/laser_proc-0.1.4-r1.ebuild
+++ b/dev-ros/laser_proc/laser_proc-0.1.5.ebuild
@@ -22,4 +22,3 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/pluginlib.patch" )