gentoo resync : 25.08.2020

5 files changed, 49 insertions, 44 deletions

diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 1e2c20f515c0..ce29164c96b1 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,7 +1,6 @@
 AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-DIST pluginlib-1.12.0.tar.gz 20298 BLAKE2B 9d6e5adb6bd64f02d237fa1992402cb016266071c0fa0447709880f90550f36f9e280163a3e054594235d0102f7fb22f4b98a56216b0db9ebaa200b99d018570 SHA512 fcd51908c6c7223bbe50eb43733ba6d00e11419b26d2b9a05aaaf6498020fcd44bacc19313c3a4dd7524bf69d4f54aec27e05b1f88ee578191484c53c1e3f767
-DIST pluginlib-1.12.1.tar.gz 19619 BLAKE2B e91fb15b4857fae10012a71df606f5040d5a62bdee596695c873808790eea02cd380eedda6c438388264003d7ac930ebc2c649a421411580dd095365c93d3c8e SHA512 1a15cd934c4f93fecf32d7d3cab1ee6caae61d59aa65d1f796ab2ba63d5204a6fe28744c28eac80d304bd802b184afe79ead621b3c370c6d3526a944c144d724
-EBUILD pluginlib-1.12.0-r1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-1.12.1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-9999.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
+AUX libdir.patch 849 BLAKE2B 4ca2be8207311e6ac342637d07ba63cb135b4f8433b8cead15279f4b5150fd0388c65f34553842009bb26ec100b8ba220a3737a0923ace55e07ede4b580e7032 SHA512 71404dfc435630f899b9bdd2152363257c918f43c8d718450348308156d586fddf2e45a0715d7d439626bf5d67169fa7e6faff0de26647b7aa803dee6e37622c
+DIST pluginlib-1.13.0.tar.gz 20124 BLAKE2B d2c2c643345e3b76bc580e413538af3ddb49ffe00d9d14ee6ad4dfb3d930ca70bad12ef232c831474238050f4b934c0ca5accded800b8c719c006c01e3c7ac00 SHA512 69566fad8aad92cf1d481117e5beb46c6033538ea08db0487e10766c40e89510d6a58e817f52c0bdce2946813272f2f2e72145e949647e24465f1e13995cf85f
+EBUILD pluginlib-1.13.0-r2.ebuild 766 BLAKE2B f0237c2133425950d5460df7b3cbb1353218f7c83e8ed6e6cdd72a44e43f4b7dd73bc907f3483a396f59f51bf2c844556b9e1d731676bac11efc03637830aa8d SHA512 fc3b88bfee5d94baee611fc330811ab7b120eb4f48317dcdf3e71951978ae4dbc18c31c0aac6582a9c2966a683e23fc66f1862b013c79a1b25a6033bbf26202d
+EBUILD pluginlib-9999.ebuild 766 BLAKE2B f0237c2133425950d5460df7b3cbb1353218f7c83e8ed6e6cdd72a44e43f4b7dd73bc907f3483a396f59f51bf2c844556b9e1d731676bac11efc03637830aa8d SHA512 fc3b88bfee5d94baee611fc330811ab7b120eb4f48317dcdf3e71951978ae4dbc18c31c0aac6582a9c2966a683e23fc66f1862b013c79a1b25a6033bbf26202d
 MISC metadata.xml 327 BLAKE2B f94cb82ca7e89f9c45d423a4b56a573d7d220a5bf218838163659dc027554338b845539ae4090df944e0053ce3e0264c0323a442732619147116a583926fc405 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2
diff --git a/dev-ros/pluginlib/files/libdir.patch b/dev-ros/pluginlib/files/libdir.patch
new file mode 100644
index 000000000000..5152705f0196
--- /dev/null
+++ b/dev-ros/pluginlib/files/libdir.patch
@@ -0,0 +1,19 @@
+Add more search pathes for potential libdirs
+
+Index: pluginlib/include/pluginlib/class_loader_imp.hpp
+===================================================================
+--- pluginlib.orig/include/pluginlib/class_loader_imp.hpp
++++ pluginlib/include/pluginlib/class_loader_imp.hpp
+@@ -323,6 +323,12 @@ std::vector<std::string> ClassLoader<T>:
+       boost::filesystem::path bin("bin");
+       lib_paths.push_back((path / bin).string());
+ #endif
++      boost::filesystem::path lib64("lib64");
++      lib_paths.push_back((path / lib64).string());
++      boost::filesystem::path lib32("lib32");
++      lib_paths.push_back((path / lib32).string());
++      boost::filesystem::path libx32("libx32");
++      lib_paths.push_back((path / libx32).string());
+       boost::filesystem::path lib("lib");
+       lib_paths.push_back((path / lib).string());
+     }
diff --git a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild b/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
deleted file mode 100644
index 8b802f6e3618..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
index 8b802f6e3618..7dc414eb606d 100644
--- a/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.13.0-r2.ebuild
@@ -1,27 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
+DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE=""
 
 RDEPEND="
 	>=dev-ros/class_loader-0.3.5:=
 	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/tinyxml2:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
+
+src_test() {
+	cmake_build tests
+
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH=devel/
+	ros-catkin_src_test
+}
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 8b802f6e3618..7dc414eb606d 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -1,27 +1,34 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
+DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE=""
 
 RDEPEND="
 	>=dev-ros/class_loader-0.3.5:=
 	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/tinyxml2:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
+PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" "${FILESDIR}/libdir.patch" )
+
+src_test() {
+	cmake_build tests
+
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH=devel/
+	ros-catkin_src_test
+}