gentoo auto-resync : 27:09:2022 - 21:10:48

10 files changed, 0 insertions, 1014 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index e7ff4b7570d5..2a07a1b73b79 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 9f2bb542b463..ca3434e49bbf 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,10 +1,5 @@
 AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294
 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
-AUX stellarium-0.21.2-unbundle-qtcompress.patch 7484 BLAKE2B f3cf62bf45247c2b4a09a55dcfbc3424869ce4c294da0a4ebc4daa3a19baa7ba377ff9ff4e271d2aab098f20ecde5018793901cacc54be9849bccad510831ca1 SHA512 81934b0b9ba8b2d1d8fa75eacdf146e374bbc29b862fe5585a4846d14c17174ef0c936d22c1a80eb61d3041d79d0f981d01bdb215e4530833b9d00e2613d0dae
-AUX stellarium-0.22.1-fix-conv.patch 845 BLAKE2B d0147bef1e9c9c80e03b8690d801c7af3acfd66735426d095a1fc21ac4696e7b367c38a4c8c7b526013723159a8b47519ae418745f6110f0a305929cc7e2f623 SHA512 2ff0f6ef0b52817f576d829a21901a0e96b2724210eff5066666cd0c9e5c9778a4cbe1a19c60f010779ee65beeabfb2d7fd9ee68ad07ee107e3fed3fba02493d
-AUX stellarium-0.22.1-fix-star-manager-segfault.patch 873 BLAKE2B 5f970fd0f30fe6e73d0479d603e572bd4e6db5545d584badb11cecb09d2ba704c420398734e0f943c2ca34d1d5c7a93cea3da446d3b0e72bc2d18db1a455246b SHA512 f85d5c7614ba3dda8dc752c76a55ac361d194345cc926127d7428b82057dd19da27813f0071abfc2deb3ee729d7c33703ed3d5dfb3a2644c16d95ead400ca882
-AUX stellarium-0.22.1-fix-test-x86.patch 3578 BLAKE2B 8121746cdf9efaa023e2eadb9c8f451d781834a8bab0e96bc74b4e3b77cba62ccdfa1354d79d5409db042f002974551d6989bb58b7bde4c85394be48ac242b05 SHA512 b902e91542774ee7955442ed78938c336719aa93ca7ee644ea5f47987234603bc4fb7f271ba1a5d3f6298c325da78582d6b39b5909a46b881be483d56c6fd2ad
-AUX stellarium-0.22.1-unbundle-qtcompress.patch 7595 BLAKE2B 650c9de68a42c101df436c32c7f42f8623903c969d82f1de2c411c34d5237601df401129b950e407ff0e558f2c1e5c18bdbef5bf26bae2d499fda5377ef67c3d SHA512 8550ec4d9cd0b044491bb592a099bb7b28c8de03cef2ca38e8ad420303bc02b053bf896265cdbb08629befc0086dae9be31b0ed78c10756fd67eaa692a69ca64
 AUX stellarium-0.22.2-ccache.patch 340 BLAKE2B 0365157d357d55d321b297a61911dd52e7230faa9a4460c1373543e0e6021a2651ddff15457e35c966ee207db56fe4ba0cdc2dc4f9cba2255a8be9c75b2cc02b SHA512 62aa2767f02602b787560c48fa72de3c9d7ed09529abfa60bd7f11651913ea5ecabfa2ed1087a0aae16ec5b6a7f8706956d641a11fd7e29133f69041492a51b8
 AUX stellarium-0.22.2-unbundle-qtcompress.patch 7561 BLAKE2B c9bc4b051fcd26949ecd805c5e235015bbd58e23d7afb92e0576e4eee41ce567ce8f31fa4512f03824493083a56c851b19ec81f806b437916b05853ccdf43f28 SHA512 7c00dac2184ec97177a65fd4d5b10af9b915da86dd72c187633060609e5080186079563b555ecbdb742f6880c37b3d489b6c1f2cde5167fc446353746c474758
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
@@ -12,17 +7,8 @@ DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723
 DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f09949e8926d6c14b82a85927d124d7fcb50c6d6c357d21b003938cc0b28937f2adb28ae268bb5c85d575f5e0ff SHA512 794279407595f44bbc1e492086063d98068bf332202a5448cd83dd7afbdcf7c6c3ff2878f3016369ebb5a98552874eb4eddb38e2c40e9a163c6231b640e02977
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
-DIST stellarium-0.21.3.tar.gz 390176992 BLAKE2B 9a6ba3ab6e1b0a61916c844d271bb2181f7b6482dfaaf24e9160dd00cec297e80fc2af167f77aaf248c4dcb358ff64c5cdc138626f37030529146f1e822813e8 SHA512 6553f0229f837742e8b9db2715ecb96d69fe46aa7f057d86fb2547540d86f2cb767ca4a6bb5ff18037642113b42fec3f2850e037275fc732aae63da8031bbd0e
-DIST stellarium-0.22.1.tar.gz 407700439 BLAKE2B 7a01bf63892ab800988896748f44961832756cb993884ab1d45e454035db72d6494a536936ccc338f1c0322e20ec5b282a2c3764b77f1c16cf2ee47f1a57a979 SHA512 31d0294c78c3254261dd2a5e46022342f9f3046f920efd8e4f1353eecf79116f50a968479768c12a8419ed3f9182fd3694a78b5ea2ab27ad67e6ef6d17aaa137
 DIST stellarium-0.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
-DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
-DIST stellarium-dso-catalog-3.15.dat 28683372 BLAKE2B c2ba23a6b169815ed20d97113887f663a9b730774cc2e8402e4149ff25b8d0107166c806814d3fb46ccc1f1859a901508f652234b8ddff3ea7d4710b21b65c93 SHA512 2f43696b093bcc35288b51fdacf89380ee878296fa596c10404c89004efbd08104e7d04e193499eed711ad7d13dd7fe8af805167e3b10d6b2c2b02fca42ad041
 DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
-DIST stellarium_user_guide-0.21.3-1.pdf 31253904 BLAKE2B 3e8a0395a29c2fac164379ea315cd21d102b2b400d9eeacdb37cf85f00816f0678edabb9b779db135f4c43ee4cfcc6307ee59f4a149aa33e878c11fe26551266 SHA512 83137fe09bdc279bec23b78694d5e1efe9238733f8adf2cb8ed7e37f0eee60b0475c4c93b5bc85a04b92a175284c24354c36b6a93014216387211c9b031cdf7c
-DIST stellarium_user_guide-0.22.1-1.pdf 36226017 BLAKE2B 628c57f1efa6238e5c12588ed4b0532816e8708f16d40fad0d87f72550af5efa500ae0edbc20e243488c59dfc94b47efe588d47419e7d29b1fd6ff9e4cec5438 SHA512 07d965f5b45ac964bec401f14ee81322a17939e292390ebd040339c265ede4b652b37e9220696f13c093ea22e8a706b27b7d23d7357dffbe808c2538f8cee93d
 DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
-EBUILD stellarium-0.21.3.ebuild 4231 BLAKE2B d865110272f4d1108a654e0cfc901ba2f33f9bfc4450723ce05004a056ad9bc29e87a118024f9861978808cf95629619a2f15985c88e54c77d3cad23823ad5be SHA512 0eb62c03aececa55b69fb061391d23531651a1e897e457aa52902ee9c087594c21453268269f6527092450112391dcfea2c18c3e2e58d7038d46b704015363a5
-EBUILD stellarium-0.22.1-r1.ebuild 4434 BLAKE2B a63d4cb0a7cf6fdb0b5e961d71c1bcb98d18f999b570c54b18a617826f7c61c95c55501758dc8b00a5bdf4e62dd28c95d8c926641f4d20915bc147943c193f43 SHA512 0b820802f07e3443dd055aaf59fd7db53321a9b30bb643331ca5db45c042bb3ca63a5ced6d307bdcf6feda19bc06f6ad4cbc552d5a89c10056a7ed47a9791606
-EBUILD stellarium-0.22.1.ebuild 4316 BLAKE2B 16d0509c9f07b6b459f9a7881af96c518e069a02378a826fb314009c89189593eeca2227cfbb153ac578dc3e993cccdc1d6a1541e18b326554ccbe5b0bf6fb6c SHA512 bb7c3c26913b8a42546e7fe8c548415a8c8163792db6bc631fd9527d19c1901600e7bc205f1171af418dcddc9efbb5f99c96edbdea759e912eadd3bc75031245
 EBUILD stellarium-0.22.2.ebuild 4063 BLAKE2B c5068f6b138eddcef9a1690f1645bb8b597ee3642507cd5098bf5a1a1de93e23407ba476229fb1025dfb33e2a7fd291cbbcd2c019a0b9e96ad4a24afc438ee3b SHA512 fbacac381f17706fe72ee905e2eca8dd5699e8ab0b38971baaba13f4ffa31cab5d10b38ecbb0b73dd5cf2a135a19f887132d5d62c88222be4fb58cdcf4b29a63
 MISC metadata.xml 1331 BLAKE2B 858e48ee46003e8f9d5cb7c6dfe0dd0dab5126c069592c7edbdf2ddf0e3b281d4e5cab5cf21b6197dbde7d7a152225999773265cc4319a4550f15ee2c9903626 SHA512 7e801dbdccaef56276bde6a96bfd61811e6d6b6fcba21238d889d8b882afb9e983ed921dd4d30015107cc48afe6539c19a7bb6692300800ed9f8cc5e4166b5e7
diff --git a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
deleted file mode 100644
index f5d757b1bb16..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,207 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
-      MESSAGE(STATUS "GPS: disabled.")
- ENDIF(ENABLE_GPS)
- 
-+find_package(Qt5Compress REQUIRED)
- 
- IF(USE_QTOPENGL)
-      # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
---- a/plugins/Satellites/src/CMakeLists.txt
-+++ b/plugins/Satellites/src/CMakeLists.txt
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
- ENDIF(ENABLE_TESTING)
- 
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
- IF(MSVC)
---- a/plugins/Satellites/src/Satellites.cpp
-+++ b/plugins/Satellites/src/Satellites.cpp
-@@ -43,7 +43,7 @@
- #include "StelUtils.hpp"
- #include "StelActionMgr.hpp"
- 
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- 
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
- 					QString archive = zip.fileName();
- 					QByteArray data;
- 
--					Stel::QZipReader reader(archive);
--					if (reader.status() != Stel::QZipReader::NoError)
-+					QZipReader reader(archive);
-+					if (reader.status() != QZipReader::NoError)
- 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
- 					else
- 					{
--						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 						for (const auto& info : qAsConst(infoList))
- 						{
- 							// qWarning() << "[Satellites] Processing:" << info.filePath;
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
-      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- ENDIF()
- 
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
- IF(ENABLE_LIBGPS)
-      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
- ENDIF()
---- a/src/core/modules/LandscapeMgr.cpp
-+++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 	}
- 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
- 
--	Stel::QZipReader reader(sourceFilePath);
--	if (reader.status() != Stel::QZipReader::NoError)
-+	QZipReader reader(sourceFilePath);
-+	if (reader.status() != QZipReader::NoError)
- 	{
- 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
- 		emit errorNotArchive();
-@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 
- 	//Detect top directory
- 	QString topDir, iniPath;
--	QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+	QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 	for (const auto& info : infoList)
- 	{
- 		QFileInfo fileInfo(info.filePath);
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

- 

-+if(0)

- set(qtcompress_SRCS

-     qtcompress/qzip.cpp

-     qtcompress/qzipreader.h

-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
- #turn off automoc, not needed here

- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

-+endif()

- 

- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and

- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.

-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
-     qxlsx/xlsxcelllocation.h

-     )

- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)

-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)

- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

- 

- ################################# INDI ################################

---- a/src/external/qxlsx/xlsxzipreader.cpp
-+++ b/src/external/qxlsx/xlsxzipreader.cpp
-@@ -5,13 +5,13 @@
- QT_BEGIN_NAMESPACE_XLSX
- 
- ZipReader::ZipReader(const QString &filePath) :
--    m_reader(new Stel::QZipReader(filePath))
-+    m_reader(new QZipReader(filePath))
- {
-     init();
- }
- 
- ZipReader::ZipReader(QIODevice *device) :
--    m_reader(new Stel::QZipReader(device))
-+    m_reader(new QZipReader(device))
- {
-     init();
- }
-@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
- 
- void ZipReader::init()
- {
--    QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
--    for (const Stel::QZipReader::FileInfo &fi : allFiles) {
-+    QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+    for (const QZipReader::FileInfo &fi : allFiles) {
-         if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
-             m_filePaths.append(fi.filePath);
-     }
---- a/src/external/qxlsx/xlsxzipreader_p.h
-+++ b/src/external/qxlsx/xlsxzipreader_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
- 
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- 
- #if QT_VERSION >= 0x050600
-  #include <QVector>
-@@ -31,7 +31,7 @@ public:
- private:
-     Q_DISABLE_COPY(ZipReader)
-     void init();
--    QScopedPointer<Stel::QZipReader> m_reader;
-+    QScopedPointer<QZipReader> m_reader;
-     QStringList m_filePaths;
- };
- 
---- a/src/external/qxlsx/xlsxzipwriter.cpp
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp
-@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
- 
- ZipWriter::ZipWriter(const QString &filePath)
- {
--    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::ZipWriter(QIODevice *device)
- {
--    m_writer = new Stel::QZipWriter(device);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(device);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::~ZipWriter()
-@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
- 
- bool ZipWriter::error() const
- {
--    return m_writer->status() != Stel::QZipWriter::NoError;
-+    return m_writer->status() != QZipWriter::NoError;
- }
- 
- void ZipWriter::addFile(const QString &filePath, QIODevice *device)
---- a/src/external/qxlsx/xlsxzipwriter_p.h
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
- 
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipwriter.h"
-+#include "qzipwriter.h"
- 
- class QZipWriter;
- 
-@@ -27,7 +27,7 @@ public:
-     void close();
- 
- private:
--    Stel::QZipWriter *m_writer;
-+    QZipWriter *m_writer;
- };
- 
- QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
deleted file mode 100644
index 5187837fbb61..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-conv.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd65fdf5a332d62834ac1cfe9639e220ea635c55 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
-Date: Wed, 25 May 2022 20:55:15 +0700
-Subject: [PATCH] Fixed conversion tool radToHms(): avoiding possible negative
- zero for value of seconds (see #2460)
-
----
- src/core/StelUtils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
-index 93a55ebb957..b03f55a68ec 100644
---- a/src/core/StelUtils.cpp
-+++ b/src/core/StelUtils.cpp
-@@ -140,7 +140,7 @@ void radToHms(double angle, unsigned int& h, unsigned int& m, double& s)
- 
- 	h = static_cast<unsigned int>(angle);
- 	m = static_cast<unsigned int>((angle-h)*60);
--	s = (angle-h)*3600.-60.*m;	
-+	s = qAbs((angle-h)*3600.-60.*m);
- }
- 
- /*************************************************************************
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch
deleted file mode 100644
index 7f8981a006e2..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch is required to fix a segfault on startup in <=0.22.1 if star catalogue files are
-added or removed (USE=stars)
-
-Refer: https://github.com/Stellarium/stellarium/issues/2404
-
-This patch may be safely removed for 0.22.2 - it has been patched upstream.
-
---- a/src/core/modules/StarMgr.cpp
-+++ b/src/core/modules/StarMgr.cpp
-@@ -592,13 +592,13 @@ void StarMgr::setCheckFlag(const QString& catId, bool b)
- 			return;
- 		m["checked"]=b;
- 		catalogsDescription[idx-1]=m;
--		starSettings["catalogs"]=catalogsDescription;
--		QFile tmp(starConfigFileFullPath);
--		if(tmp.open(QIODevice::WriteOnly))
--		{
--			StelJsonParser::write(starSettings, &tmp);
--			tmp.close();
--		}
-+	}
-+	starSettings["catalogs"]=catalogsDescription;
-+	QFile tmp(starConfigFileFullPath);
-+	if(tmp.open(QIODevice::WriteOnly))
-+	{
-+		StelJsonParser::write(starSettings, &tmp);
-+		tmp.close();
- 	}
- }
- 
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
deleted file mode 100644
index 784b388b2534..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-test-x86.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 802065e025c8b435dc39b4fdd9262efdc1dcd2a8 Mon Sep 17 00:00:00 2001
-From: "Alexander V. Wolf" <alex.v.wolf@gmail.com>
-Date: Tue, 24 May 2022 14:47:50 +0700
-Subject: [PATCH]  Fixed something strange in radToHMSStr and radToHMSStrAdapt
- convertors
-
-probably ancient bug (?), maybe related to issue #2460
----
- src/core/StelUtils.cpp        |  6 +++---
- src/tests/testConversions.cpp | 16 ++++++----------
- 2 files changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/src/core/StelUtils.cpp b/src/core/StelUtils.cpp
-index 521d538315e..93a55ebb957 100644
---- a/src/core/StelUtils.cpp
-+++ b/src/core/StelUtils.cpp
-@@ -225,9 +225,9 @@ QString radToHmsStr(const double angle, const bool decimal)
- {
- 	unsigned int h,m;
- 	double s;
--	StelUtils::radToHms(angle+0.005*M_PI/12/(60*60), h, m, s);
-+	StelUtils::radToHms(angle, h, m, s);
- 	int width, precision;
--	QString carry, r;
-+	QString carry;
- 	if (decimal)
- 	{
- 		width=5;
-@@ -268,7 +268,7 @@ QString radToDmsStrAdapt(const double angle, const bool useD)
- 	bool sign;
- 	unsigned int d,m;
- 	double s;
--	StelUtils::radToDms(angle+0.005*M_PI/180/(60*60)*(angle<0?-1.:1.), sign, d, m, s); // NOTE: WTF???
-+	StelUtils::radToDms(angle, sign, d, m, s);
- 	QString str;
- 	QTextStream os(&str);
- 
-diff --git a/src/tests/testConversions.cpp b/src/tests/testConversions.cpp
-index a37db14307c..6e8a4c6f04c 100644
---- a/src/tests/testConversions.cpp
-+++ b/src/tests/testConversions.cpp
-@@ -248,12 +248,12 @@ void TestConversions::testRadToDMSStrAdapt()
- 	data << 61*M_PI/360		<< "+30°30'"		<< false;
- 	data << M_PI/648000		<< "+0°0'1\""		<< false;
- 	data << 1213*M_PI/2400		<< "+90°58'30\""	<< false;
--	data << 39599*M_PI/648000	<< "+10°59'59\""	<< false;
-+	data << 39599*M_PI/648000	<< "+10°59'59.00\""	<< false;
- 	data << -M_PI/36		<< "-5°"		<< false;
- 	data << -7*M_PI/8		<< "-157°30'"		<< false;
- 	data << -2*M_PI/5		<< "-72°"		<< false;
- 	data << -M_PI			<< "-180°"		<< false;
--	data << -10*M_PI/648		<< "-2°46'40\""		<< false;
-+	data << -10*M_PI/648		<< "-2°46'40.00\""	<< false;
- 
- 	data << 0.			<< "+0d"		<< true;
- 	data << M_PI/6			<< "+30d"		<< true;
-@@ -268,12 +268,12 @@ void TestConversions::testRadToDMSStrAdapt()
- 	data << 61*M_PI/360		<< "+30d30'"		<< true;
- 	data << M_PI/648000		<< "+0d0'1\""		<< true;
- 	data << 1213*M_PI/2400		<< "+90d58'30\""	<< true;
--	data << 39599*M_PI/648000	<< "+10d59'59\""	<< true;
-+	data << 39599*M_PI/648000	<< "+10d59'59.00\""	<< true;
- 	data << -M_PI/36		<< "-5d"		<< true;
- 	data << -7*M_PI/8		<< "-157d30'"		<< true;
- 	data << -2*M_PI/5		<< "-72d"		<< true;
- 	data << -M_PI			<< "-180d"		<< true;
--	data << -10*M_PI/648		<< "-2d46'40\""		<< true;
-+	data << -10*M_PI/648		<< "-2d46'40.00\""	<< true;
- 
- 	while (data.count()>=3)
- 	{
-@@ -282,9 +282,7 @@ void TestConversions::testRadToDMSStrAdapt()
- 		bool flag	= data.takeFirst().toBool();
- 		QString rdms	= StelUtils::radToDmsStrAdapt(rad, flag);
- 		QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flag: %4]")
--						.arg(QString::number(rad, 'f', 5))
--						.arg(rdms)
--						.arg(edms)
-+						.arg(QString::number(rad, 'f', 5), rdms, edms)
- 						.arg(flag)));
- 	}
- }
-@@ -381,9 +379,7 @@ void TestConversions::testRadToDMSStr()
- 		bool useDF	= data.takeFirst().toBool();
- 		QString rdms	= StelUtils::radToDmsStr(rad, decimalF, useDF);
- 		QVERIFY2(rdms==edms, qPrintable(QString("%1 radians = %2 (expected %3) [flags: %4, %5]")
--						.arg(QString::number(rad, 'f', 5))
--						.arg(rdms)
--						.arg(edms)
-+						.arg(QString::number(rad, 'f', 5), rdms, edms)
- 						.arg(decimalF)
- 						.arg(useDF)));
- 	}
diff --git a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
deleted file mode 100644
index 41721046ed03..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
+++ /dev/null
@@ -1,208 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -614,6 +614,8 @@ ELSE(ENABLE_GPS)
-      MESSAGE(STATUS "GPS: disabled.")
- ENDIF(ENABLE_GPS)
- 
-+find_package(Qt5Compress REQUIRED)
-+
- IF(USE_QTOPENGL)
-      # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
-      # but the QtMultimediaWidgets module requires it internally, so we still have to package it.
---- a/plugins/Satellites/src/CMakeLists.txt
-+++ b/plugins/Satellites/src/CMakeLists.txt
-@@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
- ENDIF(ENABLE_TESTING)
- 
- ADD_LIBRARY(Satellites-static STATIC ${Satellites_SRCS} ${Satellites_RES_CXX} ${SatellitesDialog_UIS_H})
--TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets)
-+TARGET_LINK_LIBRARIES(Satellites-static Qt5::Core Qt5::Network Qt5::Widgets Qt5::Compress)
- # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
- SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
- IF(MSVC)
---- a/plugins/Satellites/src/Satellites.cpp
-+++ b/plugins/Satellites/src/Satellites.cpp
-@@ -43,7 +43,7 @@
- #include "StelUtils.hpp"
- #include "StelActionMgr.hpp"
- 
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- 
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
-@@ -1639,12 +1639,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
- 					QString archive = zip.fileName();
- 					QByteArray data;
- 
--					Stel::QZipReader reader(archive);
--					if (reader.status() != Stel::QZipReader::NoError)
-+					QZipReader reader(archive);
-+					if (reader.status() != QZipReader::NoError)
- 						qWarning() << "[Satellites] Unable to open as a ZIP archive";
- 					else
- 					{
--						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 						for (const auto& info : qAsConst(infoList))
- 						{
- 							// qWarning() << "[Satellites] Processing:" << info.filePath;
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -479,7 +479,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
-      CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
- ENDIF()
- 
--SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} qtcompress_stel glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
-+SET(STELMAIN_DEPS ${ZLIB_LIBRARIES} Qt5::Compress glues_stel qcustomplot_stel qxlsx_stel ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${STELLARIUM_QT_LIBRARIES} ${SPOUT_LIBRARY})
- IF(ENABLE_LIBGPS)
-      SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
- ENDIF()
---- a/src/core/modules/LandscapeMgr.cpp
-+++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1331,8 +1331,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 	}
- 	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
- 
--	Stel::QZipReader reader(sourceFilePath);
--	if (reader.status() != Stel::QZipReader::NoError)
-+	QZipReader reader(sourceFilePath);
-+	if (reader.status() != QZipReader::NoError)
- 	{
- 		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
- 		emit errorNotArchive();
-@@ -1341,7 +1341,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
- 
- 	//Detect top directory
- 	QString topDir, iniPath;
--	const QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
-+	const QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 	for (const auto& info : infoList)
- 	{
- 		QFileInfo fileInfo(info.filePath);
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

- 

-+if(0)

- set(qtcompress_SRCS

-     qtcompress/qzip.cpp

-     qtcompress/qzipreader.h

-@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
- #turn off automoc, not needed here

- set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

-+endif()

- 

- # QCustomPlot should not be unbundled, because upstream uses GPL 3, and

- # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.

-@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
-     qxlsx/xlsxcelllocation.h

-     )

- add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

--target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)

-+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)

- set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

- 

- ################################# INDI ################################

---- a/src/external/qxlsx/xlsxzipreader.cpp
-+++ b/src/external/qxlsx/xlsxzipreader.cpp
-@@ -5,13 +5,13 @@
- QT_BEGIN_NAMESPACE_XLSX
- 
- ZipReader::ZipReader(const QString &filePath) :
--    m_reader(new Stel::QZipReader(filePath))
-+    m_reader(new QZipReader(filePath))
- {
-     init();
- }
- 
- ZipReader::ZipReader(QIODevice *device) :
--    m_reader(new Stel::QZipReader(device))
-+    m_reader(new QZipReader(device))
- {
-     init();
- }
-@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
- 
- void ZipReader::init()
- {
--    QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
--    for (const Stel::QZipReader::FileInfo &fi : allFiles) {
-+    QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+    for (const QZipReader::FileInfo &fi : allFiles) {
-         if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
-             m_filePaths.append(fi.filePath);
-     }
---- a/src/external/qxlsx/xlsxzipreader_p.h
-+++ b/src/external/qxlsx/xlsxzipreader_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
- 
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipreader.h"
-+#include "qzipreader.h"
- 
- #if QT_VERSION >= 0x050600
-  #include <QVector>
-@@ -31,7 +31,7 @@ public:
- private:
-     Q_DISABLE_COPY(ZipReader)
-     void init();
--    QScopedPointer<Stel::QZipReader> m_reader;
-+    QScopedPointer<QZipReader> m_reader;
-     QStringList m_filePaths;
- };
- 
---- a/src/external/qxlsx/xlsxzipwriter.cpp
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp
-@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
- 
- ZipWriter::ZipWriter(const QString &filePath)
- {
--    m_writer = new Stel::QZipWriter(filePath, QIODevice::WriteOnly);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(filePath, QIODevice::WriteOnly);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::ZipWriter(QIODevice *device)
- {
--    m_writer = new Stel::QZipWriter(device);
--    m_writer->setCompressionPolicy(Stel::QZipWriter::AutoCompress);
-+    m_writer = new QZipWriter(device);
-+    m_writer->setCompressionPolicy(QZipWriter::AutoCompress);
- }
- 
- ZipWriter::~ZipWriter()
-@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
- 
- bool ZipWriter::error() const
- {
--    return m_writer->status() != Stel::QZipWriter::NoError;
-+    return m_writer->status() != QZipWriter::NoError;
- }
- 
- void ZipWriter::addFile(const QString &filePath, QIODevice *device)
---- a/src/external/qxlsx/xlsxzipwriter_p.h
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h
-@@ -8,7 +8,7 @@
- #include <QIODevice>
- 
- #include "xlsxglobal.h"
--#include "external/qtcompress/qzipwriter.h"
-+#include "qzipwriter.h"
- 
- class QZipWriter;
- 
-@@ -27,7 +27,7 @@ public:
-     void close();
- 
- private:
--    Stel::QZipWriter *m_writer;
-+    QZipWriter *m_writer;
- };
- 
- QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild b/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
deleted file mode 100644
index 30d58b14eedc..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.21.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.13"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
-	deep-sky? (
-		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
-	)
-	doc? (
-		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
-	)
-	stars? (
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen[dot] )
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-libs/qtcompress:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? (
-		dev-qt/qtpositioning:5
-		dev-qt/qtserialport:5
-		sci-geosciences/gpsd:=[cxx]
-	)
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? (
-		dev-qt/qtserialport:5
-		sci-libs/indilib:=
-	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.21.2-unbundle-qtcompress.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-
-	# Several libraries are bundled, remove them.
-	rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
-	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
-	# while we have qcustomplot 2 in tree which changed API a bit
-	# Also the license of the external qcustomplot is incompatible with stellarium
-
-	# for glues_stel aka libtess I couldn't find an upstream with the same API
-
-	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
-
-	local remaining="$(cd src/external/ && echo */)"
-	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
-		eqawarn "Need to unbundle more deps: ${remaining}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build apidoc
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
-		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
-	fi
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	if use deep-sky ; then
-		insinto /usr/share/${PN}/nebulae/default
-		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
deleted file mode 100644
index 224aff001b9d..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.1-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.15"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
-	deep-sky? (
-		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
-	)
-	doc? (
-		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
-	)
-	stars? (
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	doc? ( app-doc/doxygen[dot] )
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-libs/qtcompress:=
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? (
-		dev-qt/qtpositioning:5
-		dev-qt/qtserialport:5
-		sci-geosciences/gpsd:=[cxx]
-	)
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? (
-		dev-qt/qtserialport:5
-		sci-libs/indilib:=
-	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-	"${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch"
-	"${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
-	"${FILESDIR}/stellarium-0.22.1-fix-test-x86.patch"
-	"${FILESDIR}/stellarium-0.22.1-fix-conv.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-
-	# Several libraries are bundled, remove them.
-	rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
-	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
-	# while we have qcustomplot 2 in tree which changed API a bit
-	# Also the license of the external qcustomplot is incompatible with stellarium
-
-	# for glues_stel aka libtess I couldn't find an upstream with the same API
-
-	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
-
-	local remaining="$(cd src/external/ && echo */)"
-	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
-		eqawarn "Need to unbundle more deps: ${remaining}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build apidoc
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
-		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
-	fi
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	if use deep-sky ; then
-		insinto /usr/share/${PN}/nebulae/default
-		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}
diff --git a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
deleted file mode 100644
index b200ab6bbf5c..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake desktop flag-o-matic python-any-r1 xdg virtualx
-
-DESCRIPTION="3D photo-realistic skies in real time"
-HOMEPAGE="https://stellarium.org/"
-MY_DSO_VERSION="3.15"
-SRC_URI="
-	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
-	deep-sky? (
-		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
-	)
-	doc? (
-		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
-	)
-	stars? (
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
-		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
-	)"
-
-LICENSE="GPL-2+ SGI-B-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test webengine"
-
-# Python interpreter is used while building RemoteControl plugin
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen[dot] )
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	dev-libs/qtcompress:=
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? (
-		dev-qt/qtpositioning:5
-		dev-qt/qtserialport:5
-		sci-geosciences/gpsd:=[cxx]
-	)
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? (
-		dev-qt/qtserialport:5
-		sci-libs/indilib:=
-	)
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? ( dev-qt/qttest:5 )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
-	"${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch"
-	"${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	use debug || append-cppflags -DQT_NO_DEBUG #415769
-
-	# Several libraries are bundled, remove them.
-	rm -r src/external/{libindi,qtcompress,zlib}/ || die
-
-	# qcustomplot can't be easily unbundled because it uses qcustomplot 1
-	# while we have qcustomplot 2 in tree which changed API a bit
-	# Also the license of the external qcustomplot is incompatible with stellarium
-
-	# for glues_stel aka libtess I couldn't find an upstream with the same API
-
-	# unbundling of qxlsx depends on https://github.com/QtExcel/QXlsx/pull/185
-
-	local remaining="$(cd src/external/ && echo */)"
-	if [[ "${remaining}" != "glues_stel/ qcustomplot/ qxlsx/" ]]; then
-		eqawarn "Need to unbundle more deps: ${remaining}"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GPS="$(usex gps)"
-		-DENABLE_MEDIA="$(usex media)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_TESTING="$(usex test)"
-		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc ; then
-		cmake_build apidoc
-	fi
-}
-
-src_install() {
-	if use doc ; then
-		local HTML_DOCS=( "${BUILD_DIR}/doc/html/." )
-		dodoc "${DISTDIR}/stellarium_user_guide-${PV}-1.pdf"
-	fi
-	cmake_src_install
-
-	# use the more up-to-date system fonts
-	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
-	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
-	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
-
-	if use stars ; then
-		insinto /usr/share/${PN}/stars/default
-		doins "${DISTDIR}"/stars_4_1v0_2.cat
-		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
-	fi
-	if use deep-sky ; then
-		insinto /usr/share/${PN}/nebulae/default
-		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
-	fi
-	newicon doc/images/stellarium-logo.png ${PN}.png
-}