1 |
commit: 6665d96340a282a5757bc092d0d2a5df46e4e87e |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 09:58:13 2016 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 12:18:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6665d963 |
7 |
|
8 |
sci-electronics/gazebo: remove old |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
sci-electronics/gazebo/Manifest | 2 - |
13 |
sci-electronics/gazebo/files/boost162.patch | 12 ----- |
14 |
sci-electronics/gazebo/files/tinyxml2.patch | 22 --------- |
15 |
sci-electronics/gazebo/gazebo-7.2.0.ebuild | 73 ---------------------------- |
16 |
sci-electronics/gazebo/gazebo-7.3.1.ebuild | 74 ----------------------------- |
17 |
5 files changed, 183 deletions(-) |
18 |
|
19 |
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest |
20 |
index e704c17..736cc65 100644 |
21 |
--- a/sci-electronics/gazebo/Manifest |
22 |
+++ b/sci-electronics/gazebo/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST gazebo-7.2.0.tar.bz2 51084680 SHA256 3e10501379236146f5393fcf02be419ce343bfa76b0f6670d43cc5bc13cd6fb1 SHA512 b484ef589fbcbe3262b257a6741f253ba23837c3585f42a857e7b03acf6dcbf7209a65f1fce9e4ee6df3b8a45a5124015c99e8708644f259e6d1275bbadab503 WHIRLPOOL 595146621ed9f6bbeecb325fddcacf048fadaff69338c2c8cefccb6e82669494d92000ae194e0a1941094491be3ec759165e8f8220fb7649cdb209ee66e5b60a |
25 |
-DIST gazebo-7.3.1.tar.bz2 50992794 SHA256 aeff031d9b1b72c94b06b2a87790e6b561f4cba0e1dce155269108b3237e5c62 SHA512 2ecf89efd5312efe2d7c2b27c898467b49f94e2dbe75c69c2e403262e11361bea0a701a61134bbbfe01f1723621e5ccfc44c6d40698c7c2e8608292e275b5ea5 WHIRLPOOL 50886561eb6d8fffaabeb90466ddee1ed57aefc9b9d8ef4d65cc9a311355a8abea62034289dcd15bbf185c697bda1575d2365f80b52f8922af734dbd5586f37f |
26 |
DIST gazebo-7.4.0.tar.bz2 50061936 SHA256 a033b2273383f16e5dd5b5bfe597551dc3618b98e64abecfa8a41bdddd6542f7 SHA512 924c0f20484af552190fd09a92f3148af2371ca4948db6783711083157324d97f49de58df97df3a67ffa5d8c61b1503096556b17b4451efcefa4f5253ac4d2ae WHIRLPOOL 090fa669ae514b0fd705368b04493eee18dad70be9205de52c6c06e07e24bb42b55ef4f5dc75b47718f991339fdb7149f8ecb1354f6ef5f73eb2ecb9ecf91b88 |
27 |
|
28 |
diff --git a/sci-electronics/gazebo/files/boost162.patch b/sci-electronics/gazebo/files/boost162.patch |
29 |
deleted file mode 100644 |
30 |
index e91643f..00000000 |
31 |
--- a/sci-electronics/gazebo/files/boost162.patch |
32 |
+++ /dev/null |
33 |
@@ -1,12 +0,0 @@ |
34 |
-Index: gazebo-7.3.1/gazebo/rendering/Camera.cc |
35 |
-=================================================================== |
36 |
---- gazebo-7.3.1.orig/gazebo/rendering/Camera.cc |
37 |
-+++ gazebo-7.3.1/gazebo/rendering/Camera.cc |
38 |
-@@ -25,6 +25,7 @@ |
39 |
- |
40 |
- #include <boost/algorithm/string.hpp> |
41 |
- #include <boost/filesystem.hpp> |
42 |
-+#include <boost/format.hpp> |
43 |
- #include <sdf/sdf.hh> |
44 |
- |
45 |
- #ifndef _WIN32 |
46 |
|
47 |
diff --git a/sci-electronics/gazebo/files/tinyxml2.patch b/sci-electronics/gazebo/files/tinyxml2.patch |
48 |
deleted file mode 100644 |
49 |
index b829201..00000000 |
50 |
--- a/sci-electronics/gazebo/files/tinyxml2.patch |
51 |
+++ /dev/null |
52 |
@@ -1,22 +0,0 @@ |
53 |
-Index: gazebo-7.3.1/gazebo/util/LogPlay.cc |
54 |
-=================================================================== |
55 |
---- gazebo-7.3.1.orig/gazebo/util/LogPlay.cc |
56 |
-+++ gazebo-7.3.1/gazebo/util/LogPlay.cc |
57 |
-@@ -72,7 +72,7 @@ void LogPlay::Open(const std::string &_l |
58 |
- |
59 |
- // Flag use to indicate if a parser failure has occurred |
60 |
- bool xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != |
61 |
-- tinyxml2::XML_NO_ERROR; |
62 |
-+ tinyxml2::XML_SUCCESS; |
63 |
- |
64 |
- // Parse the log file |
65 |
- if (xmlParserFail) |
66 |
-@@ -105,7 +105,7 @@ void LogPlay::Open(const std::string &_l |
67 |
- |
68 |
- // Retry loading the log file. |
69 |
- xmlParserFail = this->dataPtr->xmlDoc.LoadFile(_logFile.c_str()) != |
70 |
-- tinyxml2::XML_NO_ERROR; |
71 |
-+ tinyxml2::XML_SUCCESS; |
72 |
- } |
73 |
- } |
74 |
- } |
75 |
|
76 |
diff --git a/sci-electronics/gazebo/gazebo-7.2.0.ebuild b/sci-electronics/gazebo/gazebo-7.2.0.ebuild |
77 |
deleted file mode 100644 |
78 |
index c3b8b54..00000000 |
79 |
--- a/sci-electronics/gazebo/gazebo-7.2.0.ebuild |
80 |
+++ /dev/null |
81 |
@@ -1,73 +0,0 @@ |
82 |
-# Copyright 1999-2016 Gentoo Foundation |
83 |
-# Distributed under the terms of the GNU General Public License v2 |
84 |
-# $Id$ |
85 |
- |
86 |
-EAPI=5 |
87 |
- |
88 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
89 |
- |
90 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
91 |
-HOMEPAGE="http://gazebosim.org/" |
92 |
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
93 |
- |
94 |
-LICENSE="Apache-2.0" |
95 |
-SLOT="0" |
96 |
-KEYWORDS="~amd64" |
97 |
-IUSE="cpu_flags_x86_sse2 libav test" |
98 |
- |
99 |
-RDEPEND=" |
100 |
- =dev-libs/protobuf-2*:= |
101 |
- virtual/opengl |
102 |
- media-libs/openal |
103 |
- net-misc/curl |
104 |
- dev-libs/tinyxml |
105 |
- dev-libs/tinyxml2 |
106 |
- dev-libs/libtar |
107 |
- dev-cpp/tbb |
108 |
- >=dev-games/ogre-1.7.4 |
109 |
- sci-libs/libccd |
110 |
- libav? ( >=media-video/libav-9:0= ) |
111 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
112 |
- sci-libs/gts |
113 |
- >=sci-physics/bullet-2.82 |
114 |
- >=dev-libs/sdformat-4.1:= |
115 |
- dev-qt/qtcore:4 |
116 |
- dev-qt/qtgui:4 |
117 |
- dev-qt/qtwebkit:4 |
118 |
- dev-qt/qtxmlpatterns:4 |
119 |
- dev-libs/boost:=[threads] |
120 |
- sci-libs/gdal |
121 |
- virtual/libusb:1 |
122 |
- dev-libs/libspnav |
123 |
- media-libs/freeimage |
124 |
- sci-libs/hdf5:= |
125 |
- sys-apps/util-linux |
126 |
- media-gfx/graphviz |
127 |
- >=sci-libs/ignition-math-2.3:2= |
128 |
- net-libs/ignition-transport:= |
129 |
-" |
130 |
-DEPEND="${RDEPEND} |
131 |
- dev-qt/qttest:4 |
132 |
- app-text/ronn |
133 |
- virtual/pkgconfig |
134 |
- x11-apps/mesa-progs |
135 |
- test? ( dev-libs/libxslt ) |
136 |
-" |
137 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
138 |
- |
139 |
-src_configure() { |
140 |
- # doesnt build without it |
141 |
- append-cxxflags "-std=c++11" |
142 |
- # doesnt build with as-needed either |
143 |
- append-ldflags "-Wl,--no-as-needed" |
144 |
- |
145 |
- local mycmakeargs=( |
146 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
147 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
148 |
- "-DUSE_HOST_CFLAGS=FALSE" |
149 |
- "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" |
150 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
151 |
- "-DUSE_EXTERNAL_TINYXML2=TRUE" |
152 |
- ) |
153 |
- cmake-utils_src_configure |
154 |
-} |
155 |
|
156 |
diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild |
157 |
deleted file mode 100644 |
158 |
index 01d18e8..00000000 |
159 |
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,74 +0,0 @@ |
162 |
-# Copyright 1999-2016 Gentoo Foundation |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
-# $Id$ |
165 |
- |
166 |
-EAPI=5 |
167 |
- |
168 |
-inherit cmake-utils versionator vcs-snapshot flag-o-matic |
169 |
- |
170 |
-DESCRIPTION="A 3D multiple robot simulator with dynamics" |
171 |
-HOMEPAGE="http://gazebosim.org/" |
172 |
-SRC_URI="http://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2" |
173 |
- |
174 |
-LICENSE="Apache-2.0" |
175 |
-SLOT="0" |
176 |
-KEYWORDS="~amd64" |
177 |
-IUSE="cpu_flags_x86_sse2 libav test" |
178 |
- |
179 |
-RDEPEND=" |
180 |
- =dev-libs/protobuf-2*:= |
181 |
- virtual/opengl |
182 |
- media-libs/openal |
183 |
- net-misc/curl |
184 |
- dev-libs/tinyxml |
185 |
- dev-libs/tinyxml2 |
186 |
- dev-libs/libtar |
187 |
- dev-cpp/tbb |
188 |
- >=dev-games/ogre-1.7.4 |
189 |
- sci-libs/libccd |
190 |
- libav? ( >=media-video/libav-9:0= ) |
191 |
- !libav? ( >=media-video/ffmpeg-2.6:0= ) |
192 |
- sci-libs/gts |
193 |
- >=sci-physics/bullet-2.82 |
194 |
- >=dev-libs/sdformat-4.1:= |
195 |
- dev-qt/qtcore:4 |
196 |
- dev-qt/qtgui:4 |
197 |
- dev-qt/qtwebkit:4 |
198 |
- dev-qt/qtxmlpatterns:4 |
199 |
- dev-libs/boost:=[threads] |
200 |
- sci-libs/gdal |
201 |
- virtual/libusb:1 |
202 |
- dev-libs/libspnav |
203 |
- media-libs/freeimage |
204 |
- sci-libs/hdf5:= |
205 |
- sys-apps/util-linux |
206 |
- media-gfx/graphviz |
207 |
- >=sci-libs/ignition-math-2.3:2= |
208 |
- net-libs/ignition-transport:= |
209 |
-" |
210 |
-DEPEND="${RDEPEND} |
211 |
- dev-qt/qttest:4 |
212 |
- app-text/ronn |
213 |
- virtual/pkgconfig |
214 |
- x11-apps/mesa-progs |
215 |
- test? ( dev-libs/libxslt ) |
216 |
-" |
217 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
218 |
-PATCHES=( "${FILESDIR}/tinyxml2.patch" "${FILESDIR}/boost162.patch" ) |
219 |
- |
220 |
-src_configure() { |
221 |
- # doesnt build without it |
222 |
- append-cxxflags "-std=c++11" |
223 |
- # doesnt build with as-needed either |
224 |
- append-ldflags "-Wl,--no-as-needed" |
225 |
- |
226 |
- local mycmakeargs=( |
227 |
- "-DUSE_UPSTREAM_CFLAGS=OFF" |
228 |
- "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)" |
229 |
- "-DUSE_HOST_CFLAGS=FALSE" |
230 |
- "-DENABLE_TESTS_COMPILATION=$(usex test TRUE FALSE)" |
231 |
- "-DENABLE_SCREEN_TESTS=FALSE" |
232 |
- "-DUSE_EXTERNAL_TINYXML2=TRUE" |
233 |
- ) |
234 |
- cmake-utils_src_configure |
235 |
-} |