Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/
Date: Fri, 11 Jun 2021 08:55:15
Message-Id: 1623401695.b37ab8745b8e6a30c189633630a57b3bafa12aee.soap@gentoo
1 commit: b37ab8745b8e6a30c189633630a57b3bafa12aee
2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
3 AuthorDate: Fri Jun 11 08:54:55 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 08:54:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b37ab874
7
8 sci-astronomy/stellarium: drop old
9
10 Closes: https://github.com/gentoo/gentoo/pull/21148
11 Package-Manager: Portage-3.0.18, Repoman-3.0.2
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 sci-astronomy/stellarium/Manifest | 5 -
16 .../files/stellarium-0.20.2-disable-x86-test.patch | 24 ----
17 sci-astronomy/stellarium/stellarium-0.20.2.ebuild | 96 ---------------
18 sci-astronomy/stellarium/stellarium-0.20.3.ebuild | 135 ---------------------
19 4 files changed, 260 deletions(-)
20
21 diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
22 index 5284117c8a2..e30d9ae46d6 100644
23 --- a/sci-astronomy/stellarium/Manifest
24 +++ b/sci-astronomy/stellarium/Manifest
25 @@ -3,13 +3,8 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
26 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
27 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
28 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
29 -DIST stellarium-0.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
30 -DIST stellarium-0.20.3.tar.gz 349073272 BLAKE2B 4380e2f589f8ca7af7a62d7e72e18355328ba37d5d8c4e31f8da011fa46296a3c79b74aca04b9f4014f2b2ebc5a1124d62239d6a9bf947cea687d0a2f6e09c13 SHA512 7f4769955fa55751828b211023f3e88e78c42bd367dade9b29cbe86afcdbfc7078d87dc8f856b0f96a4c75bb3d07462a195095f7afb84bfca0988135a1518a1d
31 DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
32 DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
33 -DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
34 -DIST stellarium-dso-catalog-3.11.dat 28297989 BLAKE2B de56efe1930e9ee0e584de9f8167c7b588b886623bbea547ac35b7d3fe32e99e402f8811a2878b82f059e9b946b19ce2456d8a8a4f2127b8dc85c34c6ba1b13b SHA512 21efc43f7ac10b3b14e63731938cbfeaa7b5097ef2a7328e741e00cfd391b80ba4f7e6a367677be2f01879d9c46b8b1bcd5fce8963776ef670455a442c663fc3
35 DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
36 -DIST stellarium_user_guide-0.20.3-1.pdf 32404701 BLAKE2B 811c8c58818bf76a6e597a2d24feaff2f7705a0eaffc8ccc1e6cdc037f374dedff01185466dac1635242bcf3ec8309806db03340b251fb39cea1f285a3cf5f26 SHA512 b820c2f76f40df9ef3c2f732cbb5c3622f37bff0cfdab8b56c78c0f4417ba036f6c623f00e7186e4b3c045ed2a4598baabd334fb6cb1037de12af0837a2fe86d
37 DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
38 DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
39
40 diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch b/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
41 deleted file mode 100644
42 index 27674eb7a1e..00000000000
43 --- a/sci-astronomy/stellarium/files/stellarium-0.20.2-disable-x86-test.patch
44 +++ /dev/null
45 @@ -1,24 +0,0 @@
46 -Disable broken tests on x86
47 -
48 -https://github.com/Stellarium/stellarium/issues/1153
49 -
50 ---- a/src/tests/testConversions.cpp 2020-08-09 23:29:34.794246024 +0100
51 -+++ b/src/tests/testConversions.cpp 2020-08-09 23:30:30.441851564 +0100
52 -@@ -942,6 +942,7 @@ void TestConversions::testVec3fToHtmlCol
53 - }
54 - void TestConversions::testVec3dToHtmlColor()
55 - {
56 -+ return;
57 - QVariantList data;
58 -
59 - data << "#FFFFFF" << 1. << 1. << 1.;
60 ---- a/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:32:43.940770728 +0100
61 -+++ b/src/tests/testStelSphereGeometry.cpp 2020-08-09 23:33:06.671154228 +0100
62 -@@ -309,6 +309,7 @@ void TestStelSphericalGeometry::testEnla
63 -
64 - void TestStelSphericalGeometry::testSphericalPolygon()
65 - {
66 -+ return;
67 - SphericalRegionP holySquare2 = bigSquare.getSubtraction(smallSquare);
68 -
69 - QCOMPARE(holySquare2->getArea(), holySquare.getArea());
70
71 diff --git a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
72 deleted file mode 100644
73 index 72d532122ff..00000000000
74 --- a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
75 +++ /dev/null
76 @@ -1,96 +0,0 @@
77 -# Copyright 1999-2020 Gentoo Authors
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=7
81 -
82 -inherit cmake desktop flag-o-matic xdg virtualx
83 -
84 -DESCRIPTION="3D photo-realistic skies in real time"
85 -HOMEPAGE="https://stellarium.org/"
86 -MY_DSO_VERSION="3.10"
87 -SRC_URI="
88 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
89 - deep-sky? (
90 - https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
91 - )
92 - stars? (
93 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
94 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
95 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
96 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
97 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
98 - )"
99 -
100 -LICENSE="GPL-2+"
101 -SLOT="0"
102 -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
103 -IUSE="debug deep-sky gps media nls stars test"
104 -
105 -BDEPEND="
106 - nls? ( dev-qt/linguist-tools:5 )
107 -"
108 -RDEPEND="
109 - dev-qt/qtcore:5
110 - dev-qt/qtgui:5
111 - dev-qt/qtnetwork:5
112 - dev-qt/qtopengl:5
113 - dev-qt/qtprintsupport:5
114 - dev-qt/qtscript:5
115 - dev-qt/qtserialport:5
116 - dev-qt/qtwidgets:5
117 - media-fonts/dejavu
118 - sys-libs/zlib
119 - virtual/opengl
120 - gps? ( dev-qt/qtpositioning:5 )
121 - media? ( dev-qt/qtmultimedia:5[widgets] )
122 -"
123 -DEPEND="${RDEPEND}
124 - dev-qt/qtconcurrent:5
125 - test? ( dev-qt/qttest:5 )
126 -"
127 -
128 -RESTRICT="!test? ( test )"
129 -
130 -src_prepare() {
131 - cmake_src_prepare
132 - use debug || append-cppflags -DQT_NO_DEBUG #415769
133 -
134 - if use x86; then
135 - # https://github.com/Stellarium/stellarium/issues/1153
136 - eapply "${FILESDIR}/stellarium-0.20.2-disable-x86-test.patch"
137 - fi
138 -}
139 -
140 -src_configure() {
141 - local mycmakeargs=(
142 - -DENABLE_GPS="$(usex gps)"
143 - -DENABLE_MEDIA="$(usex media)"
144 - -DENABLE_NLS="$(usex nls)"
145 - -DENABLE_TESTING="$(usex test)"
146 - )
147 - cmake_src_configure
148 -}
149 -
150 -src_test() {
151 - virtx cmake_src_test
152 -}
153 -
154 -src_install() {
155 - cmake_src_install
156 -
157 - # use the more up-to-date system fonts
158 - rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
159 - dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
160 - dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
161 -
162 - if use stars ; then
163 - insinto /usr/share/${PN}/stars/default
164 - doins "${DISTDIR}"/stars_4_1v0_2.cat
165 - doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
166 - fi
167 - if use deep-sky ; then
168 - insinto /usr/share/${PN}/nebulae/default
169 - newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
170 - fi
171 - newicon doc/images/stellarium-logo.png ${PN}.png
172 -}
173
174 diff --git a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild b/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
175 deleted file mode 100644
176 index f2c44c80618..00000000000
177 --- a/sci-astronomy/stellarium/stellarium-0.20.3.ebuild
178 +++ /dev/null
179 @@ -1,135 +0,0 @@
180 -# Copyright 1999-2021 Gentoo Authors
181 -# Distributed under the terms of the GNU General Public License v2
182 -
183 -EAPI=7
184 -
185 -PYTHON_COMPAT=( python3_{7,8,9} )
186 -inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
187 -
188 -DESCRIPTION="3D photo-realistic skies in real time"
189 -HOMEPAGE="https://stellarium.org/"
190 -MY_DSO_VERSION="3.11"
191 -SRC_URI="
192 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
193 - deep-sky? (
194 - https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
195 - )
196 - doc? (
197 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
198 - )
199 - stars? (
200 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
201 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
202 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
203 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
204 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
205 - )"
206 -
207 -LICENSE="GPL-2+ SGI-B-2.0"
208 -SLOT="0"
209 -KEYWORDS="amd64 ppc ppc64 x86"
210 -IUSE="debug deep-sky doc gps media nls stars telescope test"
211 -
212 -# Python interpreter is used while building RemoteControl plugin
213 -BDEPEND="
214 - ${PYTHON_DEPS}
215 - doc? ( app-doc/doxygen[dot] )
216 - nls? ( dev-qt/linguist-tools:5 )
217 -"
218 -RDEPEND="
219 - dev-libs/qtcompress:=
220 - dev-qt/qtcore:5
221 - dev-qt/qtgui:5
222 - dev-qt/qtnetwork:5
223 - dev-qt/qtopengl:5
224 - dev-qt/qtprintsupport:5
225 - dev-qt/qtscript:5
226 - dev-qt/qtserialport:5
227 - dev-qt/qtwidgets:5
228 - media-fonts/dejavu
229 - sys-libs/zlib
230 - virtual/opengl
231 - gps? ( dev-qt/qtpositioning:5 )
232 - media? ( dev-qt/qtmultimedia:5[widgets] )
233 - telescope? ( sci-libs/indilib:= )
234 -"
235 -DEPEND="${RDEPEND}
236 - dev-qt/qtconcurrent:5
237 - test? ( dev-qt/qttest:5 )
238 -"
239 -
240 -RESTRICT="!test? ( test )"
241 -
242 -PATCHES=(
243 - "${FILESDIR}/${P}-unbundle-indi.patch"
244 - "${FILESDIR}/${P}-unbundle-qtcompress.patch"
245 - "${FILESDIR}/${P}-unbundle-zlib.patch"
246 -)
247 -
248 -src_prepare() {
249 - cmake_src_prepare
250 - use debug || append-cppflags -DQT_NO_DEBUG #415769
251 -
252 - # Several libraries are bundled, remove them.
253 - rm -r src/external/{libindi,qtcompress,zlib}/ || die
254 -
255 - # qcustomplot can't be easily unbundled because it uses qcustomplot 1
256 - # while we have qcustomplot 2 in tree which changed API a bit
257 - # Also the license of the external qcustomplot is incompatible with stellarium
258 -
259 - # for glues_stel aka libtess I couldn't find an upstream with the same API
260 -
261 - # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
262 -
263 - local remaining="$(cd src/external/ && echo */)"
264 - if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
265 - eqawarn "Need to unbundle more deps: ${remaining}"
266 - fi
267 -}
268 -
269 -src_configure() {
270 - local mycmakeargs=(
271 - -DENABLE_GPS="$(usex gps)"
272 - -DENABLE_MEDIA="$(usex media)"
273 - -DENABLE_NLS="$(usex nls)"
274 - -DENABLE_TESTING="$(usex test)"
275 - -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
276 - )
277 - cmake_src_configure
278 -}
279 -
280 -src_test() {
281 - virtx cmake_src_test
282 -}
283 -
284 -src_compile() {
285 - cmake_src_compile
286 -
287 - if use doc ; then
288 - cmake_build apidoc
289 - fi
290 -}
291 -
292 -src_install() {
293 - if use doc ; then
294 - local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
295 - dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
296 - fi
297 - cmake_src_install
298 -
299 - # use the more up-to-date system fonts
300 - rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
301 - dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
302 - dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
303 -
304 - if use stars ; then
305 - insinto /usr/share/${PN}/stars/default
306 - doins "${DISTDIR}"/stars_4_1v0_2.cat
307 - doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
308 - fi
309 - if use deep-sky ; then
310 - insinto /usr/share/${PN}/nebulae/default
311 - newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
312 - fi
313 - newicon doc/images/stellarium-logo.png ${PN}.png
314 -}