1 |
commit: a5da9dec25cc7e8b323cfc6c4e3cdff66750c925 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 29 09:51:41 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 29 20:28:02 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da9dec |
7 |
|
8 |
sci-electronics/gazebo: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
sci-electronics/gazebo/Manifest | 2 - |
13 |
sci-electronics/gazebo/files/tests.patch | 46 ------------------ |
14 |
sci-electronics/gazebo/gazebo-8.0.0.ebuild | 77 ------------------------------ |
15 |
sci-electronics/gazebo/gazebo-8.1.0.ebuild | 77 ------------------------------ |
16 |
4 files changed, 202 deletions(-) |
17 |
|
18 |
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest |
19 |
index f1118838fb7..4a2024f0bed 100644 |
20 |
--- a/sci-electronics/gazebo/Manifest |
21 |
+++ b/sci-electronics/gazebo/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST gazebo-8.0.0.tar.bz2 52472089 SHA256 ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12 SHA512 51890faebe50112fcdc4f53cb8e7be583f62e9690ffdfab1bc2346a79157a7e796830f58f64573c3fbe1caa7653b2fb0be514f43dfd36545bf9c8ab8d580ffee WHIRLPOOL ff351dad7bede38d1b1749cfb74b18c853c11e9e3db89d112586ce4cdfa51efebb7ab9c06f32e2ff2b5ed6a1b687a44da238de91c6254e12b82f722ba9dc1ade |
24 |
-DIST gazebo-8.1.0.tar.bz2 52442394 SHA256 d24cda8919c49cd0b15a51975d551eed1c7c0bfba7b9aa2b1ca9711bf9441e5e SHA512 d451d068a44c487e7b0a6cef17bbffaa39ec4bb08593c4c05d8c758dd56c1bcdb52e6284254c0d27a984761c0eb944012b8a1061bebf47662f6f3c91d3be955c WHIRLPOOL 82f85c1b115e585f352f2fce9b3fac0fc4fa1a35c4c24ffc00b45fe4dc33bd13df655c6f64acd652b1707af3a2756279c572650da5c52eec27d52414c8a45e7d |
25 |
DIST gazebo-8.1.1.tar.bz2 52448136 SHA256 bca3e36c064d80993a6c4cd53c369e0762c4a8e51e0ee145c20d005fd8d63949 SHA512 bf5585e63cfb5a86b89a0e802c33ff07c5753e94b9282610d2ea1a4248af705a1c80ea52389b4a7c49f51ec1990e2c9a5e3a6a74fefebe1b20e70960ceb755e8 WHIRLPOOL dfd2fe727dacaf58d6a9b1344ef5c00170ce6d109fa159f2379bbebaa6899ce9011cb2f7863faffaa3a34905c04485957a4a574bc9b10307cf22d0a283ef51a3 |
26 |
|
27 |
diff --git a/sci-electronics/gazebo/files/tests.patch b/sci-electronics/gazebo/files/tests.patch |
28 |
deleted file mode 100644 |
29 |
index 4f06acbc0ee..00000000000 |
30 |
--- a/sci-electronics/gazebo/files/tests.patch |
31 |
+++ /dev/null |
32 |
@@ -1,46 +0,0 @@ |
33 |
-Index: gazebo-8.0.0/test/integration/physics_link.cc |
34 |
-=================================================================== |
35 |
---- gazebo-8.0.0.orig/test/integration/physics_link.cc |
36 |
-+++ gazebo-8.0.0/test/integration/physics_link.cc |
37 |
-@@ -199,7 +199,7 @@ void PhysicsLinkTest::AddForce(const std |
38 |
- gzdbg << "World != link == inertial frames, no offset" << std::endl; |
39 |
- model->SetLinkWorldPose(ignition::math::Pose3d( |
40 |
- ignition::math::Vector3d(2, 3, 4), |
41 |
-- ignition::math::Vector3d(0, IGN_PI/2.0, 1)), link); |
42 |
-+ ignition::math::Quaterniond(0, IGN_PI/2.0, 1)), link); |
43 |
- EXPECT_NE(ignition::math::Pose3d::Zero, link->WorldPose()); |
44 |
- EXPECT_EQ(link->WorldPose(), link->WorldInertialPose()); |
45 |
- this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(-1, 10, 5)); |
46 |
-@@ -215,7 +215,7 @@ void PhysicsLinkTest::AddForce(const std |
47 |
- model->SetLinkWorldPose(ignition::math::Pose3d::Zero, link); |
48 |
- ignition::math::Pose3d inertialPose = ignition::math::Pose3d( |
49 |
- ignition::math::Vector3d(1, 5, 8), |
50 |
-- ignition::math::Vector3d(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4)); |
51 |
-+ ignition::math::Quaterniond(IGN_PI/3.0, IGN_PI*1.5, IGN_PI/4)); |
52 |
- link->GetInertial()->SetCoG(inertialPose); |
53 |
- EXPECT_EQ(ignition::math::Pose3d::Zero, link->WorldPose()); |
54 |
- EXPECT_EQ(inertialPose, link->WorldInertialPose()); |
55 |
-@@ -224,9 +224,9 @@ void PhysicsLinkTest::AddForce(const std |
56 |
- gzdbg << "World != link != inertial frames, with offset" << std::endl; |
57 |
- model->SetLinkWorldPose(ignition::math::Pose3d( |
58 |
- ignition::math::Vector3d(5, 10, -4), |
59 |
-- ignition::math::Vector3d(0, IGN_PI/2.0, IGN_PI/6)), link); |
60 |
-+ ignition::math::Quaterniond(0, IGN_PI/2.0, IGN_PI/6)), link); |
61 |
- inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(0, -5, 10), |
62 |
-- ignition::math::Vector3d(0, 2.0*IGN_PI, IGN_PI/3)); |
63 |
-+ ignition::math::Quaterniond(0, 2.0*IGN_PI, IGN_PI/3)); |
64 |
- link->GetInertial()->SetCoG(inertialPose); |
65 |
- this->AddLinkForceTwoWays(world, link, ignition::math::Vector3d(1, 2, 1), |
66 |
- ignition::math::Vector3d(-2, 0.5, 1)); |
67 |
-@@ -235,9 +235,9 @@ void PhysicsLinkTest::AddForce(const std |
68 |
- << std::endl; |
69 |
- model->SetLinkWorldPose(ignition::math::Pose3d( |
70 |
- ignition::math::Vector3d(-1.5, 0.8, 3), |
71 |
-- ignition::math::Vector3d(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link); |
72 |
-+ ignition::math::Quaterniond(-IGN_PI/4.5, IGN_PI/3.0, IGN_PI*1.2)), link); |
73 |
- inertialPose = ignition::math::Pose3d(ignition::math::Vector3d(1, 0, -5.6), |
74 |
-- ignition::math::Vector3d(IGN_PI/9, 0, IGN_PI*3)); |
75 |
-+ ignition::math::Quaterniond(IGN_PI/9, 0, IGN_PI*3)); |
76 |
- link->GetInertial()->SetCoG(inertialPose); |
77 |
- link->SetLinearVel(ignition::math::Vector3d(2, -0.1, 5)); |
78 |
- link->SetAngularVel(ignition::math::Vector3d(-IGN_PI/10, 0, 0.0001)); |
79 |
|
80 |
diff --git a/sci-electronics/gazebo/gazebo-8.0.0.ebuild b/sci-electronics/gazebo/gazebo-8.0.0.ebuild |
81 |
deleted file mode 100644 |
82 |
index b63f695c4c9..00000000000 |
83 |
--- a/sci-electronics/gazebo/gazebo-8.0.0.ebuild |
84 |
+++ /dev/null |
85 |
@@ -1,77 +0,0 @@ |
86 |
-# Copyright 1999-2017 Gentoo Foundation |
87 |
-# Distributed under the terms of the GNU General Public License v2 |
88 |
- |
89 |
-EAPI=5 |
90 |
- |
91 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
92 |
- |
93 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
94 |
-HOMEPAGE="http://gazebosim.org/" |
95 |
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
96 |
- |
97 |
-LICENSE="Apache-2.0" |
98 |
-# Subslot = major version = soname of libs |
99 |
-SLOT="0/8" |
100 |
-KEYWORDS="~amd64" |
101 |
-IUSE="cpu_flags_x86_sse2 libav test" |
102 |
- |
103 |
-RDEPEND=" |
104 |
- >=dev-libs/protobuf-2:= |
105 |
- virtual/opengl |
106 |
- media-libs/openal |
107 |
- net-misc/curl |
108 |
- dev-libs/tinyxml |
109 |
- dev-libs/tinyxml2 |
110 |
- dev-libs/libtar |
111 |
- dev-cpp/tbb |
112 |
- >=dev-games/ogre-1.7.4[freeimage] |
113 |
- >=media-libs/freeimage-3.15.4[png] |
114 |
- sci-libs/libccd |
115 |
- libav? ( >=media-video/libav-9:0= ) |
116 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
117 |
- sci-libs/gts |
118 |
- >=sci-physics/bullet-2.82 |
119 |
- >=dev-libs/sdformat-5.0:= |
120 |
- dev-qt/qtwidgets:5 |
121 |
- dev-qt/qtcore:5 |
122 |
- dev-qt/qtopengl:5 |
123 |
- dev-libs/boost:=[threads] |
124 |
- sci-libs/gdal |
125 |
- virtual/libusb:1 |
126 |
- dev-libs/libspnav |
127 |
- media-libs/freeimage |
128 |
- sci-libs/hdf5:= |
129 |
- sys-apps/util-linux |
130 |
- media-gfx/graphviz |
131 |
- net-libs/ignition-msgs:= |
132 |
- >=sci-libs/ignition-math-2.3:3= |
133 |
- net-libs/ignition-transport:3= |
134 |
- x11-libs/qwt:6=[qt5] |
135 |
-" |
136 |
-DEPEND="${RDEPEND} |
137 |
- dev-qt/qttest:5 |
138 |
- app-text/ronn |
139 |
- app-arch/gzip |
140 |
- virtual/pkgconfig |
141 |
- x11-apps/mesa-progs |
142 |
- test? ( dev-libs/libxslt ) |
143 |
-" |
144 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
145 |
-PATCHES=( "${FILESDIR}/qwt.patch" "${FILESDIR}/tests.patch" ) |
146 |
- |
147 |
-src_configure() { |
148 |
- # doesnt build without it |
149 |
- append-cxxflags "-std=c++11" |
150 |
- # doesnt build with as-needed either |
151 |
- append-ldflags "-Wl,--no-as-needed" |
152 |
- |
153 |
- local mycmakeargs=( |
154 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
155 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
156 |
- "-DUSE_HOST_CFLAGS=FALSE" |
157 |
- "-DBUILD_TESTING=$(usex test TRUE FALSE)" |
158 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
159 |
- "-DUSE_EXTERNAL_TINYXML2=TRUE" |
160 |
- ) |
161 |
- cmake-utils_src_configure |
162 |
-} |
163 |
|
164 |
diff --git a/sci-electronics/gazebo/gazebo-8.1.0.ebuild b/sci-electronics/gazebo/gazebo-8.1.0.ebuild |
165 |
deleted file mode 100644 |
166 |
index 92b92dfc69c..00000000000 |
167 |
--- a/sci-electronics/gazebo/gazebo-8.1.0.ebuild |
168 |
+++ /dev/null |
169 |
@@ -1,77 +0,0 @@ |
170 |
-# Copyright 1999-2017 Gentoo Foundation |
171 |
-# Distributed under the terms of the GNU General Public License v2 |
172 |
- |
173 |
-EAPI=5 |
174 |
- |
175 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
176 |
- |
177 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
178 |
-HOMEPAGE="http://gazebosim.org/" |
179 |
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
180 |
- |
181 |
-LICENSE="Apache-2.0" |
182 |
-# Subslot = major version = soname of libs |
183 |
-SLOT="0/8" |
184 |
-KEYWORDS="~amd64" |
185 |
-IUSE="cpu_flags_x86_sse2 libav test" |
186 |
- |
187 |
-RDEPEND=" |
188 |
- >=dev-libs/protobuf-2:= |
189 |
- virtual/opengl |
190 |
- media-libs/openal |
191 |
- net-misc/curl |
192 |
- dev-libs/tinyxml |
193 |
- dev-libs/tinyxml2 |
194 |
- dev-libs/libtar |
195 |
- dev-cpp/tbb |
196 |
- >=dev-games/ogre-1.7.4[freeimage] |
197 |
- >=media-libs/freeimage-3.15.4[png] |
198 |
- sci-libs/libccd |
199 |
- libav? ( >=media-video/libav-9:0= ) |
200 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
201 |
- sci-libs/gts |
202 |
- >=sci-physics/bullet-2.82 |
203 |
- >=dev-libs/sdformat-5.0:= |
204 |
- dev-qt/qtwidgets:5 |
205 |
- dev-qt/qtcore:5 |
206 |
- dev-qt/qtopengl:5 |
207 |
- dev-libs/boost:=[threads] |
208 |
- sci-libs/gdal |
209 |
- virtual/libusb:1 |
210 |
- dev-libs/libspnav |
211 |
- media-libs/freeimage |
212 |
- sci-libs/hdf5:=[cxx] |
213 |
- sys-apps/util-linux |
214 |
- media-gfx/graphviz |
215 |
- net-libs/ignition-msgs:= |
216 |
- >=sci-libs/ignition-math-2.3:3= |
217 |
- net-libs/ignition-transport:3= |
218 |
- x11-libs/qwt:6=[qt5] |
219 |
-" |
220 |
-DEPEND="${RDEPEND} |
221 |
- dev-qt/qttest:5 |
222 |
- app-text/ronn |
223 |
- app-arch/gzip |
224 |
- virtual/pkgconfig |
225 |
- x11-apps/mesa-progs |
226 |
- test? ( dev-libs/libxslt ) |
227 |
-" |
228 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
229 |
-PATCHES=( "${FILESDIR}/qwt.patch" ) |
230 |
- |
231 |
-src_configure() { |
232 |
- # doesnt build without it |
233 |
- append-cxxflags "-std=c++11" |
234 |
- # doesnt build with as-needed either |
235 |
- append-ldflags "-Wl,--no-as-needed" |
236 |
- |
237 |
- local mycmakeargs=( |
238 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
239 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
240 |
- "-DUSE_HOST_CFLAGS=FALSE" |
241 |
- "-DBUILD_TESTING=$(usex test TRUE FALSE)" |
242 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
243 |
- "-DUSE_EXTERNAL_TINYXML2=TRUE" |
244 |
- ) |
245 |
- cmake-utils_src_configure |
246 |
-} |