commit: 4657fb429b923091f1adb91643210a8b103252a2
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 13:01:40 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 13:02:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4657fb42
dev-ros/rviz: fixup live ebuild; bump to 1.14.1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/rviz/Manifest | 1 +
.../rviz/{rviz-9999.ebuild => rviz-1.14.1.ebuild} | 29 ++++++++++++----------
dev-ros/rviz/rviz-9999.ebuild | 29 ++++++++++++----------
3 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 2a2e11e604b..a7622fbfb49 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,2 +1,3 @@
DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B
f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c
SHA512
d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
DIST rviz-1.14.0.tar.gz 5118043 BLAKE2B
2f5236c3b8bcb0421ebbbc76648ad421b38ad0cb4c6b2c107ef0532c2a84a1c2430b4c648ff6facc634c3247dd8dcb62dd4fe787bbe5c4c5db5a904380b11dc3
SHA512
7ab3d8b751268b6e76fb39184ba0f245cc19b45ef1bb59fa74ada594b12ec2c9c7024a91005a946c0b2c0d977442a8e64570837ab80a10b762729d3f5840411b
+DIST rviz-1.14.1.tar.gz 5119463 BLAKE2B
c318c84d47fe4579b5554f073d013bb21189c2bff6edb286aea737837e67683a457ffaa0af1c05f1aedd96336689a0975fb8e72fb09af5bd8904bc29e1ee994b
SHA512
deefb4f35bc301df2eca310104100c5d01d41a5c5c0204e59519faa8ba6c04efbce5304d1507804d5a42ca904086ea22891cd448b9d5e0d500fe9a7c9be94863
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.14.1.ebuild
similarity index 77%
copy from dev-ros/rviz/rviz-9999.ebuild
copy to dev-ros/rviz/rviz-1.14.1.ebuild
index 4c97b1574ba..091d8d84b10 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-1.14.1.ebuild
@@ -4,7 +4,10 @@
EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/rviz";
-KEYWORDS=""
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
inherit ros-catkin virtualx
@@ -45,26 +48,26 @@ RDEPEND="
dev-ros/urdf
dev-ros/media_export
-
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- virtual/pkgconfig
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? (
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
)"
-
-src_configure() {
- local mycatkincmakeargs=( "-DUseQt5=ON" )
- ros-catkin_src_configure
-}
+BDEPEND="
+ dev-ros/cmake_modules
+ virtual/pkgconfig
+"
src_test() {
virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 4c97b1574ba..091d8d84b10 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -4,7 +4,10 @@
EAPI=7
ROS_REPO_URI="https://github.com/ros-visualization/rviz";
-KEYWORDS=""
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
inherit ros-catkin virtualx
@@ -45,26 +48,26 @@ RDEPEND="
dev-ros/urdf
dev-ros/media_export
-
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-
dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
- dev-ros/cmake_modules
- virtual/pkgconfig
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
test? (
dev-ros/rostest[${PYTHON_USEDEP}]
dev-cpp/gtest
)"
-
-src_configure() {
- local mycatkincmakeargs=( "-DUseQt5=ON" )
- ros-catkin_src_configure
-}
+BDEPEND="
+ dev-ros/cmake_modules
+ virtual/pkgconfig
+"
src_test() {
virtx ros-catkin_src_test
