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: Wed, 29 Sep 2021 08:07:50
Message-Id: 1632902856.8e9eafc77524e0abd307d4a23a27e4314f87ee6b.soap@gentoo
1 commit: 8e9eafc77524e0abd307d4a23a27e4314f87ee6b
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Wed Sep 29 08:07:36 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 29 08:07:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9eafc7
7
8 sci-astronomy/stellarium: drop old
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
12 Signed-off-by: David Seifert <soap <AT> gentoo.org>
13
14 sci-astronomy/stellarium/Manifest | 4 -
15 .../stellarium-0.20.3-unbundle-qtcompress.patch | 222 ---------------------
16 sci-astronomy/stellarium/stellarium-0.20.4.ebuild | 135 -------------
17 sci-astronomy/stellarium/stellarium-0.21.0.ebuild | 141 -------------
18 4 files changed, 502 deletions(-)
19
20 diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
21 index 8f4f9983e00..943e3f7c2fd 100644
22 --- a/sci-astronomy/stellarium/Manifest
23 +++ b/sci-astronomy/stellarium/Manifest
24 @@ -3,10 +3,6 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
25 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
26 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
27 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
28 -DIST stellarium-0.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
29 -DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
30 DIST stellarium-0.21.1.tar.gz 362055145 BLAKE2B a7ea6327d415331848a53879e76ea973fbb51709a0bd561cd4e415b215e5c8494290e2e663bda9f463f565a771465e0e0133f46517a5798d607f076e2635764d SHA512 6dd935808c711da32c793a0cedad464a15bf35ede60cff385e96f1d5868e751ed2e09b61551f7a6fe599b702a6f4d0a62d4494a40b68e77685ba57b6a63b5031
31 DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
32 -DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
33 -DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
34 DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
35
36 diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
37 deleted file mode 100644
38 index 64b19a54c88..00000000000
39 --- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
40 +++ /dev/null
41 @@ -1,222 +0,0 @@
42 -diff --git a/CMakeLists.txt b/CMakeLists.txt
43 -index 1b72c2c8f6..9436bc66da 100644
44 ---- a/CMakeLists.txt
45 -+++ b/CMakeLists.txt
46 -@@ -629,5 +629,6 @@ ELSE()
47 - ENDIF()
48 -
49 -+find_package(Qt5Compress REQUIRED)
50 -
51 - ########### Set some global variables ###########
52 - IF(UNIX AND NOT WIN32)
53 -diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
54 -index 8e3138adf2..b59049767d 100644
55 ---- a/plugins/Satellites/src/CMakeLists.txt
56 -+++ b/plugins/Satellites/src/CMakeLists.txt
57 -@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
58 - ENDIF(ENABLE_TESTING)
59 -
60 - ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
61 --TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
62 -+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
63 - # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
64 - SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
65 - IF(MSVC)
66 -diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
67 -index 7432f4316d..f4f4453661 100644
68 ---- a/plugins/Satellites/src/Satellites.cpp
69 -+++ b/plugins/Satellites/src/Satellites.cpp
70 -@@ -43,7 +43,7 @@
71 - #include "StelUtils.hpp"
72 - #include "StelActionMgr.hpp"
73 -
74 --#include "external/qtcompress/qzipreader.h"
75 -+#include "qzipreader.h"
76 -
77 - #include <QNetworkAccessManager>
78 - #include <QNetworkReply>
79 -@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
80 - QString archive = zip.fileName();
81 - QByteArray data;
82 -
83 -- Stel::QZipReader reader(archive);
84 -- if (reader.status() != Stel::QZipReader::NoError)
85 -+ QZipReader reader(archive);
86 -+ if (reader.status() != QZipReader::NoError)
87 - qWarning() << "[Satellites] Unable to open as a ZIP archive";
88 - else
89 - {
90 -- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
91 -+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
92 - for (const auto& info : infoList)
93 - {
94 - // qWarning() << "[Satellites] Processing:" << info.filePath;
95 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
96 -index bdd214729f..81631ce8ec 100644
97 ---- a/src/CMakeLists.txt
98 -+++ b/src/CMakeLists.txt
99 -@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
100 - CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
101 - ENDIF()
102 -
103 --SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
104 -+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
105 - IF(ENABLE_LIBGPS)
106 - SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
107 - ENDIF()
108 -diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
109 -index 8da2070b26..9949252cee 100644
110 ---- a/src/core/modules/LandscapeMgr.cpp
111 -+++ b/src/core/modules/LandscapeMgr.cpp
112 -@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
113 - }
114 - QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
115 -
116 -- Stel::QZipReader reader(sourceFilePath);
117 -- if (reader.status() != Stel::QZipReader::NoError)
118 -+ QZipReader reader(sourceFilePath);
119 -+ if (reader.status() != QZipReader::NoError)
120 - {
121 - qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
122 - emit errorNotArchive();
123 -@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
124 -
125 - //Detect top directory
126 - QString topDir, iniPath;
127 -- QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
128 -+ QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
129 - for (const auto& info : infoList)
130 - {
131 - QFileInfo fileInfo(info.filePath);
132 -diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
133 -index 1e0e7e2b32..834aff89cb 100644
134 ---- a/src/external/CMakeLists.txt
135 -+++ b/src/external/CMakeLists.txt
136 -@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
137 - set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
138 - SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
139 -
140 -+if(0)
141 - set(qtcompress_SRCS
142 - qtcompress/qzip.cpp
143 - qtcompress/qzipreader.h
144 -@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
145 - #turn off automoc, not needed here
146 - set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
147 - SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
148 -+endif()
149 -
150 - set(qcustomplot_SRCS
151 - qcustomplot/qcustomplot.cpp
152 -@@ -176,7 +176,7 @@
153 - qxlsx/xlsxcelllocation.h
154 - )
155 - add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
156 --target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
157 -+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
158 - set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
159 -
160 - ################################# INDI ################################
161 -diff -r 11536448457a xlsxzipreader.cpp
162 ---- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100
163 -+++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100
164 -@@ -28,13 +28,13 @@
165 - namespace QXlsx {
166 -
167 - ZipReader::ZipReader(const QString &filePath) :
168 -- m_reader(new Stel::QZipReader(filePath))
169 -+ m_reader(new QZipReader(filePath))
170 - {
171 - init();
172 - }
173 -
174 - ZipReader::ZipReader(QIODevice *device) :
175 -- m_reader(new Stel::QZipReader(device))
176 -+ m_reader(new QZipReader(device))
177 - {
178 - init();
179 - }
180 -@@ -45,8 +45,8 @@
181 -
182 - void ZipReader::init()
183 - {
184 -- QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
185 -- foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
186 -+ QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
187 -+ foreach (const QZipReader::FileInfo &fi, allFiles)
188 - {
189 - if (fi.isFile)
190 - m_filePaths.append(fi.filePath);
191 -diff -r 2019bb0d2919 xlsxzipreader_p.h
192 ---- a/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:35:35 2020 +0100
193 -+++ b/src/external/qxlsx/xlsxzipreader_p.h Thu Oct 08 21:36:28 2020 +0100
194 -@@ -38,7 +38,7 @@
195 - //
196 -
197 - #include "xlsxglobal.h"
198 --#include "external/qtcompress/qzipreader.h"
199 -+#include "qzipreader.h"
200 - #include <QScopedPointer>
201 - #include <QStringList>
202 - #include <QVector>
203 -@@ -60,7 +60,7 @@
204 - private:
205 - Q_DISABLE_COPY(ZipReader)
206 - void init();
207 -- QScopedPointer<Stel::QZipReader> m_reader;
208 -+ QScopedPointer<QZipReader> m_reader;
209 - QStringList m_filePaths;
210 - };
211 -
212 -diff -r 11536448457a xlsxzipwriter.cpp
213 ---- a/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:41:22 2020 +0100
214 -+++ b/src/external/qxlsx/xlsxzipwriter.cpp Thu Oct 08 21:42:03 2020 +0100
215 -@@ -29,14 +29,14 @@
216 -
217 - ZipWriter::ZipWriter(const QString &filePath)
218 - {
219 -- m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
220 -- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
221 -+ m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
222 -+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
223 - }
224 -
225 - ZipWriter::ZipWriter(QIODevice *device)
226 - {
227 -- m_writer = new Stel::QZipWriter(device);
228 -- m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
229 -+ m_writer = new QZipWriter(device);
230 -+ m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
231 - }
232 -
233 - ZipWriter::~ZipWriter()
234 -@@ -46,7 +46,7 @@
235 -
236 - bool ZipWriter::error() const
237 - {
238 -- return m_writer->status() != Stel::QZipWriter::NoError;
239 -+ return m_writer->status() != QZipWriter::NoError;
240 - }
241 -
242 - void ZipWriter::addFile(const QString &filePath, QIODevice *device)
243 -diff -r 2019bb0d2919 xlsxzipwriter_p.h
244 ---- a/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:35:35 2020 +0100
245 -+++ b/src/external/qxlsx/xlsxzipwriter_p.h Thu Oct 08 21:36:28 2020 +0100
246 -@@ -37,7 +37,7 @@
247 - //
248 -
249 - #include <QString>
250 --#include "external/qtcompress/qzipwriter.h"
251 -+#include "qzipwriter.h"
252 -
253 - class QIODevice;
254 - class QZipWriter;
255 -@@ -57,7 +57,7 @@
256 - void close();
257 -
258 - private:
259 -- Stel::QZipWriter *m_writer;
260 -+ QZipWriter *m_writer;
261 - };
262 -
263 - } // namespace QXlsx
264
265 diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
266 deleted file mode 100644
267 index 25de0105315..00000000000
268 --- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
269 +++ /dev/null
270 @@ -1,135 +0,0 @@
271 -# Copyright 1999-2021 Gentoo Authors
272 -# Distributed under the terms of the GNU General Public License v2
273 -
274 -EAPI=7
275 -
276 -PYTHON_COMPAT=( python3_{7,8,9} )
277 -inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
278 -
279 -DESCRIPTION="3D photo-realistic skies in real time"
280 -HOMEPAGE="https://stellarium.org/"
281 -MY_DSO_VERSION="3.12"
282 -SRC_URI="
283 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
284 - deep-sky? (
285 - https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
286 - )
287 - doc? (
288 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
289 - )
290 - stars? (
291 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
292 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
293 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
294 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
295 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
296 - )"
297 -
298 -LICENSE="GPL-2+ SGI-B-2.0"
299 -SLOT="0"
300 -KEYWORDS="amd64 ppc ppc64 x86"
301 -IUSE="debug deep-sky doc gps media nls stars telescope test"
302 -
303 -# Python interpreter is used while building RemoteControl plugin
304 -BDEPEND="
305 - ${PYTHON_DEPS}
306 - doc? ( app-doc/doxygen[dot] )
307 - nls? ( dev-qt/linguist-tools:5 )
308 -"
309 -RDEPEND="
310 - dev-libs/qtcompress:=
311 - dev-qt/qtcore:5
312 - dev-qt/qtgui:5
313 - dev-qt/qtnetwork:5
314 - dev-qt/qtopengl:5
315 - dev-qt/qtprintsupport:5
316 - dev-qt/qtscript:5
317 - dev-qt/qtserialport:5
318 - dev-qt/qtwidgets:5
319 - media-fonts/dejavu
320 - sys-libs/zlib
321 - virtual/opengl
322 - gps? ( dev-qt/qtpositioning:5 )
323 - media? ( dev-qt/qtmultimedia:5[widgets] )
324 - telescope? ( sci-libs/indilib:= )
325 -"
326 -DEPEND="${RDEPEND}
327 - dev-qt/qtconcurrent:5
328 - test? ( dev-qt/qttest:5 )
329 -"
330 -
331 -RESTRICT="!test? ( test )"
332 -
333 -PATCHES=(
334 - "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
335 - "${FILESDIR}/stellarium-0.20.3-unbundle-qtcompress.patch"
336 - "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
337 -)
338 -
339 -src_prepare() {
340 - cmake_src_prepare
341 - use debug || append-cppflags -DQT_NO_DEBUG #415769
342 -
343 - # Several libraries are bundled, remove them.
344 - rm -r src/external/{libindi,qtcompress,zlib}/ || die
345 -
346 - # qcustomplot can't be easily unbundled because it uses qcustomplot 1
347 - # while we have qcustomplot 2 in tree which changed API a bit
348 - # Also the license of the external qcustomplot is incompatible with stellarium
349 -
350 - # for glues_stel aka libtess I couldn't find an upstream with the same API
351 -
352 - # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
353 -
354 - local remaining="$(cd src/external/ && echo */)"
355 - if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
356 - eqawarn "Need to unbundle more deps: ${remaining}"
357 - fi
358 -}
359 -
360 -src_configure() {
361 - local mycmakeargs=(
362 - -DENABLE_GPS="$(usex gps)"
363 - -DENABLE_MEDIA="$(usex media)"
364 - -DENABLE_NLS="$(usex nls)"
365 - -DENABLE_TESTING="$(usex test)"
366 - -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
367 - )
368 - cmake_src_configure
369 -}
370 -
371 -src_test() {
372 - virtx cmake_src_test
373 -}
374 -
375 -src_compile() {
376 - cmake_src_compile
377 -
378 - if use doc ; then
379 - cmake_build apidoc
380 - fi
381 -}
382 -
383 -src_install() {
384 - if use doc ; then
385 - local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
386 - dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
387 - fi
388 - cmake_src_install
389 -
390 - # use the more up-to-date system fonts
391 - rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
392 - dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
393 - dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
394 -
395 - if use stars ; then
396 - insinto /usr/share/${PN}/stars/default
397 - doins "${DISTDIR}"/stars_4_1v0_2.cat
398 - doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
399 - fi
400 - if use deep-sky ; then
401 - insinto /usr/share/${PN}/nebulae/default
402 - newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
403 - fi
404 - newicon doc/images/stellarium-logo.png ${PN}.png
405 -}
406
407 diff --git a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
408 deleted file mode 100644
409 index 9f6e471d3ed..00000000000
410 --- a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
411 +++ /dev/null
412 @@ -1,141 +0,0 @@
413 -# Copyright 1999-2021 Gentoo Authors
414 -# Distributed under the terms of the GNU General Public License v2
415 -
416 -EAPI=7
417 -
418 -PYTHON_COMPAT=( python3_{8..10} )
419 -inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
420 -
421 -DESCRIPTION="3D photo-realistic skies in real time"
422 -HOMEPAGE="https://stellarium.org/"
423 -MY_DSO_VERSION="3.12"
424 -SRC_URI="
425 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
426 - deep-sky? (
427 - https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
428 - )
429 - doc? (
430 - https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
431 - )
432 - stars? (
433 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
434 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
435 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
436 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
437 - https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
438 - )"
439 -
440 -LICENSE="GPL-2+ SGI-B-2.0"
441 -SLOT="0"
442 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
443 -IUSE="debug deep-sky doc gps media nls stars telescope test"
444 -
445 -# Python interpreter is used while building RemoteControl plugin
446 -BDEPEND="
447 - ${PYTHON_DEPS}
448 - doc? ( app-doc/doxygen[dot] )
449 - nls? ( dev-qt/linguist-tools:5 )
450 -"
451 -RDEPEND="
452 - dev-libs/qtcompress:=
453 - dev-qt/qtcore:5
454 - dev-qt/qtgui:5
455 - dev-qt/qtnetwork:5
456 - dev-qt/qtopengl:5
457 - dev-qt/qtprintsupport:5
458 - dev-qt/qtscript:5
459 - dev-qt/qtwidgets:5
460 - media-fonts/dejavu
461 - sys-libs/zlib
462 - virtual/opengl
463 - gps? (
464 - dev-qt/qtpositioning:5
465 - dev-qt/qtserialport:5
466 - sci-geosciences/gpsd:=[cxx]
467 - )
468 - media? ( dev-qt/qtmultimedia:5[widgets] )
469 - telescope? (
470 - dev-qt/qtserialport:5
471 - sci-libs/indilib:=
472 - )
473 -"
474 -DEPEND="${RDEPEND}
475 - dev-qt/qtconcurrent:5
476 - test? ( dev-qt/qttest:5 )
477 -"
478 -
479 -RESTRICT="!test? ( test )"
480 -
481 -PATCHES=(
482 - "${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
483 - "${FILESDIR}/stellarium-0.21.0-unbundle-qtcompress.patch"
484 - "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
485 -)
486 -
487 -src_prepare() {
488 - cmake_src_prepare
489 - use debug || append-cppflags -DQT_NO_DEBUG #415769
490 -
491 - # Several libraries are bundled, remove them.
492 - rm -r src/external/{libindi,qtcompress,zlib}/ || die
493 -
494 - # qcustomplot can't be easily unbundled because it uses qcustomplot 1
495 - # while we have qcustomplot 2 in tree which changed API a bit
496 - # Also the license of the external qcustomplot is incompatible with stellarium
497 -
498 - # for glues_stel aka libtess I couldn't find an upstream with the same API
499 -
500 - # unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/114
501 -
502 - local remaining="$(cd src/external/ && echo */)"
503 - if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
504 - eqawarn "Need to unbundle more deps: ${remaining}"
505 - fi
506 -}
507 -
508 -src_configure() {
509 - local mycmakeargs=(
510 - -DENABLE_GPS="$(usex gps)"
511 - -DENABLE_MEDIA="$(usex media)"
512 - -DENABLE_NLS="$(usex nls)"
513 - -DENABLE_TESTING="$(usex test)"
514 - -DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
515 - )
516 - cmake_src_configure
517 -}
518 -
519 -src_test() {
520 - virtx cmake_src_test
521 -}
522 -
523 -src_compile() {
524 - cmake_src_compile
525 -
526 - if use doc ; then
527 - cmake_build apidoc
528 - fi
529 -}
530 -
531 -src_install() {
532 - if use doc ; then
533 - local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
534 - dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
535 - fi
536 - cmake_src_install
537 -
538 - # use the more up-to-date system fonts
539 - rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
540 - dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
541 - dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
542 -
543 - if use stars ; then
544 - insinto /usr/share/${PN}/stars/default
545 - doins "${DISTDIR}"/stars_4_1v0_2.cat
546 - doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
547 - fi
548 - if use deep-sky ; then
549 - insinto /usr/share/${PN}/nebulae/default
550 - newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
551 - fi
552 - newicon doc/images/stellarium-logo.png ${PN}.png
553 -}