gentoo resync : 12.05.2022

4 files changed, 254 insertions, 8 deletions

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index c18d79328e7b..2b3226658192 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,16 +1,19 @@
 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-star-manager-segfault.patch 873 BLAKE2B 5f970fd0f30fe6e73d0479d603e572bd4e6db5545d584badb11cecb09d2ba704c420398734e0f943c2ca34d1d5c7a93cea3da446d3b0e72bc2d18db1a455246b SHA512 f85d5c7614ba3dda8dc752c76a55ac361d194345cc926127d7428b82057dd19da27813f0071abfc2deb3ee729d7c33703ed3d5dfb3a2644c16d95ead400ca882
+AUX stellarium-0.22.1-unbundle-qtcompress.patch 7595 BLAKE2B 650c9de68a42c101df436c32c7f42f8623903c969d82f1de2c411c34d5237601df401129b950e407ff0e558f2c1e5c18bdbef5bf26bae2d499fda5377ef67c3d SHA512 8550ec4d9cd0b044491bb592a099bb7b28c8de03cef2ca38e8ad420303bc02b053bf896265cdbb08629befc0086dae9be31b0ed78c10756fd67eaa692a69ca64
 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.21.2.tar.gz 387061883 BLAKE2B 74878961efb01088c5c7c3031d989cccce5db2e072890d01a37a8b40d30838d7ee06f440abcd8279f14677f12c42f29d129499cf2e73c0bd2e771f201007d123 SHA512 91f4e263bcda25ba356decc99f46a3e278be24bcab25519522deac0ed540205ab8320365bb40a56b7f231635bf5b026b4f87f00eeb68a26eab2b7e37d38567bf
 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-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d569c9639170c8a430901c1c6098a86a33fe8934cd4454a87b51752636a15ab1a96fd3ebd77cbd5d9e4260436ec2e4e4795f98b0 SHA512 3880ec776798599640fb083b0c9ebbccadef44f640fb2214052161ddbeb06bf5b0babc0c31d9ac02aa40e52e290d4f5613c11a6dadd83fd61114dbfb49ebe855
-DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
+DIST stellarium-dso-catalog-3.15.dat 28683372 BLAKE2B c2ba23a6b169815ed20d97113887f663a9b730774cc2e8402e4149ff25b8d0107166c806814d3fb46ccc1f1859a901508f652234b8ddff3ea7d4710b21b65c93 SHA512 2f43696b093bcc35288b51fdacf89380ee878296fa596c10404c89004efbd08104e7d04e193499eed711ad7d13dd7fe8af805167e3b10d6b2c2b02fca42ad041
 DIST stellarium_user_guide-0.21.3-1.pdf 31253904 BLAKE2B 3e8a0395a29c2fac164379ea315cd21d102b2b400d9eeacdb37cf85f00816f0678edabb9b779db135f4c43ee4cfcc6307ee59f4a149aa33e878c11fe26551266 SHA512 83137fe09bdc279bec23b78694d5e1efe9238733f8adf2cb8ed7e37f0eee60b0475c4c93b5bc85a04b92a175284c24354c36b6a93014216387211c9b031cdf7c
-EBUILD stellarium-0.21.2.ebuild 4066 BLAKE2B 94e758cf2cf2d99f370ff6382acb470fe9d51fa0c933ef1accbfd10737d20091d2849ab419bbdd290fd58b63da5ed04ece490f5b7eb1c9d12cd32493af53b123 SHA512 b101963be54ac92f27dbf7e802eff39e7bb49ea39a5c014b5c3dee957aad845f1bb8d443ab802265ebfe475a93e2e52e8cd883b0ff057a268353f82c13e03ff2
+DIST stellarium_user_guide-0.22.1-1.pdf 36226017 BLAKE2B 628c57f1efa6238e5c12588ed4b0532816e8708f16d40fad0d87f72550af5efa500ae0edbc20e243488c59dfc94b47efe588d47419e7d29b1fd6ff9e4cec5438 SHA512 07d965f5b45ac964bec401f14ee81322a17939e292390ebd040339c265ede4b652b37e9220696f13c093ea22e8a706b27b7d23d7357dffbe808c2538f8cee93d
 EBUILD stellarium-0.21.3.ebuild 4231 BLAKE2B d865110272f4d1108a654e0cfc901ba2f33f9bfc4450723ce05004a056ad9bc29e87a118024f9861978808cf95629619a2f15985c88e54c77d3cad23823ad5be SHA512 0eb62c03aececa55b69fb061391d23531651a1e897e457aa52902ee9c087594c21453268269f6527092450112391dcfea2c18c3e2e58d7038d46b704015363a5
+EBUILD stellarium-0.22.1.ebuild 4319 BLAKE2B 9ca380bac74bf39c77f0a1e8d9f65cfb91b8e9734bbafe95a56d20345fd6cbc47e6b9cfba4cf0364eace660c9eb9dd196c3c450e8462fad735f578026881b9ab SHA512 2b56eaf926526f18783eacc101d52c0aaa2163075835f3016606996eefc888f902c4d946f80fd152a716c9313616bc8d2b9ca6ae4abe7e3694d24fec66b07d2a
 MISC metadata.xml 1331 BLAKE2B 858e48ee46003e8f9d5cb7c6dfe0dd0dab5126c069592c7edbdf2ddf0e3b281d4e5cab5cf21b6197dbde7d7a152225999773265cc4319a4550f15ee2c9903626 SHA512 7e801dbdccaef56276bde6a96bfd61811e6d6b6fcba21238d889d8b882afb9e983ed921dd4d30015107cc48afe6539c19a7bb6692300800ed9f8cc5e4166b5e7
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
new file mode 100644
index 000000000000..7f8981a006e2
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-fix-star-manager-segfault.patch
@@ -0,0 +1,30 @@
+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-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
new file mode 100644
index 000000000000..41721046ed03
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.22.1-unbundle-qtcompress.patch
@@ -0,0 +1,208 @@
+--- 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.2.ebuild b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
index 081f54b46aa9..20e481ce1cc5 100644
--- a/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ 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"
+MY_DSO_VERSION="3.15"
 SRC_URI="
 	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
 	deep-sky? (
@@ -27,8 +27,8 @@ SRC_URI="
 
 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"
+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="
@@ -38,6 +38,7 @@ BDEPEND="
 "
 RDEPEND="
 	dev-libs/qtcompress:=
+	dev-qt/qtcharts:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -58,6 +59,7 @@ RDEPEND="
 		dev-qt/qtserialport:5
 		sci-libs/indilib:=
 	)
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
@@ -68,8 +70,9 @@ 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"
+	"${FILESDIR}/stellarium-0.22.1-fix-star-manager-segfault.patch"
+	"${FILESDIR}/stellarium-0.22.1-unbundle-qtcompress.patch"
 )
 
 src_prepare() {
@@ -100,6 +103,8 @@ src_configure() {
 		-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
 }