summaryrefslogtreecommitdiff
path: root/dev-ros/monocam_settler
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-08-25 10:45:55 +0100
commit3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
treec513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-ros/monocam_settler
parent05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-ros/monocam_settler')
-rw-r--r--dev-ros/monocam_settler/Manifest7
-rw-r--r--dev-ros/monocam_settler/files/gcc6.patch22
-rw-r--r--dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild27
-rw-r--r--dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild8
-rw-r--r--dev-ros/monocam_settler/monocam_settler-9999.ebuild7
5 files changed, 8 insertions, 63 deletions
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
index 568924fbc509..b38f27e6e07a 100644
--- a/dev-ros/monocam_settler/Manifest
+++ b/dev-ros/monocam_settler/Manifest
@@ -1,7 +1,4 @@
-AUX gcc6.patch 781 BLAKE2B 1228e588391a8f3d0eff4725c9158ad10378216e7c6df0ba27a270c0e7382352c573901a25014d92e21523f3e31745f59cfea247039d6bb27e45e17ea7caa59b SHA512 c11a41b34f4b0616c3f3aeb68e763f9f10010c0a54a456ff76b3601f2d2608c63a73df069dfe2462a17e4988d9c7913618e4510aa6bec9e2d88a5038840a36f3
-DIST calibration-0.10.13.tar.gz 112305 BLAKE2B 1b2c2ffa0c07b907c7a4dc28b87ff112a497275039be98bcc15ad396ccf525ba4fb717b398551f04dab7131a8085e1b1ec64eb24408c12fec09e9c42b5c40a75 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb
DIST calibration-0.10.14.tar.gz 112475 BLAKE2B a43bf316b3eea30f5f3e273e0dd2754fe819a1aa246237cb1ecc4bc49463abbd3eb71f77579fc0655c483ad9ac259bb027ac014fc5ec368a73bada61dedf6712 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40
-EBUILD monocam_settler-0.10.13.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
-EBUILD monocam_settler-0.10.14.ebuild 704 BLAKE2B 379c17f9f5830dde3c8a54914a111462bdd5d2cdb6ee1d6fb3843ffb77eb793da57880c9271e8c19b26eb4e632ca67d3f0a9f850e6c7d79d441b876e0f4568e5 SHA512 8223f50cc033ec063f19a405f442378ea1fef9ba0a340104a2be87cbd0e03a63e99e7ebb636fbcb9d97ec9db21be3f1a05d9e756fe58b1786b6fecf76ec370c3
-EBUILD monocam_settler-9999.ebuild 667 BLAKE2B 788a7a39fc5e2453f45b68a573399826e15e29f864d292eae9e71efa4f6b9726b1f52ffd777cb303c11d9bb989fc4506a5146c76e625ea3af3af569fd301c14f SHA512 ed1e0f9639533e50001fed716861a242cfedade9aa5fb1de7742915619a09680afe4df2b021c6c915a93753a63fa72b6607b3dbc7ae7aba59d108e132bb270fa
+EBUILD monocam_settler-0.10.14.ebuild 643 BLAKE2B 559ecc5d7dc35d002865a207a397b579f38b54fbced8a7a9a586482a2128e929349bb12878166501560b492de0e1a721579e21503cb2a83ed41f57ef9b625e15 SHA512 66198721eb874555c683a9a782271f717f1474072e855ecf097bf75d95f3941250eae16f130d1153044a2587569ba64f4299b2e496b0638820e6f0a22737907c
+EBUILD monocam_settler-9999.ebuild 643 BLAKE2B 559ecc5d7dc35d002865a207a397b579f38b54fbced8a7a9a586482a2128e929349bb12878166501560b492de0e1a721579e21503cb2a83ed41f57ef9b625e15 SHA512 66198721eb874555c683a9a782271f717f1474072e855ecf097bf75d95f3941250eae16f130d1153044a2587569ba64f4299b2e496b0638820e6f0a22737907c
MISC metadata.xml 340 BLAKE2B 52b47839e0051b2f1813313ae3989819be9668c093763a9c9518302d5b5832142fd02e6c7427493411d2b3ad3143d41180aa1c0f890362b43258109fc5b858b3 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963
diff --git a/dev-ros/monocam_settler/files/gcc6.patch b/dev-ros/monocam_settler/files/gcc6.patch
deleted file mode 100644
index 35c84d1fa40f..000000000000
--- a/dev-ros/monocam_settler/files/gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: monocam_settler/CMakeLists.txt
-===================================================================
---- monocam_settler.orig/CMakeLists.txt
-+++ monocam_settler/CMakeLists.txt
-@@ -16,7 +16,7 @@ catkin_package(DEPENDS actionlib actionl
- )
-
-
--include_directories(SYSTEM ${catkin_INCLUDE_DIRS})
-+include_directories(${catkin_INCLUDE_DIRS})
- include_directories(include)
-
- # deal with the include
-@@ -33,7 +33,7 @@ install(TARGETS ${PROJECT_NAME}
- )
-
- # deal with the executable
--include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-+include_directories(${Boost_INCLUDE_DIRS})
- add_executable(monocam_settler_action src/monocam_settler_action.cpp)
- target_link_libraries(monocam_settler_action ${Boost_LIBRARIES}
- ${catkin_LIBRARIES}
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
deleted file mode 100644
index 66f2b9941697..000000000000
--- a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
- dev-ros/rosconsole
- dev-ros/roscpp_serialization
- dev-ros/settlerlib
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
- test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
index d95482f22246..3fc56b91a447 100644
--- a/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -17,7 +16,7 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
dev-ros/rosconsole
dev-ros/roscpp_serialization
dev-ros/settlerlib
@@ -25,4 +24,3 @@ RDEPEND="
"
DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
index 66f2b9941697..3fc56b91a447 100644
--- a/dev-ros/monocam_settler/monocam_settler-9999.ebuild
+++ b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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/calibration"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
@@ -17,7 +16,7 @@ SLOT="0"
IUSE=""
RDEPEND="
- dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/actionlib[${PYTHON_SINGLE_USEDEP}]
dev-ros/rosconsole
dev-ros/roscpp_serialization
dev-ros/settlerlib