gentoo auto-resync : 26:07:2023 - 10:30:48

5 files changed, 198 insertions, 4 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 82302412acee..9ffcf6f9d0fe 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
index fae2b507c98b..dad53e227477 100644
--- a/sci-astronomy/calcmysky/Manifest
+++ b/sci-astronomy/calcmysky/Manifest
@@ -1,5 +1,5 @@
-DIST calcmysky-0.2.1.tar.gz 2161314 BLAKE2B b0aa1abc75f59c9c16429749bb8669e49e17e3dc7716bb78f472a9181c7d77a2c82c2f3800529f620604f233f88855908b0b55d824bf259d0912e157b9537faf SHA512 3915b965ee656b259ce7f158dfdd3c9c11a6c3ff907307899ae55e88ad6c1ccfbec8e0a1f784f5232fb0cb2c8300422fa25b8b1d4d11639d3ebb8c76d67059e5
 DIST calcmysky-0.3.0.tar.gz 2164140 BLAKE2B 18d904ad0ed2ec81d705005fa3fea4e66d7250ff2c46bd563e14c783768760d6cc55ea3376682298d5290516ea3b9bf170da8546da5eafc2d2603e597220d9d4 SHA512 529e9cd3d1e71e5ba3e910e9af44e5ddf1af105b499948325401faa9e0cf7911d8ef003570f5bb5395ff6954c37ae6fd7242eb1300f78636232d745012d495ef
-EBUILD calcmysky-0.2.1.ebuild 1220 BLAKE2B c4fd5ff5b75451a3ab29e0b260f287fae25be873dcc815d6937f59eeead5c6367512b2db8ef5212ac47e1e3936afdd3833119e8c13e4c14d329bc5ede2b507ad SHA512 0bae538f2dbe409c4c0281cf5b4db301bea874dcedda8994a521229dca63b2566a3e71230b5622f82c822a95fa965460627bb536f8ca0944ec76369e04a1a6a5
+DIST calcmysky-0.3.1.tar.gz 2166487 BLAKE2B d1e2bf0a5a2118e3679427e705f5265c9d6c8962adb58b4a5a6464252ee10fcba396758ef3a1a8c1e57b2291a076bc034e4231ea21a6fc464eda3c5ffd376bc1 SHA512 3038feffdf3a61d49d39304b72f1c2809ea5e3a835c4b3c1603162802afc3d27af6cdfd63eb3286e9e614850b73e338e1cc2cf6a6e915ea968194c0a7a9a56eb
 EBUILD calcmysky-0.3.0.ebuild 1220 BLAKE2B 96fa75434224737253e61900154f96a9a1577c3a5afdcc927daf1fcc7e30652b9b6c55829efbc68efead24cae846ce0b2fb0cc96d089780dc965da4a3031e17f SHA512 cd3bee65131528c9a98304bce978b2cefd8cdaba347e3ff59d451d849b070e7fccf72b07be02c3c945fcafdf3d3bb85cdbab6aff091235b765cebfab59881c84
+EBUILD calcmysky-0.3.1.ebuild 1222 BLAKE2B 2eeb44dcf4a4196554eaca135ce1581e3f127d160af9bf628000e275151ff837e0bb32a0bbc13ef613ecdc3f24de64be5083f038b21d59fbc4e79c87c035f9c6 SHA512 13b5c4bda1aa16a84d1be650011705b8f264b9362e3383721f67993ecaf3cf8918f8200c13ae4c51873bacbbc72fa370e12187a7cde08097c8ecd1e0942e8e5d
 MISC metadata.xml 582 BLAKE2B dbfe97e6d7c27ec436cd080f0d9c7969f4a13a174db9637970dc19d9ca3c6387e3de1f97093fb8699e22f77927daa49e10709bfe14b91ade50e3d8bc449bfcb2 SHA512 ec397bf939ac6935284ae74ceca2cd253b9558d963ab627153cd5360bff6f506a8cfe53cbf49a38a59a71fd3013f25138c44d1034aed134f0d1995d021ad7408
diff --git a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild b/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild
index a1d89d8471ce..addd6360ca5c 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.2.1.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.3.1.ebuild
@@ -13,8 +13,8 @@ SRC_URI="
 
 LICENSE="GPL-3"
 # subslot is soversion
-SLOT="0/14"
-KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86"
+SLOT="0/15"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 8aaef92536fe..1b9f25b1ade4 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -7,9 +7,14 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-23.1.tar.xz 347455652 BLAKE2B 1cd367b91a77bd9ace1afe667d9579fad9c1f8cb5c30b851bc2dfcfcd389913a5c3014b589d3c9454a27a8f48ea97c763030f6dfa7bf2c684e29f5ae38db53f4 SHA512 94077b0408fd78b12706760b9ca20cb9b8a24e94ad7daedca922ab310714b6a6fea03a0cdf3fa9dc614be14472b17416e1d5849283c6faba7f8bf91eaa6ab9d6
 DIST stellarium-23.1.tar.xz.asc 313 BLAKE2B 69a9c88defbd1fa955ad3f93af98d33a1b959fdbe7a8138590f5fbd88c25d5b25b3929a31d235eaf43af562e9eb2bd70a2ca4999dffeb3cb5d71f9bf4d692025 SHA512 d9ee09317d0bfc1758fb771ac15a2d4c29cb6cd77cbffd2f4046137a243d31c2253a3f367a12c2a089a4c09b865a78670ab626b8e7f40a8500c2f0abb5d60474
+DIST stellarium-23.2.tar.xz 317080088 BLAKE2B ac1d0473ba6c8e5c56a95113b48fb710e0dfb61c7fe45b39165e994b22f58c3de899f0d147158a2fcc933f91c5328ee0f6b4ce4c6a56b818f2db20fa5d89930f SHA512 ba1ab70367eb626fdc831a5845a25d5deb6ed4d89c1bd6acc9b769e1cd739afb6bc98263a842e3153e1015796e5ef132fd1077b590010c4de1090e13928a7200
+DIST stellarium-23.2.tar.xz.asc 313 BLAKE2B e1ac6d32211edff8dfdd44d0b2bc98ea54e17f33ed9c0e3b49036aabcc20608bcee7a478d8763eb23dfd045c5151961f733bcbd894b61f806788c897eda60b3b SHA512 c2867bc9b0aca5c47b32bd5ae8c91a563d896b392bcb3d705e9f0b8246f0396bc79fba5681e8f5a7b423535f08e3f11fa5b5db20715b9e2a962390f6c1471c22
 DIST stellarium-dso-catalog-3.19.dat 28678714 BLAKE2B 855ec3370efa2ad33d9a99cf473659c76cbcfce87c10df67a6f81514fe3fa2385e295e1a092e55db8164093628e5038399dd62b837e39efc2306be15a0292dc5 SHA512 4187c574789c2bb387791039465eed9c915fec16ae4edbf0c160406dd7bdf7dae0c70846f0208ca639909bb6842c2bc3c2337302bfaf1394f4e081707df5079c
 DIST stellarium-dso-catalog-3.19.dat.asc 313 BLAKE2B 6ae0acdb9b1012e71c346e5834b88dd1e8146789158a5d81e7e992b1730ab5a74899aac76b84b269fb1ccdc2494ddb258209c580751705bda6023fc59132e7d7 SHA512 95a1cf3911c67e2104d6240b9a5e0ce0d0f2d8ed5edcb40303432d17b3d4ccd8875eb9b9e8b7f94e81d1103dba98d3ac5cb6354933f78ebda83015a45297a159
 DIST stellarium_user_guide-23.1-1.pdf 32513574 BLAKE2B 30e971f186d88bdfe5d8346dd4385444eb75e84ce8f5acc8d9f3a6050ac5a7c734b6f74e681738cdb4d4af91645b50a81bb65798b5caa58a9a23691bb40b5593 SHA512 5e5a69f9377496fb42ce2e2ce72e4caf0d35e475e586ccba2814ca7d2e2a3f60bfc46e496f9153a7b4157977460ac7c574d7f452f4af746799ecc9231e32e49d
 DIST stellarium_user_guide-23.1-1.pdf.asc 313 BLAKE2B b573ea45b236ad35cca1614919bb1e2076d4785f2d5d878a874f9536df9c454c9aa2a90797ea930f669676bc23db545ca051996f2ba2124e3eb3acc0890bc975 SHA512 124f9a4ee2452297d6ffdf696cb32c7087d7b5e31c08c56016842414b407fd8c14ce1dd59d160b7d685a0db88982e0a9b6410fbe69ef476a3a16649e16c591a2
+DIST stellarium_user_guide-23.2-1.pdf 32767542 BLAKE2B feb317354b0e696b585fb9edbe2a643bd57ba9da7657173506c1989d63618dcc4e2dd15fd1a9009d919d99ab4b28bd56599b569df11a573aa8d0af8ab85522ef SHA512 d699c9acd048d44221409515657a1f8a3be01629e64e233a1fb114c3935ee1c0fdffe9c7cd1ac60337d8168858f8d9ca3f5624965ff3343463b1a1a0b1b32849
+DIST stellarium_user_guide-23.2-1.pdf.asc 313 BLAKE2B bbc579e34b00a5e5b3497955e7cafcefbf9400063c97dee11bcc0c66e46f446f247c20e1d0205cf9b2117330d4209b6289808a59db4ff298c986771ca962a136 SHA512 d8fac13754bde068cb581ca21149ebcb6307bf4c71c95083fa4bf6e01f953f8d586ed5e149d91ca6439995d6fb7049254be09001ad0c8ff354ea75f7600e5de6
 EBUILD stellarium-23.1.ebuild 5625 BLAKE2B f921a0805b88b3b932532aec76f75776308800d1bcf2f77daa6cd82f5b760d7151b562fee1e8e0e8e6e1f4a8bd9ada0b1dc0599a2be0f9defc0660720bbe4e58 SHA512 fe18193f9ca5e8b2f646504e96c66e2a67ddc25219a4d1dd6618d75258cb8574f84f3c4c7f54f6f733b7d2e7a6d643151a7b2aedf2269bc93a5bac0977e1af38
+EBUILD stellarium-23.2.ebuild 5627 BLAKE2B 4b6fe3ecc1e12fbfc11c0bdbe2774dbdafc29beb13cb290825063dc05592693726fb5d9f6eda8872a208f2a19493f4dceaa60b1435e4ca1218a9664f3f008cf9 SHA512 24c33a897116358d3a2039eff1a4ef494dba4e6a775ef7d4b491d73b80dc7b35d4cb9c0684cd293ef70fe27cc99094ee75913f957f084db99db1e9f08b977baa
 MISC metadata.xml 1667 BLAKE2B dd7848212ed755809c49cdba0ed63138b5f6f188240f71601e113894fded940ed3ea3850028915700961789f150ea7f5d91a4ff6c4570b753dbe6ff397b81b46 SHA512 bea670b08be632304aab3b9d456bce249f2109195e6e309bd703778e5a93561e552212c900897b72e293a3d81d188afabd5e1d8c213334f6d01b1dc035badca6
diff --git a/sci-astronomy/stellarium/stellarium-23.2.ebuild b/sci-astronomy/stellarium/stellarium-23.2.ebuild
new file mode 100644
index 000000000000..b0ee74a8a236
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-23.2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/ https://github.com/Stellarium/stellarium"
+MY_DSO_VERSION="3.19"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz
+	verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.xz.asc )
+	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
+		verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog-${MY_DSO_VERSION}.dat.asc -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat.asc )
+	)
+	doc? (
+		https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf
+		verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v${PV}/stellarium_user_guide-${PV}-1.pdf.asc )
+	)
+	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 qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+
+# 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] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-stellarium )
+"
+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-0.3.0:=[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-0.3.0:=[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"
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/stellarium.asc
+src_unpack() {
+	# stars-2.0 are not signed
+	if use verify-sig; then
+		pushd "${DISTDIR}" > /dev/null || die
+		verify-sig_verify_detached \
+			${P}.tar.xz{,.asc}
+		use deep-sky && verify-sig_verify_detached \
+			${PN}-dso-catalog-${MY_DSO_VERSION}.dat{,.asc}
+		use doc && verify-sig_verify_detached \
+			stellarium_user_guide-${PV}-1.pdf{,.asc}
+		popd > /dev/null || die
+	fi
+	default_src_unpack
+}
+
+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_use_find_package doc Doxygen)"
+	)
+	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
+}