1 |
commit: 4657fb429b923091f1adb91643210a8b103252a2 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 16 13:01:40 2020 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 16 13:02:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4657fb42 |
7 |
|
8 |
dev-ros/rviz: fixup live ebuild; bump to 1.14.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
12 |
|
13 |
dev-ros/rviz/Manifest | 1 + |
14 |
.../rviz/{rviz-9999.ebuild => rviz-1.14.1.ebuild} | 29 ++++++++++++---------- |
15 |
dev-ros/rviz/rviz-9999.ebuild | 29 ++++++++++++---------- |
16 |
3 files changed, 33 insertions(+), 26 deletions(-) |
17 |
|
18 |
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest |
19 |
index 2a2e11e604b..a7622fbfb49 100644 |
20 |
--- a/dev-ros/rviz/Manifest |
21 |
+++ b/dev-ros/rviz/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157 |
24 |
DIST rviz-1.14.0.tar.gz 5118043 BLAKE2B 2f5236c3b8bcb0421ebbbc76648ad421b38ad0cb4c6b2c107ef0532c2a84a1c2430b4c648ff6facc634c3247dd8dcb62dd4fe787bbe5c4c5db5a904380b11dc3 SHA512 7ab3d8b751268b6e76fb39184ba0f245cc19b45ef1bb59fa74ada594b12ec2c9c7024a91005a946c0b2c0d977442a8e64570837ab80a10b762729d3f5840411b |
25 |
+DIST rviz-1.14.1.tar.gz 5119463 BLAKE2B c318c84d47fe4579b5554f073d013bb21189c2bff6edb286aea737837e67683a457ffaa0af1c05f1aedd96336689a0975fb8e72fb09af5bd8904bc29e1ee994b SHA512 deefb4f35bc301df2eca310104100c5d01d41a5c5c0204e59519faa8ba6c04efbce5304d1507804d5a42ca904086ea22891cd448b9d5e0d500fe9a7c9be94863 |
26 |
|
27 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.14.1.ebuild |
28 |
similarity index 77% |
29 |
copy from dev-ros/rviz/rviz-9999.ebuild |
30 |
copy to dev-ros/rviz/rviz-1.14.1.ebuild |
31 |
index 4c97b1574ba..091d8d84b10 100644 |
32 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
33 |
+++ b/dev-ros/rviz/rviz-1.14.1.ebuild |
34 |
@@ -4,7 +4,10 @@ |
35 |
EAPI=7 |
36 |
|
37 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
38 |
-KEYWORDS="" |
39 |
+KEYWORDS="~amd64" |
40 |
+CATKIN_HAS_MESSAGES=yes |
41 |
+ |
42 |
+CMAKE_MAKEFILE_GENERATOR=emake |
43 |
|
44 |
inherit ros-catkin virtualx |
45 |
|
46 |
@@ -45,26 +48,26 @@ RDEPEND=" |
47 |
dev-ros/urdf |
48 |
dev-ros/media_export |
49 |
|
50 |
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
51 |
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
52 |
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
53 |
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
54 |
+" |
55 |
+DEPEND="${RDEPEND} |
56 |
dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
57 |
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
58 |
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
59 |
dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
60 |
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] |
61 |
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
62 |
-" |
63 |
-DEPEND="${RDEPEND} |
64 |
- dev-ros/cmake_modules |
65 |
- virtual/pkgconfig |
66 |
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
67 |
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
68 |
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
69 |
test? ( |
70 |
dev-ros/rostest[${PYTHON_USEDEP}] |
71 |
dev-cpp/gtest |
72 |
)" |
73 |
- |
74 |
-src_configure() { |
75 |
- local mycatkincmakeargs=( "-DUseQt5=ON" ) |
76 |
- ros-catkin_src_configure |
77 |
-} |
78 |
+BDEPEND=" |
79 |
+ dev-ros/cmake_modules |
80 |
+ virtual/pkgconfig |
81 |
+" |
82 |
|
83 |
src_test() { |
84 |
virtx ros-catkin_src_test |
85 |
|
86 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild |
87 |
index 4c97b1574ba..091d8d84b10 100644 |
88 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
89 |
+++ b/dev-ros/rviz/rviz-9999.ebuild |
90 |
@@ -4,7 +4,10 @@ |
91 |
EAPI=7 |
92 |
|
93 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
94 |
-KEYWORDS="" |
95 |
+KEYWORDS="~amd64" |
96 |
+CATKIN_HAS_MESSAGES=yes |
97 |
+ |
98 |
+CMAKE_MAKEFILE_GENERATOR=emake |
99 |
|
100 |
inherit ros-catkin virtualx |
101 |
|
102 |
@@ -45,26 +48,26 @@ RDEPEND=" |
103 |
dev-ros/urdf |
104 |
dev-ros/media_export |
105 |
|
106 |
- dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
107 |
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
108 |
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
109 |
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] |
110 |
+" |
111 |
+DEPEND="${RDEPEND} |
112 |
dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
113 |
- dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
114 |
- dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] |
115 |
dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
116 |
dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] |
117 |
dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
118 |
-" |
119 |
-DEPEND="${RDEPEND} |
120 |
- dev-ros/cmake_modules |
121 |
- virtual/pkgconfig |
122 |
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
123 |
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
124 |
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] |
125 |
test? ( |
126 |
dev-ros/rostest[${PYTHON_USEDEP}] |
127 |
dev-cpp/gtest |
128 |
)" |
129 |
- |
130 |
-src_configure() { |
131 |
- local mycatkincmakeargs=( "-DUseQt5=ON" ) |
132 |
- ros-catkin_src_configure |
133 |
-} |
134 |
+BDEPEND=" |
135 |
+ dev-ros/cmake_modules |
136 |
+ virtual/pkgconfig |
137 |
+" |
138 |
|
139 |
src_test() { |
140 |
virtx ros-catkin_src_test |