Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/gazebo/, sci-electronics/gazebo/files/
Date: Thu, 23 Jun 2022 11:10:42
Message-Id: 1655982633.a99d564dfb07a5484c1ecdf04c76e95f6e26d9de.aballier@gentoo
1 commit: a99d564dfb07a5484c1ecdf04c76e95f6e26d9de
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 23 10:03:37 2022 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 23 11:10:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a99d564d
7
8 sci-electronics/gazebo: Remove old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 sci-electronics/gazebo/Manifest | 2 -
14 sci-electronics/gazebo/files/qwt.patch | 17 ------
15 sci-electronics/gazebo/gazebo-11.10.1.ebuild | 85 --------------------------
16 sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild | 83 -------------------------
17 4 files changed, 187 deletions(-)
18
19 diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
20 index f643396f6d4b..20ee674fb53d 100644
21 --- a/sci-electronics/gazebo/Manifest
22 +++ b/sci-electronics/gazebo/Manifest
23 @@ -1,3 +1 @@
24 -DIST gazebo-11.10.1.tar.bz2 56483769 BLAKE2B 9d0aa1d8c21065fddc28d706632cc7bd1b8a3429c606ff51dcbe4657ec41fdfe60e2906dfd5efdcd8d6f1847694d8419957b386bc40aafac739e3277b7c577ab SHA512 ed78aebf0d53a7848dd0900f96082ae508f64bc8fe53277859b32880147643a1b1ff9c273cddfd9e34e8ec4ec53f93d13ba74f3edca16fdcf5e2a040509c5dc3
25 DIST gazebo-11.10.2.tar.bz2 56496495 BLAKE2B 09bf370531214e9567d961445797cb50c9e5a81a405720c580d13e6b33029a63dd2cd9930dcbd239c1bf9091a9d5b092bfdef77b0b3524d281a10549e22e7c9a SHA512 8900c483f63cedb8543cfe718b336e3ec372fc0dc3d47ac9cd5378987fae634f16911d3c91fdf70add93b4a090e92f3558beec6c1277e1ba109652dcaf049ac2
26 -DIST gazebo-11.9.1.tar.bz2 56472954 BLAKE2B c7a1c3c4a03112a90e8a0cb35dde32f5bb478dafb0d8c582d8cbad15ff1f43699782df3d69a75c47efec44d8a15ad96730f1ae9c1b5b0b1ff2099fbc6b8f2e4e SHA512 51af82305ef0758950e2752624cd98bd31abe55469a1cad6432b1edde1a8f896798a554c672f8694c080f7076d13fe1aa91b182227e26f04cb99e9e0f3907694
27
28 diff --git a/sci-electronics/gazebo/files/qwt.patch b/sci-electronics/gazebo/files/qwt.patch
29 deleted file mode 100644
30 index d4f1538900bc..000000000000
31 --- a/sci-electronics/gazebo/files/qwt.patch
32 +++ /dev/null
33 @@ -1,17 +0,0 @@
34 -Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
35 -===================================================================
36 ---- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
37 -+++ gazebo-8.0.0/cmake/SearchForStuff.cmake
38 -@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
39 - /usr/local/lib/qwt.framework/Headers
40 - ${QWT_WIN_INCLUDE_DIR}
41 -
42 -- PATH_SUFFIXES qwt qwt5
43 -+ PATH_SUFFIXES qwt6
44 - )
45 -
46 --find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
47 -+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
48 - /usr/lib
49 - /usr/local/lib
50 - /usr/local/lib/qwt.framework
51
52 diff --git a/sci-electronics/gazebo/gazebo-11.10.1.ebuild b/sci-electronics/gazebo/gazebo-11.10.1.ebuild
53 deleted file mode 100644
54 index 3291c74fa777..000000000000
55 --- a/sci-electronics/gazebo/gazebo-11.10.1.ebuild
56 +++ /dev/null
57 @@ -1,85 +0,0 @@
58 -# Copyright 1999-2022 Gentoo Authors
59 -# Distributed under the terms of the GNU General Public License v2
60 -
61 -EAPI=7
62 -
63 -inherit cmake flag-o-matic
64 -
65 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
66 -HOMEPAGE="http://gazebosim.org/"
67 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
68 -
69 -LICENSE="Apache-2.0"
70 -# Subslot = major version = soname of libs
71 -SLOT="0/11"
72 -KEYWORDS="~amd64"
73 -IUSE="cpu_flags_x86_sse2 test"
74 -RESTRICT="!test? ( test )"
75 -
76 -RDEPEND="
77 - >=dev-libs/protobuf-2:=
78 - virtual/opengl
79 - media-libs/openal
80 - net-misc/curl
81 - dev-libs/tinyxml
82 - >=dev-libs/tinyxml2-6:=
83 - dev-libs/libtar
84 - <dev-cpp/tbb-2021:=
85 - >=dev-games/ogre-1.7.4:=[freeimage]
86 - <dev-games/ogre-1.10
87 - >=media-libs/freeimage-3.15.4[png]
88 - sci-libs/libccd
89 - >=media-video/ffmpeg-2.6:0=
90 - sci-libs/gts
91 - >=sci-physics/bullet-2.82:=
92 - >=dev-libs/sdformat-9.1:=
93 - dev-qt/qtwidgets:5
94 - dev-qt/qtcore:5
95 - dev-qt/qtopengl:5
96 - dev-libs/boost:=[threads(+)]
97 - sci-libs/gdal:=
98 - virtual/libusb:1
99 - dev-libs/libspnav
100 - media-libs/freeimage
101 - sci-libs/hdf5:=[cxx]
102 - sys-apps/util-linux
103 - media-gfx/graphviz
104 - net-libs/ignition-msgs:5=
105 - sci-libs/ignition-math:6=
106 - net-libs/ignition-transport:8=
107 - sci-libs/ignition-common:3=
108 - sci-libs/ignition-fuel-tools:4=
109 - <x11-libs/qwt-6.2.0:6=[qt5(+)]
110 -"
111 -DEPEND="${RDEPEND}
112 - dev-qt/qttest:5
113 - x11-apps/mesa-progs
114 - test? ( dev-libs/libxslt )
115 -"
116 -BDEPEND="
117 - || ( app-text/ronn-ng app-text/ronn )
118 - app-arch/gzip
119 - virtual/pkgconfig
120 -"
121 -CMAKE_BUILD_TYPE=RelWithDebInfo
122 -PATCHES=(
123 - "${FILESDIR}/qwt.patch"
124 - "${FILESDIR}/cmake.patch"
125 - "${FILESDIR}/ffmpeg5.patch"
126 - "${FILESDIR}/ffmpeg4.patch"
127 -)
128 -
129 -src_configure() {
130 - # find OGRE properly
131 - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
132 -
133 - local mycmakeargs=(
134 - "-DUSE_UPSTREAM_CFLAGS=OFF"
135 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
136 - "-DUSE_HOST_CFLAGS=FALSE"
137 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
138 - "-DENABLE_SCREEN_TESTS=FALSE"
139 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
140 - )
141 - cmake_src_configure
142 -}
143
144 diff --git a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild b/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
145 deleted file mode 100644
146 index f34484f385e7..000000000000
147 --- a/sci-electronics/gazebo/gazebo-11.9.1-r1.ebuild
148 +++ /dev/null
149 @@ -1,83 +0,0 @@
150 -# Copyright 1999-2022 Gentoo Authors
151 -# Distributed under the terms of the GNU General Public License v2
152 -
153 -EAPI=7
154 -
155 -inherit cmake flag-o-matic
156 -
157 -DESCRIPTION="A 3D multiple robot simulator with dynamics"
158 -HOMEPAGE="http://gazebosim.org/"
159 -SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
160 -
161 -LICENSE="Apache-2.0"
162 -# Subslot = major version = soname of libs
163 -SLOT="0/11"
164 -KEYWORDS="~amd64"
165 -IUSE="cpu_flags_x86_sse2 test"
166 -RESTRICT="!test? ( test )"
167 -
168 -RDEPEND="
169 - >=dev-libs/protobuf-2:=
170 - virtual/opengl
171 - media-libs/openal
172 - net-misc/curl
173 - dev-libs/tinyxml
174 - >=dev-libs/tinyxml2-6:=
175 - dev-libs/libtar
176 - <dev-cpp/tbb-2021:=
177 - >=dev-games/ogre-1.7.4:=[freeimage]
178 - <dev-games/ogre-1.10
179 - >=media-libs/freeimage-3.15.4[png]
180 - sci-libs/libccd
181 - >=media-video/ffmpeg-2.6:0=
182 - sci-libs/gts
183 - >=sci-physics/bullet-2.82:=
184 - >=dev-libs/sdformat-9.1:=
185 - dev-qt/qtwidgets:5
186 - dev-qt/qtcore:5
187 - dev-qt/qtopengl:5
188 - dev-libs/boost:=[threads(+)]
189 - sci-libs/gdal:=
190 - virtual/libusb:1
191 - dev-libs/libspnav
192 - media-libs/freeimage
193 - sci-libs/hdf5:=[cxx]
194 - sys-apps/util-linux
195 - media-gfx/graphviz
196 - net-libs/ignition-msgs:5=
197 - sci-libs/ignition-math:6=
198 - net-libs/ignition-transport:8=
199 - sci-libs/ignition-common:3=
200 - sci-libs/ignition-fuel-tools:4=
201 - <x11-libs/qwt-6.2.0:6=[qt5(+)]
202 -"
203 -DEPEND="${RDEPEND}
204 - dev-qt/qttest:5
205 - x11-apps/mesa-progs
206 - test? ( dev-libs/libxslt )
207 -"
208 -BDEPEND="
209 - || ( app-text/ronn-ng app-text/ronn )
210 - app-arch/gzip
211 - virtual/pkgconfig
212 -"
213 -CMAKE_BUILD_TYPE=RelWithDebInfo
214 -PATCHES=(
215 - "${FILESDIR}/qwt.patch"
216 - "${FILESDIR}/cmake.patch"
217 -)
218 -
219 -src_configure() {
220 - # find OGRE properly
221 - sed -e "s#lib/OGRE#$(get_libdir)/OGRE#" -i cmake/gazebo-config.cmake.in || die
222 -
223 - local mycmakeargs=(
224 - "-DUSE_UPSTREAM_CFLAGS=OFF"
225 - "-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
226 - "-DUSE_HOST_CFLAGS=FALSE"
227 - "-DBUILD_TESTING=$(usex test TRUE FALSE)"
228 - "-DENABLE_SCREEN_TESTS=FALSE"
229 - "-DUSE_EXTERNAL_TINYXML2=TRUE"
230 - )
231 - cmake_src_configure
232 -}