1 |
commit: 2bada84c86922d41c82ac1121c47275be2d418f8 |
2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 23 23:52:38 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 2 00:28:27 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bada84c |
7 |
|
8 |
dev-ros/rviz: EAPI 7, force single-precision ogre |
9 |
|
10 |
Bug: https://bugs.gentoo.org/710540 |
11 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
12 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/14757 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
dev-ros/rviz/{rviz-9999.ebuild => rviz-1.13.1-r2.ebuild} | 13 ++++--------- |
17 |
dev-ros/rviz/{rviz-9999.ebuild => rviz-1.13.3-r1.ebuild} | 13 ++++--------- |
18 |
dev-ros/rviz/{rviz-9999.ebuild => rviz-1.13.6-r1.ebuild} | 7 +++---- |
19 |
dev-ros/rviz/rviz-9999.ebuild | 9 ++++----- |
20 |
4 files changed, 15 insertions(+), 27 deletions(-) |
21 |
|
22 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.13.1-r2.ebuild |
23 |
similarity index 90% |
24 |
copy from dev-ros/rviz/rviz-9999.ebuild |
25 |
copy to dev-ros/rviz/rviz-1.13.1-r2.ebuild |
26 |
index 358973db867..787bbed37b6 100644 |
27 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
28 |
+++ b/dev-ros/rviz/rviz-1.13.1-r2.ebuild |
29 |
@@ -1,13 +1,12 @@ |
30 |
-# Copyright 1999-2019 Gentoo Authors |
31 |
+# Copyright 1999-2020 Gentoo Authors |
32 |
# Distributed under the terms of the GNU General Public License v2 |
33 |
|
34 |
-EAPI=5 |
35 |
+EAPI="7" |
36 |
|
37 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
38 |
KEYWORDS="~amd64" |
39 |
-PYTHON_COMPAT=( python2_7 ) |
40 |
|
41 |
-inherit ros-catkin virtualx |
42 |
+inherit ros-catkin |
43 |
|
44 |
DESCRIPTION="3D visualization tool for ROS" |
45 |
LICENSE="BSD" |
46 |
@@ -17,7 +16,7 @@ IUSE="" |
47 |
RDEPEND=" |
48 |
dev-libs/boost:=[threads] |
49 |
media-libs/assimp |
50 |
- <dev-games/ogre-1.10:= |
51 |
+ <dev-games/ogre-1.10:=[-double-precision] |
52 |
virtual/opengl |
53 |
dev-qt/qtwidgets:5 |
54 |
dev-qt/qtcore:5 |
55 |
@@ -66,7 +65,3 @@ src_configure() { |
56 |
local mycatkincmakeargs=( "-DUseQt5=ON" ) |
57 |
ros-catkin_src_configure |
58 |
} |
59 |
- |
60 |
-src_test() { |
61 |
- virtx ros-catkin_src_test |
62 |
-} |
63 |
|
64 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.13.3-r1.ebuild |
65 |
similarity index 90% |
66 |
copy from dev-ros/rviz/rviz-9999.ebuild |
67 |
copy to dev-ros/rviz/rviz-1.13.3-r1.ebuild |
68 |
index 358973db867..787bbed37b6 100644 |
69 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
70 |
+++ b/dev-ros/rviz/rviz-1.13.3-r1.ebuild |
71 |
@@ -1,13 +1,12 @@ |
72 |
-# Copyright 1999-2019 Gentoo Authors |
73 |
+# Copyright 1999-2020 Gentoo Authors |
74 |
# Distributed under the terms of the GNU General Public License v2 |
75 |
|
76 |
-EAPI=5 |
77 |
+EAPI="7" |
78 |
|
79 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
80 |
KEYWORDS="~amd64" |
81 |
-PYTHON_COMPAT=( python2_7 ) |
82 |
|
83 |
-inherit ros-catkin virtualx |
84 |
+inherit ros-catkin |
85 |
|
86 |
DESCRIPTION="3D visualization tool for ROS" |
87 |
LICENSE="BSD" |
88 |
@@ -17,7 +16,7 @@ IUSE="" |
89 |
RDEPEND=" |
90 |
dev-libs/boost:=[threads] |
91 |
media-libs/assimp |
92 |
- <dev-games/ogre-1.10:= |
93 |
+ <dev-games/ogre-1.10:=[-double-precision] |
94 |
virtual/opengl |
95 |
dev-qt/qtwidgets:5 |
96 |
dev-qt/qtcore:5 |
97 |
@@ -66,7 +65,3 @@ src_configure() { |
98 |
local mycatkincmakeargs=( "-DUseQt5=ON" ) |
99 |
ros-catkin_src_configure |
100 |
} |
101 |
- |
102 |
-src_test() { |
103 |
- virtx ros-catkin_src_test |
104 |
-} |
105 |
|
106 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-1.13.6-r1.ebuild |
107 |
similarity index 94% |
108 |
copy from dev-ros/rviz/rviz-9999.ebuild |
109 |
copy to dev-ros/rviz/rviz-1.13.6-r1.ebuild |
110 |
index 358973db867..1e9f682c7ff 100644 |
111 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
112 |
+++ b/dev-ros/rviz/rviz-1.13.6-r1.ebuild |
113 |
@@ -1,11 +1,10 @@ |
114 |
-# Copyright 1999-2019 Gentoo Authors |
115 |
+# Copyright 1999-2020 Gentoo Authors |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
|
118 |
-EAPI=5 |
119 |
+EAPI="7" |
120 |
|
121 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
122 |
KEYWORDS="~amd64" |
123 |
-PYTHON_COMPAT=( python2_7 ) |
124 |
|
125 |
inherit ros-catkin virtualx |
126 |
|
127 |
@@ -17,7 +16,7 @@ IUSE="" |
128 |
RDEPEND=" |
129 |
dev-libs/boost:=[threads] |
130 |
media-libs/assimp |
131 |
- <dev-games/ogre-1.10:= |
132 |
+ <dev-games/ogre-1.10:=[-double-precision] |
133 |
virtual/opengl |
134 |
dev-qt/qtwidgets:5 |
135 |
dev-qt/qtcore:5 |
136 |
|
137 |
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild |
138 |
index 358973db867..4c97b1574ba 100644 |
139 |
--- a/dev-ros/rviz/rviz-9999.ebuild |
140 |
+++ b/dev-ros/rviz/rviz-9999.ebuild |
141 |
@@ -1,11 +1,10 @@ |
142 |
-# Copyright 1999-2019 Gentoo Authors |
143 |
+# Copyright 1999-2020 Gentoo Authors |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
|
146 |
-EAPI=5 |
147 |
+EAPI=7 |
148 |
|
149 |
ROS_REPO_URI="https://github.com/ros-visualization/rviz" |
150 |
-KEYWORDS="~amd64" |
151 |
-PYTHON_COMPAT=( python2_7 ) |
152 |
+KEYWORDS="" |
153 |
|
154 |
inherit ros-catkin virtualx |
155 |
|
156 |
@@ -17,7 +16,7 @@ IUSE="" |
157 |
RDEPEND=" |
158 |
dev-libs/boost:=[threads] |
159 |
media-libs/assimp |
160 |
- <dev-games/ogre-1.10:= |
161 |
+ <dev-games/ogre-1.10:=[-double-precision] |
162 |
virtual/opengl |
163 |
dev-qt/qtwidgets:5 |
164 |
dev-qt/qtcore:5 |