From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB58A158018 for ; Wed, 29 Sep 2021 08:07:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12062E0990; Wed, 29 Sep 2021 08:07:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB53EE0990 for ; Wed, 29 Sep 2021 08:07:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F8AD342EE6 for ; Wed, 29 Sep 2021 08:07:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C7276D0 for ; Wed, 29 Sep 2021 08:07:46 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1632902856.8e9eafc77524e0abd307d4a23a27e4314f87ee6b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/stellarium/Manifest sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch sci-astronomy/stellarium/stellarium-0.20.4.ebuild sci-astronomy/stellarium/stellarium-0.21.0.ebuild X-VCS-Directories: sci-astronomy/stellarium/files/ sci-astronomy/stellarium/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8e9eafc77524e0abd307d4a23a27e4314f87ee6b X-VCS-Branch: master Date: Wed, 29 Sep 2021 08:07:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 289af08d-c360-400b-8399-67acab6aad36 X-Archives-Hash: a2b7af3a0911492f3eaa11d5511e3b08 commit: 8e9eafc77524e0abd307d4a23a27e4314f87ee6b Author: Alexey Sokolov asokolov org> AuthorDate: Wed Sep 29 08:07:36 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Sep 29 08:07:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9eafc7 sci-astronomy/stellarium: drop old Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Alexey Sokolov asokolov.org> Signed-off-by: David Seifert gentoo.org> sci-astronomy/stellarium/Manifest | 4 - .../stellarium-0.20.3-unbundle-qtcompress.patch | 222 --------------------- sci-astronomy/stellarium/stellarium-0.20.4.ebuild | 135 ------------- sci-astronomy/stellarium/stellarium-0.21.0.ebuild | 141 ------------- 4 files changed, 502 deletions(-) diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest index 8f4f9983e00..943e3f7c2fd 100644 --- a/sci-astronomy/stellarium/Manifest +++ b/sci-astronomy/stellarium/Manifest @@ -3,10 +3,6 @@ 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.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-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_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f 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 deleted file mode 100644 index 64b19a54c88..00000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch +++ /dev/null @@ -1,222 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1b72c2c8f6..9436bc66da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -629,5 +629,6 @@ ELSE() - ENDIF() - -+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 ---- 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) -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 @@ - #include "StelUtils.hpp" - #include "StelActionMgr.hpp" - --#include "external/qtcompress/qzipreader.h" -+#include "qzipreader.h" - - #include - #include -@@ -1533,12 +1533,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 infoList = reader.fileInfoList(); -+ QList infoList = reader.fileInfoList(); - for (const auto& info : 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) - 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() -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 - } - 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(); -@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const - - //Detect top directory - QString topDir, iniPath; -- QList infoList = reader.fileInfoList(); -+ QList infoList = reader.fileInfoList(); - 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) - 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() - - set(qcustomplot_SRCS - qcustomplot/qcustomplot.cpp -@@ -176,7 +176,7 @@ - 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 ################################ -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 { - - 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(); - } -@@ -45,8 +45,8 @@ - - void ZipReader::init() - { -- QList allFiles = m_reader->fileInfoList(); -- foreach (const Stel::QZipReader::FileInfo &fi, allFiles) -+ QList 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 @@ - // - - #include "xlsxglobal.h" --#include "external/qtcompress/qzipreader.h" -+#include "qzipreader.h" - #include - #include - #include -@@ -60,7 +60,7 @@ - private: - Q_DISABLE_COPY(ZipReader) - void init(); -- QScopedPointer m_reader; -+ QScopedPointer m_reader; - 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 @@ - - 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() -@@ -46,7 +46,7 @@ - - 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) -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 @@ - // - - #include --#include "external/qtcompress/qzipwriter.h" -+#include "qzipwriter.h" - - class QIODevice; - class QZipWriter; -@@ -57,7 +57,7 @@ - void close(); - - private: -- Stel::QZipWriter *m_writer; -+ QZipWriter *m_writer; - }; - - } // namespace QXlsx 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 25de0105315..00000000000 --- 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.0.ebuild deleted file mode 100644 index 9f6e471d3ed..00000000000 --- a/sci-astronomy/stellarium/stellarium-0.21.0.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" -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/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:= - ) -" -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.0-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 -}