gentoo resync : 01.10.2021

5 files changed, 55 insertions, 207 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 9bfe1bec9d38..bd449a468a49 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index ccb9725e7912..d793b8961287 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,20 +1,18 @@
 AUX stellarium-0.20.3-unbundle-indi.patch 3217 BLAKE2B 9de42cc423655ef8280fc5d40c917211ae9904310defc9f16d2a2cc3448b209c6aba67c34a48c884cd7f09a6b6a9e964c9fd8b9faa7ca6a3cd2101290bb2bb5d SHA512 f6da77375632ff5c2b99d30f5d361fa1cd4bc2dca89afb1b4c5a9b47d9396687c473cb4acc3d87f4242207de2dee9dce44899cc7de3baebb2dba9d550d25e294
-AUX stellarium-0.20.3-unbundle-qtcompress.patch 8123 BLAKE2B 314a2f4c191b7d6c0083679878c38bf6f632a1be6d19d68d82a0eda520c9a96e3f4f87d7437b6cf53c0812fc917ec82865796a8088da7afc2d6424d442a20a94 SHA512 fd6121345a5609b8a70a06753b6495b258eae7a1f978d8eeac8e7aa6b73777d9a982bc016d891bbcad48ead1b5c624bb0b07dbac8b40bd1a16baaf347b72b97d
 AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 AUX stellarium-0.21.0-unbundle-qtcompress.patch 8133 BLAKE2B 83b66dfb3938c775092b48c4bcb65feab6b6c76ef98016dd84e680bb6ce99abaade3af2e8be7e179fa9c53235cc767b5f1a075d75133232aaacfe2c8aad51de3 SHA512 262c5efd0e2ab5545ba1d99850d1edeafb2b0cbe7a15125b648991d49e2a0d4dfb7bac488a7e2709e6ecaab285c2c74f36a50cca65fbcda7c9f8905e4f3902da
+AUX stellarium-0.21.2-unbundle-qtcompress.patch 7484 BLAKE2B f3cf62bf45247c2b4a09a55dcfbc3424869ce4c294da0a4ebc4daa3a19baa7ba377ff9ff4e271d2aab098f20ecde5018793901cacc54be9849bccad510831ca1 SHA512 81934b0b9ba8b2d1d8fa75eacdf146e374bbc29b862fe5585a4846d14c17174ef0c936d22c1a80eb61d3041d79d0f981d01bdb215e4530833b9d00e2613d0dae
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
 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.20.4.tar.gz 347033776 BLAKE2B 91b7f63f74d36a1e1af7d758cb8bea7f51397bc9a8b8ebda2cbc0ea919c9f4bef2312ce979b50dc6ec0706783f35f60f4562290173fec673dc3d9f4097b9f46e SHA512 29e14d56a93db672b5163e6f21dda462fe6c5598d9791bf9a98f414f662c26e0826b3892e3a888688371d805bbddbf5fb47f193c4e16d754fe83fbfb9559e5ae
-DIST stellarium-0.21.0.tar.gz 353736120 BLAKE2B e031cce8dbbaf622d451da9219bfae3b36135a8d2f9b8047e2f2c4256804fcc1953c53131bcde7260294e909a949b9010b383da6ebe36611f79342e1c162f7c7 SHA512 79844758f96a013759673b3f88bc13cd16613a57998ee69ae5627827f1a2de26c3c63e3bc1a55b572f6443a7e706951d96f32ab6ba0b37afe2a8274ae980083c
 DIST stellarium-0.21.1.tar.gz 362055145 BLAKE2B a7ea6327d415331848a53879e76ea973fbb51709a0bd561cd4e415b215e5c8494290e2e663bda9f463f565a771465e0e0133f46517a5798d607f076e2635764d SHA512 6dd935808c711da32c793a0cedad464a15bf35ede60cff385e96f1d5868e751ed2e09b61551f7a6fe599b702a6f4d0a62d4494a40b68e77685ba57b6a63b5031
+DIST stellarium-0.21.2.tar.gz 387061883 BLAKE2B 74878961efb01088c5c7c3031d989cccce5db2e072890d01a37a8b40d30838d7ee06f440abcd8279f14677f12c42f29d129499cf2e73c0bd2e771f201007d123 SHA512 91f4e263bcda25ba356decc99f46a3e278be24bcab25519522deac0ed540205ab8320365bb40a56b7f231635bf5b026b4f87f00eeb68a26eab2b7e37d38567bf
 DIST stellarium-dso-catalog-3.12.dat 28298461 BLAKE2B 0845981c1d35480eb0b1656e167f7f2dece00d82890c6605b6e5305e6c5be02bcce463c4a34ba3f9ee52f42c35b0a416a93b91361fdd9ce3c24f9bcb4be038f9 SHA512 0de88e559cc26c484edb0eb9d3dd33b4faf9a0e3579dc5ebfbcba70cc39a4e052248c159ace29c9a69027c8c121a832d510459d523b2e05bb0620556d2a49935
-DIST stellarium_user_guide-0.20.4-1.pdf 32523592 BLAKE2B 0ead51a575a5ea66c23d7bd2af287d4cf6a68170c254a9d03e75542b73dd81ba73d8e5a36e2f964d9b31eced34b204bd9940db0984b6abd6ff926d096c9bd0fc SHA512 caab87576e9b0f25a439acf1f111243af65b88288f34ae9e3382ed165453015f1301e693a6f9f1cc44b91466a168b1c02bc58fe642ea161e9eb78dcafbc16c13
-DIST stellarium_user_guide-0.21.0-1.pdf 31132367 BLAKE2B d353b9160d7261c410aaa90b3f79955f03ca8453f44249fcec772cb435d4f909fbedeac940afc2f2728008a8c75b366232d943b4dc72698aec95f3ce3b0af38e SHA512 254fe13219b7be5604db28553bbfabb4aaf8c4b82a58a9854806352e25ba7cd419ac8ebbafec92553ccdb499aa6700fb6d7a8537484c12c8314084287a70290d
+DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
 DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
-EBUILD stellarium-0.20.4.ebuild 3980 BLAKE2B 0e1c9517aaf37c258e8343adee97b5932c06b0d5210eca3151c8f8431002c9c4dad1e62885d51fb7d0828a7099c7a6fa20ba516c90b7e452bc679eec03ee7393 SHA512 a1b0ada116ed34164ee771c68d7b84a5f1fbb16294dd31963d84ab927cf112ba92fd48aeea070ec2ec73922acc236cbd44e72f6f709eb0aabaa8033291dbd6bf
-EBUILD stellarium-0.21.0.ebuild 4045 BLAKE2B e0940012d4da752e2ccbec0ad5f08f6ca609a25cc5ad085f9668e799838f3af7b7780d70bfc48b78601d1e6f5f6fb060fe85f7fb6319ef84c86a93fc97f1a897 SHA512 703127041fd91ebba34f53b9f6b5aa78cd28ff55551b2f1a868d66b9d6f4b4b2d19a48837b12e99bb76e151571f98854ec947013f0f592c79bd3c34d0126e242
+DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
 EBUILD stellarium-0.21.1.ebuild 4041 BLAKE2B aec4e079a895882d66ca5e3c7c81cd2abbb972692a205f3f529c594229daf56c0b77921497fbf33019efdc50a75f44ea31e8ea30dd5d557f20c3de0850896e66 SHA512 e17e1c3c11de681a243c40589fff17c11a7b86b071c1f8772bcacb464432e22cca3a9cdb36a38d71c706b5c32187d86e7ca4e35ec5a3f91f453c3bb02768665d
+EBUILD stellarium-0.21.2.ebuild 4063 BLAKE2B 13b38a8f7c5c8f9fbc1960655f7949378ca85b42842f5cf989fd0def03b6b27038833f4ad9d82194d184bf4c5a493575d4b21ce69717b35f81ff4f3ec6f03011 SHA512 12e76c5da96d73aa441f464d3620b5a7f285b01f5a70269d1db6603637dea2c4cd094636424a5c9c68272f9d16c0196f880f80bdef0d28fc1252bdb696816a3f
 MISC metadata.xml 1197 BLAKE2B e58627df43d61288709e9a6bc4f77c91c14c672b8a3b87c43230f4b84f206675c907ddf54bf581c5f482943ba81ef5d9bbc89d85587725cb3c085565c53f5cac SHA512 fdce909883c678f3e6ebdb1e211135eddf8993eba88c46646005b223d74a126a5c98c61cd053f099d3f8ce0530e42ae02df24e5ebbd207b86cbca8556315f0a7
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
index 64b19a54c88a..f5d757b1bb16 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
@@ -1,16 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b72c2c8f6..9436bc66da 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -629,5 +629,6 @@ ELSE()
- ENDIF()
+@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
+      MESSAGE(STATUS "GPS: disabled.")
+ ENDIF(ENABLE_GPS)
  
 +find_package(Qt5Compress REQUIRED)
  
- ########### Set some global variables ###########
- IF(UNIX AND NOT WIN32)
-diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
-index 8e3138adf2..b59049767d 100644
+ 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)
@@ -22,8 +19,6 @@ index 8e3138adf2..b59049767d 100644
  # 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)
-diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
-index 7432f4316d..f4f4453661 100644
 --- a/plugins/Satellites/src/Satellites.cpp
 +++ b/plugins/Satellites/src/Satellites.cpp
 @@ -43,7 +43,7 @@
@@ -35,7 +30,7 @@ index 7432f4316d..f4f4453661 100644
  
  #include <QNetworkAccessManager>
  #include <QNetworkReply>
-@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
  					QString archive = zip.fileName();
  					QByteArray data;
  
@@ -48,14 +43,12 @@ index 7432f4316d..f4f4453661 100644
  					{
 -						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
 +						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 						for (const auto& info : infoList)
+ 						for (const auto& info : qAsConst(infoList))
  						{
  							// qWarning() << "[Satellites] Processing:" << info.filePath;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bdd214729f..81631ce8ec 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
       CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
  ENDIF()
  
@@ -64,11 +57,9 @@ index bdd214729f..81631ce8ec 100644
  IF(ENABLE_LIBGPS)
       SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
  ENDIF()
-diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
-index 8da2070b26..9949252cee 100644
 --- a/src/core/modules/LandscapeMgr.cpp
 +++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
  	}
  	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
  
@@ -79,7 +70,7 @@ index 8da2070b26..9949252cee 100644
  	{
  		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
  		emit errorNotArchive();
-@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
  
  	//Detect top directory
  	QString topDir, iniPath;
@@ -88,8 +79,6 @@ index 8da2070b26..9949252cee 100644
  	for (const auto& info : infoList)
  	{
  		QFileInfo fileInfo(info.filePath);
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 1e0e7e2b32..834aff89cb 100644
 --- a/src/external/CMakeLists.txt
 +++ b/src/external/CMakeLists.txt
 @@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
@@ -106,9 +95,9 @@ index 1e0e7e2b32..834aff89cb 100644
  SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

 +endif()

  

- set(qcustomplot_SRCS

-     qcustomplot/qcustomplot.cpp

-@@ -176,7 +176,7 @@
+ # 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})

@@ -117,11 +106,10 @@ index 1e0e7e2b32..834aff89cb 100644
  set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

  

  ################################# INDI ################################

-diff -r 11536448457a xlsxzipreader.cpp
---- a/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -28,13 +28,13 @@
- namespace QXlsx {
+--- 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))
@@ -136,30 +124,29 @@ diff -r 11536448457a xlsxzipreader.cpp
  {
      init();
  }
-@@ -45,8 +45,8 @@
+@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
  
  void ZipReader::init()
  {
--	QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
--	foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
-+	QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+	foreach (const QZipReader::FileInfo &fi, allFiles)
- 	{
- 		if (fi.isFile)
- 			m_filePaths.append(fi.filePath);
-diff -r 2019bb0d2919 xlsxzipreader_p.h
---- a/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -38,7 +38,7 @@
- //
+-    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"
- #include <QScopedPointer>
- #include <QStringList>
- #include <QVector>
-@@ -60,7 +60,7 @@
+ 
+ #if QT_VERSION >= 0x050600
+  #include <QVector>
+@@ -31,7 +31,7 @@ public:
  private:
      Q_DISABLE_COPY(ZipReader)
      void init();
@@ -168,10 +155,9 @@ diff -r 2019bb0d2919 xlsxzipreader_p.h
      QStringList m_filePaths;
  };
  
-diff -r 11536448457a xlsxzipwriter.cpp
---- a/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -29,14 +29,14 @@
+--- 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)
  {
@@ -190,7 +176,7 @@ diff -r 11536448457a xlsxzipwriter.cpp
  }
  
  ZipWriter::~ZipWriter()
-@@ -46,7 +46,7 @@
+@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
  
  bool ZipWriter::error() const
  {
@@ -199,19 +185,18 @@ diff -r 11536448457a xlsxzipwriter.cpp
  }
  
  void ZipWriter::addFile(const QString &filePath, QIODevice *device)
-diff -r 2019bb0d2919 xlsxzipwriter_p.h
---- a/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -37,7 +37,7 @@
- //
+--- a/src/external/qxlsx/xlsxzipwriter_p.h
++++ b/src/external/qxlsx/xlsxzipwriter_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
  
- #include <QString>
+ #include "xlsxglobal.h"
 -#include "external/qtcompress/qzipwriter.h"
 +#include "qzipwriter.h"
  
- class QIODevice;
  class QZipWriter;
-@@ -57,7 +57,7 @@
+ 
+@@ -27,7 +27,7 @@ public:
      void close();
  
  private:
@@ -219,4 +204,4 @@ diff -r 2019bb0d2919 xlsxzipwriter_p.h
 +    QZipWriter *m_writer;
  };
  
- } // namespace QXlsx
+ QT_END_NAMESPACE_XLSX
diff --git a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild b/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
deleted file mode 100644
index 25de0105315a..000000000000
--- a/sci-astronomy/stellarium/stellarium-0.20.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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.12"
-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.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 x86"
-IUSE="debug deep-sky doc gps media nls stars telescope test"
-
-# 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/qtserialport:5
-	dev-qt/qtwidgets:5
-	media-fonts/dejavu
-	sys-libs/zlib
-	virtual/opengl
-	gps? ( dev-qt/qtpositioning:5 )
-	media? ( dev-qt/qtmultimedia:5[widgets] )
-	telescope? ( sci-libs/indilib:= )
-"
-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-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/114
-
-	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_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.21.0.ebuild b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
index 9f6e471d3edb..6a6c12433040 100644
--- a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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.12"
+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.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+		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
@@ -68,7 +68,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/stellarium-0.20.3-unbundle-indi.patch"
-	"${FILESDIR}/stellarium-0.21.0-unbundle-qtcompress.patch"
+	"${FILESDIR}/stellarium-0.21.2-unbundle-qtcompress.patch"
 	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
 )
 
@@ -85,7 +85,7 @@ src_prepare() {
 
 	# 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/114
+	# 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