[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/, sci-astronomy/stellarium/

["Jason Zaman" <perfinion@gentoo.org>]

commit:     28410219672502497f887670ae4fc9eda6cd13ff
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Fri Nov  4 23:11:05 2022 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 01:32:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28410219

sci-astronomy/stellarium: add 1.1

Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://bugs.gentoo.org/862249
Bug: https://bugs.gentoo.org/745234
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>

 sci-astronomy/stellarium/Manifest                  |   3 +
 .../stellarium/files/stellarium-1.1-qxlsx.patch    |  11 ++
 sci-astronomy/stellarium/metadata.xml              |   3 +
 sci-astronomy/stellarium/stellarium-1.1.ebuild     | 172 +++++++++++++++++++++
 4 files changed, 189 insertions(+)

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index beecdeb0e8ee..2fcaef527f78 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,8 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
 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.22.2.tar.gz 409151525 BLAKE2B c49abfb17a8bf7b120d8a0dffbe58b83e18f86b7ef2764cddc946e0cbaad9bf01adaf8d008557108f6354ed11d79e56d94c92c2a07befbd955aed8d201b68292 SHA512 ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda
+DIST stellarium-1.1.1.tar.gz 413806998 BLAKE2B bd5679aa32edfa44807e941d0febcb1c1749eada6c2834cb16de4cc9850735c3033122fd1e4afc8b8550441b8a8f70865f6a7b3eb178bf906c8b64d7829ea3f6 SHA512 4564b8df21afb5d266c21e4d59a5df52a0695f102dc68d59d37ea29e520495132c7fb01235ceac5d68b0812fc05d35b5f8c7a5c337c55007ce562f770e3a3612
 DIST stellarium-dso-catalog-3.16.dat 28678822 BLAKE2B 130513b5dcb0d06dd605ed62d6bdf12bfd636a5e5f5c33f02c7adb77a6712245a98ce3d56332fce6fea0f18c9b7915af4bb3d9812b1fd09bfc036d4135cef4f5 SHA512 9320d2a3c9af93d19cc4414f371991993793b78315448cafcd83b82de6dc16715b0cab2ddeafca667af31a9086420cbe758708333e5b95215de8a46305324c41
+DIST stellarium-dso-catalog-3.17.dat 28678790 BLAKE2B 8ec14dd34c749a5bea19cc5567b2d703a7e5d4192eda6636fcec9fb2ef0301fd654aefdf4b33db70210da73eb9e385ace2265a57199f5660ec7034887fdcc80f SHA512 c0c679bd9de9e7ac000be5902d3a1e863853e8f9c382186253dd2d77a658fe93a9e2e206ecd1396f64b7b6cd4e738ecc2e11ea43bc6f71a098a44eb77875978a
 DIST stellarium_user_guide-0.22.2-1.pdf 35082446 BLAKE2B c9bb7f344a9377fe86b714904aa713c7e6cda59d31f8e547b571da0a057d141fa1b998b4adb3dbdcee0bb7a152b6f6e18b58a4a08c345dc0e77efca6ffb5a801 SHA512 45adfe53fa9c7432952152d95ab96a446a6459348fa6724fff83aababb0c967d9467cc0ca3bd24b834fd189fb69c782e521d94528a60a704062aa445e749a4a5
+DIST stellarium_user_guide-1.1-1.pdf 36567672 BLAKE2B d1b7f9c8d8974aeabe92e3127c84a79b92dd9c3a0057b7831a1851c7fc88c13ec456375847e90576448a5dbe655846142637c91067cc10df20ae2b9373190e8e SHA512 2dbcf4100c1f24770fa23b2995103b94f0736eacca76031cecac582364948a4cb0e32aabdb554a30a7a64ed53eaa3538d59d7af2434eb74a04d562f1453bc89d

diff --git a/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
new file mode 100644
index 000000000000..f3e4c9c38ab7
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-1.1-qxlsx.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -815,7 +815,7 @@ IF(ENABLE_XLSX)
+      # TODO: switch to something like vcpkg or conan, and plain find_package,
+      # without the fallback of cmake downloading the dep itself.
+      # But some libraries are not available there yet.
+-     CPMFindPackage(NAME QXlsx
++     CPMFindPackage(NAME QXlsxQt${QT_VERSION_MAJOR}
+ 	 URL https://github.com/QtExcel/QXlsx/archive/refs/tags/v1.4.4.zip
+ 	 URL_HASH SHA256=3efbd6f63a1ffd521c535dce7b5a5a7e9ebd23db51e6ae8e3e2eb89796e57675
+ 	 DOWNLOAD_ONLY yes

diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index a164ddaabccc..d4860f0597dd 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -22,9 +22,12 @@
 	<use>
 		<flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
 		<flag name="media">Enable sound and video support</flag>
+		<flag name="scripting">Enable JS scripting via <pkg>dev-qt/qtscript</pkg> in Qt5 or using Qml via <pkg>dev-qt/qtdeclarative</pkg> in Qt6</flag>
+		<flag name="show-my-sky">Enable a better atmosphere model via <pkg>sci-astronomy/calcmysky</pkg></flag>
 		<flag name="stars">Install extra star catalogs</flag>
 		<flag name="telescope">Enable telescope control via <pkg>sci-libs/indilib</pkg></flag>
 		<flag name="webengine">Show online results about the selected star in an embedded window using <pkg>dev-qt/qtwebengine</pkg></flag>
+		<flag name="xlsx">Support XLSX (Excel) files via <pkg>dev-libs/qxlsx</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Stellarium/stellarium</remote-id>

diff --git a/sci-astronomy/stellarium/stellarium-1.1.ebuild b/sci-astronomy/stellarium/stellarium-1.1.ebuild
new file mode 100644
index 000000000000..e10dc3e47f19
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-1.1.ebuild
@@ -0,0 +1,172 @@
+# 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.17"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.1.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"
+IUSE="debug deep-sky doc gps media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+# Qt6 QAudioOutput crashes on startup; qt 6.4.0
+# https://bugreports.qt.io/browse/QTBUG-108221
+REQUIRED_USE="|| ( !media !qt6 )"
+
+# Python interpreter is used while building RemoteControl plugin
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	doc? ( app-doc/doxygen[dot] )
+	nls? (
+		!qt6? ( dev-qt/linguist-tools:5 )
+		qt6? ( dev-qt/qttools:6[linguist] )
+	)
+"
+RDEPEND="
+	media-fonts/dejavu
+	sys-libs/zlib
+	gps? ( sci-geosciences/gpsd:=[cxx] )
+	media? ( virtual/opengl )
+	!qt6? (
+		dev-qt/qtcharts:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5=
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		sci-astronomy/calcmysky:=[qt5]
+		gps? (
+			dev-qt/qtpositioning:5
+			dev-qt/qtserialport:5
+		)
+		media? (
+			dev-qt/qtmultimedia:5[widgets]
+			dev-qt/qtopengl:5
+		)
+		scripting? ( dev-qt/qtscript:5 )
+		telescope? ( dev-qt/qtserialport:5 )
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+		xlsx? ( dev-libs/qxlsx:=[qt5] )
+	)
+	qt6? (
+		dev-qt/qtbase:6=[gui,network,widgets]
+		dev-qt/qtcharts:6
+		sci-astronomy/calcmysky:=[qt6]
+		gps? (
+			dev-qt/qtpositioning:6
+			dev-qt/qtserialport:6
+		)
+		media? (
+			dev-qt/qtmultimedia:6[gstreamer]
+		)
+		scripting? ( dev-qt/qtdeclarative:6 )
+		telescope? ( dev-qt/qtserialport:6 )
+		webengine? ( dev-qt/qtwebengine:6[widgets] )
+		xlsx? ( dev-libs/qxlsx:=[qt6] )
+	)
+	telescope? ( sci-libs/indilib:= )
+"
+DEPEND="${RDEPEND}
+	!qt6? (
+		dev-qt/qtconcurrent:5
+		test? ( dev-qt/qttest:5 )
+	)
+	qt6? ( dev-qt/qtbase:6=[concurrent] )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+	"${FILESDIR}/stellarium-0.22.2-ccache.patch"
+	"${FILESDIR}/stellarium-1.1-qxlsx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+
+	rm -r src/external/zlib/ || die
+
+	# for glues_stel aka libtess I couldn't find an upstream with the same API
+
+	local remaining="$(cd src/external/ && echo */)"
+	if [[ "${remaining}" != "glues_stel/" ]]; then
+		eqawarn "Need to unbundle more deps: ${remaining}"
+	fi
+}
+
+src_configure() {
+	filter-lto # https://bugs.gentoo.org/862249
+
+	local mycmakeargs=(
+		-DCPM_LOCAL_PACKAGES_ONLY=yes
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_QT6="$(usex qt6)"
+		-DENABLE_QTWEBENGINE="$(usex webengine)"
+		-DENABLE_SHOWMYSKY=$(usex show-my-sky)
+		-DENABLE_SCRIPTING=$(usex scripting)
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_XLSX="$(usex xlsx)"
+		-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
+}