diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/camera_calibration_parsers | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/camera_calibration_parsers')
| -rw-r--r-- | dev-ros/camera_calibration_parsers/Manifest | 8 | ||||
| -rw-r--r-- | dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild (renamed from dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild) | 20 | ||||
| -rw-r--r-- | dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild | 20 | ||||
| -rw-r--r-- | dev-ros/camera_calibration_parsers/files/boostpython.patch | 8 |
4 files changed, 36 insertions, 20 deletions
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest index 4783afebc92a..f07a0124535f 100644 --- a/dev-ros/camera_calibration_parsers/Manifest +++ b/dev-ros/camera_calibration_parsers/Manifest @@ -1,5 +1,5 @@ -AUX boostpython.patch 894 BLAKE2B b9dadc07ac55c68b15c2960ae545a0d7f2984da11d835f41707d6a1b54487650a4507c720e3c372eeb2aec9f8fc20edfb726a4df616349802aa484210ee8bf2e SHA512 222e4ae077e40af8cd2b913d71d43e06b5b798375ae0d8fd9cf6c9387d7ffb1acd2c44208713cdeb8ae24dce74eff426b4b9180d6e07a2041b5d0a6031ad756a -DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa -EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db -EBUILD camera_calibration_parsers-9999.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db +AUX boostpython.patch 766 BLAKE2B 80cdc502a4a8c0a7d31b7b196069422ef5e4ce773168f4d3065d986f27c82f3865336db304a86e528c830711ae7c0360ae8c2c30121cf030d7c7018ef3d6890c SHA512 37481eb10d2c924387079479c73530821884d8486dfe83356dbaf618c3b9014b0e2afcb9272bc9f3be33eaccfe538e194c874cb06847bb2ffff9479c2b9ad2a8 +DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0 +EBUILD camera_calibration_parsers-1.12.0.ebuild 901 BLAKE2B b74dd735a17509b48e991fe2968e36681c67455b864fe057da7e1d0647dec8a3429df93ed81e83b5684b5b2727e6038e55db66a4c1133f51e00f5e167347825d SHA512 d580a9395e478cca08d55a1bdc9933da92906ccc0a2613b5cd6a75f1aa8b78d0618188ce08af8767d8a5a6a4bda37a0317807dc1bcc0f97d7073361081ca6747 +EBUILD camera_calibration_parsers-9999.ebuild 901 BLAKE2B b74dd735a17509b48e991fe2968e36681c67455b864fe057da7e1d0647dec8a3429df93ed81e83b5684b5b2727e6038e55db66a4c1133f51e00f5e167347825d SHA512 d580a9395e478cca08d55a1bdc9933da92906ccc0a2613b5cd6a75f1aa8b78d0618188ce08af8767d8a5a6a4bda37a0317807dc1bcc0f97d7073361081ca6747 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69 diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild index ff27b5050edc..9e586eb4d9df 100644 --- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild +++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild @@ -1,11 +1,10 @@ # 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-perception/image_common" KEYWORDS="~amd64 ~arm" ROS_SUBDIR=${PN} -PYTHON_COMPAT=( python{2_7,3_6} ) inherit ros-catkin @@ -15,15 +14,26 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]") dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization " DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + dev-ros/rosbash + ) + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +BDEPEND=" virtual/pkgconfig - test? ( dev-python/nose ) " PATCHES=( "${FILESDIR}/boostpython.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild index ff27b5050edc..9e586eb4d9df 100644 --- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild +++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild @@ -1,11 +1,10 @@ # 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-perception/image_common" KEYWORDS="~amd64 ~arm" ROS_SUBDIR=${PN} -PYTHON_COMPAT=( python{2_7,3_6} ) inherit ros-catkin @@ -15,15 +14,26 @@ SLOT="0" IUSE="" RDEPEND=" - dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] - dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + $(python_gen_cond_dep "dev-libs/boost:=[python,\${PYTHON_USEDEP}]") dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization " DEPEND="${RDEPEND} + test? ( + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") + dev-ros/rosbash + ) + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +BDEPEND=" virtual/pkgconfig - test? ( dev-python/nose ) " PATCHES=( "${FILESDIR}/boostpython.patch" ) + +src_test() { + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + ros-catkin_src_test +} diff --git a/dev-ros/camera_calibration_parsers/files/boostpython.patch b/dev-ros/camera_calibration_parsers/files/boostpython.patch index 02019d6458f7..30840401c0df 100644 --- a/dev-ros/camera_calibration_parsers/files/boostpython.patch +++ b/dev-ros/camera_calibration_parsers/files/boostpython.patch @@ -5,15 +5,11 @@ Index: camera_calibration_parsers/CMakeLists.txt =================================================================== --- camera_calibration_parsers.orig/CMakeLists.txt +++ camera_calibration_parsers/CMakeLists.txt -@@ -4,11 +4,7 @@ project(camera_calibration_parsers) +@@ -4,7 +4,7 @@ project(camera_calibration_parsers) find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization) find_package(PythonLibs REQUIRED) --if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3) -- find_package(Boost REQUIRED COMPONENTS filesystem python) --else() -- find_package(Boost REQUIRED COMPONENTS filesystem python3) --endif() +-find_package(Boost REQUIRED COMPONENTS filesystem python) +find_package(Boost REQUIRED COMPONENTS filesystem python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) |