gentoo auto-resync : 01:05:2024 - 00:00:04

3 files changed, 14 insertions, 33 deletions

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 8046f74bb8cb..5367d9c4c3b3 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,4 +1,3 @@
-AUX stellarium-0.20.3-unbundle-zlib.patch 844 BLAKE2B 24468924728aa9f77ebb2a48d87ecef2eb98768dabc8fcf914972da70feca1dc1de9e32e658afdfb796c769244a2882be8a46c4b9145c6e0109498a5f090baae SHA512 e8a645a302f890e0590369ea6b1642fe38f91b20a3076f8c5201b2b23581394dccc6a0b56e2423e3ab45e926e1a3266bf1fb24e0647ea05e59219147e8b53a1d
 AUX stellarium-0.23.4-unbundle-zlib.patch 920 BLAKE2B 8dbf677312956b9c75d698cb51ce49de119e2258b9ddf05f8d77ac6f0590c5f707fc18de10e98322c8fe09fb573305780704f33eb71227c144e3ad4ccc2b6a14 SHA512 57b12bb6581e8ad6d5ec2ca6af13648b50feea88f0a1f5ede0031b561817821882192e90800627b349215841a5a0a37102e7b513d6d5c7ccbeb9db936db79ebf
 DIST indilib-1.8.5.tar.gz 2122866 BLAKE2B 203b6c78664aaf3f87b7f697b76544e6ed0fa6db8ac0fe43e6ebcf00de404e96a49b8cd7f8b0be2e4ff5c7f902b3e34177a244a4a49069887f11d28aea073620 SHA512 4c583f7ff0d96d787c7d035e23074f42db3f836ec74a0a7a1595574ae2d32d56234b16abddabacaf9bd5a10cb88c6c37994aafcef86d65a665b2bceae87446f9
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
@@ -6,16 +5,16 @@ 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-23.3.tar.xz 320086976 BLAKE2B 38e6c7710b071f6c3086f9c428723a55ba76c9d14d919d3fa712040286cb1d866094918c25c18d245d86644851046e89ccad5c5e008e0f6b66b4cc2bd3672ca7 SHA512 da52d2c8981a3db4086539d2b32c42c6e85600cb4675aae2305bb82cf14398be162d8643f3f3ea38f1020c4650d8d2d4165fbd32be701562ab665e4c31fe99fb
-DIST stellarium-23.3.tar.xz.asc 313 BLAKE2B 6efd2402c7b3c0ee5647a2ad506c7b7b17f481c1305ed10601459f1cf0cf3b77042a3131840bba27d411d293f6f73e7339c9878cfabd708dd3d9538a3cc75c82 SHA512 57a4feafe161d2fac3f0592d56372eca3cff9cd8b9c90876f63a3468a326bcf1104b54ed2ae7ae1e84c44a05cb35d64b6c6ca2fe26d7064f90a5e3d7e897eaf4
 DIST stellarium-23.4.tar.xz 324945696 BLAKE2B 8642015bf2d8b40b2310953a265f831ee4527062d0d30fdfada4ac8a2fe9b9b644b72dd0dfb8969dd241b5188fd9602842516173c7832decd4175e753ff3fcdc SHA512 877b2b07c3135763b038075c9d24487829d852da040601cf5e170dfbcb882d564946814f0ff95497aee157e6285ca5c5fbb714b7942b588c6a93af1c809bc17c
 DIST stellarium-23.4.tar.xz.asc 313 BLAKE2B 7fc6b8dc82d12817ec41d00a365fdde0da888dcf06ea7daf86b7b5ff58fae2b2a3bff95da0f35b48dc85346f342472255ac8dae198ed91d4b1f790c7974d0fb0 SHA512 0aa11282c746f05bb128a6ab2fbdcb2008690dd6ca2c4a43bef65756bd21796a74891330dc7296f924eb8e390942a632b0ec5df28f404ec0f69bbcec0bc1747b
+DIST stellarium-24.1.tar.xz 326391584 BLAKE2B 2950c877d8cd24ab1ab377c22630fd4c71b512a353dad5bc903b07d7b5518285c350ef2ac599255e44ff3831fb88e7d83b3e4cb395fec5162e525195e94a04bf SHA512 60e0e2afb214f4e2d9ba6640f4b699d18c97b05b9f33e9990787a87484c6bd1d7bc87685558956e6dc8a80e93abd8d7f677daeb55d38d8f4f8448e7936999246
+DIST stellarium-24.1.tar.xz.asc 309 BLAKE2B b829b2173f5bffad81117c39f15018256eea9dbd890ef649e9b6137d9f935a03bccc89377e98ab3e224a60076fabb8275c47253fd8229a37e15a6f01e477f609 SHA512 c2217a5cd1391f925b1ff1f092f062fde031111263a32fb0c699f9c38419be343e29962f34722153e15abff6600d9b4a0afc77b9186635abebb86b2c1e72544a
 DIST stellarium-dso-catalog-3.20.dat 28678745 BLAKE2B 24ddf76e81e91424cced5df74dd164d17a45fed2b65c1dc1e7065371c18a796350a1e1aab2da5860376eb90eac07e7c836ffdbb324a0d3eda6c91e8ce1c4ab3a SHA512 c84832bbf56d1097db3ff8fa8f3faadac1470a9f79d9ee759493915a48754dc86174551b5e705786f29331991bee57daa4cab6d7ecc2e4e00a2f895823ccfd87
 DIST stellarium-dso-catalog-3.20.dat.asc 313 BLAKE2B a7d9a1977ff4e1b21a80239d85ad5123ad03c2dcd57422cec7c2585eddb1004bbfc2b29a934653bc36c438981218811d21ade7380ae49278ef2c4f387ab762e5 SHA512 e8a7b10bb157d15b550a31646c8d8ce9933a77f748900a9c75f0c78b9b9205ce5e4e2ec18248ba786aacd5fbf36da00bbaf578b8b011c75351a9237568e62f1b
-DIST stellarium_user_guide-23.3-1.pdf 32929394 BLAKE2B 0d4c1c4a667d963981dc7625cd2d0b229351393cf3ef6073cbb7b76947256906186cf72195f1c34081a9771b451f79adf459e45e01253675285efe8747d0aa91 SHA512 c5b4b41caf4a36ae85527ab33511e1d69da663714744d78cebd7513472227ef045db38944e9800ad9be0fe34902a7e7b09db7518194790e64eb93141eadf8d7e
-DIST stellarium_user_guide-23.3-1.pdf.asc 313 BLAKE2B 8e976d2528bfa3b35761c968da5970ce3b76694a1c9980f90dcd51e7f55b9f34fbf778acb6c0999c544787382274ff747edacaf23e685a6b0ac2d75170296132 SHA512 be300a11072b17df4e0ecd7e1fd25193e23e0214ccfee3e1748461732f7065a9c2c7c38bfaf838607204b0f7b1bda4917ac5973d6ff081718f1ed7cd12f29c7b
 DIST stellarium_user_guide-23.4-1.pdf 32943744 BLAKE2B 0f118a27cd0ce4e043702321ed79ffc185e6fcd755975176b9f2642373249970fd8d1e3af3d256e96fe3950265a938e3b4b1b02f11dc07e306dde320ded02919 SHA512 259a7b17d1d03979ac068564c9bafb1f275af56116f43a342c5d155cc4fc50a63a3ad053bb4e15513e6176d240f417f55749980d9d1f6cec69853309541d31d6
 DIST stellarium_user_guide-23.4-1.pdf.asc 313 BLAKE2B 0eb7556dc59b78b10ccefabefbfd96f635a4a560ef5b533b50ad4cc60c23b289709d2ffde9a946eb07512885e728e3fd4e13af82daf9f55e9540ff00ae17481a SHA512 5b72207483431eb2f8e4fc3fc8ce5d1f1e4d7ef61c944c7b3a21dfb1379f6fe3c3e15ffb87bf3de5d259d54a5ad9d1b65aa6d7c0e8aaa4bd1a2ffe8417862aaf
-EBUILD stellarium-23.3.ebuild 5821 BLAKE2B 0eb55dcf02a3858c1d1a1c921980ada049b6af9b22d28161a5ec94caa34067396dc1626c6e826c2bcb5618b5067575e907f2be6fb222a7b5dd96865aa9ec7069 SHA512 10415594dad2ebd8634504b272e75066b0e50459ef423814d5c90df3695b13a19f6ce28656696d3a86392c067da6a9f2413a183f6117d253cbe307e46aaae709
+DIST stellarium_user_guide-24.1-1.pdf 32944397 BLAKE2B b99aae0d9c711746281e485175f9b576c7bddf5531c069c68c1a6dac8e64de2d93461ce0b4bc364046ff9a9a0c315a5fb1f5650fbd04afbda063f5dfd4244b88 SHA512 fab491fed6463375e33082551d95200ffa3e40422c09a3ab2cc7d607a30437890dead38e74db451a24e53f009dd1dedb7df16838ae18495b286396d9ca5741fc
+DIST stellarium_user_guide-24.1-1.pdf.asc 313 BLAKE2B 8e2ef72fd04f694cacc1851e729a8ba5f137f76893bab146ee61c15d46bb64d23af6c1d4920baff4673c6a9bf49a3840addcbd1eb0d18befe04402d4afd9a6ce SHA512 2ea212e5be3858cb662cebed33ad2cb2438dfeb1cf65dde33c46981dc3d9bb8028a844af8f0d095b84df863a0a2a7b0f190c95311b13dc30091c9e257ca454c5
 EBUILD stellarium-23.4.ebuild 5963 BLAKE2B aa6dcfa6df7cc0cf05c13eec3431e8cfd5058f26c57da5812fb4c82208c5be2ebcb758b577733bd4dd4552f14427a805f642bac78b604b02a2a91202169e8a1c SHA512 5db5ef2fc9a57cb42418108c2f5583767a521487fb0057ef06c419b7fe4a802164444ef7106826c95972364563fa23301b177faab5b116b3ac18ad2ee0cf7a1e
+EBUILD stellarium-24.1.ebuild 5966 BLAKE2B bdda1cbd560a047da8010b3a1e26cc5a0737028d277c8c1e1672051001ec0fafe89cc3068cfd79a5babf72dce704e450bee0366e8a6c45a3795bf6feb6626fc7 SHA512 104305fbb091f0d991aecff107dd691add6eec4a9f17325704dac7cda34c6fd176978b97a7d0d0e8439f7148315a0459547eaaf6b4ad8d7407931aad452efc1b
 MISC metadata.xml 1745 BLAKE2B 46404a5e8352ad1eb9f365f7efc95569636a9c1c70c3b361361243e191763e6b08b7a481bc1a5732f38fcd0b257b97f0404b751ccae1ddb3ebf3c89b2c5b9834 SHA512 be2e183c283d5361202e1a4a59f02646b5a731e0bcab51e43ac5dd06d67270b2266a682d2ef1f63dd422e1b846c1aeab2ab38421b88b58711284e38734edabaa
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
deleted file mode 100644
index 6fb7fb4f7859..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This patch is not really needed, because zlib is already used from system, but
-it makes it easier to ensure that nothing else is bundled
-
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 834aff89cb..590579e501 100644
---- a/src/external/CMakeLists.txt
-+++ b/src/external/CMakeLists.txt
-@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui)
- set_target_properties(glues_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")

- 

-+if(0)

- SET(zlib_SRCS

-      zlib/adler32.c

-      zlib/compress.c

-@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
- #turn off automoc, not needed here

- set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)

- SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")

-+endif()

- 

- if(0)

- set(qtcompress_SRCS

diff --git a/sci-astronomy/stellarium/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-24.1.ebuild
index 9b121e46f6c5..ba7ba546a798 100644
--- a/sci-astronomy/stellarium/stellarium-23.3.ebuild
+++ b/sci-astronomy/stellarium/stellarium-24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake desktop flag-o-matic python-any-r1 xdg verify-sig virtualx
 
 DESCRIPTION="3D photo-realistic skies in real time"
@@ -33,8 +33,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 qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug deep-sky doc gps +lens-distortion media nls qt6 +scripting +show-my-sky stars telescope test webengine +xlsx"
 
 # Python interpreter is used while building RemoteControl plugin
 BDEPEND="
@@ -51,6 +51,10 @@ RDEPEND="
 	media-fonts/dejavu
 	sys-libs/zlib
 	gps? ( sci-geosciences/gpsd:=[cxx] )
+	lens-distortion? (
+		media-gfx/exiv2:=
+		sci-libs/nlopt
+	)
 	media? ( virtual/opengl )
 	!qt6? (
 		dev-qt/qtcharts:5
@@ -100,7 +104,7 @@ DEPEND="${RDEPEND}
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch"
+	"${FILESDIR}/stellarium-0.23.4-unbundle-zlib.patch"
 )
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/stellarium.asc
@@ -148,6 +152,7 @@ src_configure() {
 		-DENABLE_SCRIPTING=$(usex scripting)
 		-DENABLE_TESTING="$(usex test)"
 		-DENABLE_XLSX="$(usex xlsx)"
+		-DUSE_PLUGIN_LENSDISTORTIONESTIMATOR="$(usex lens-distortion)"
 		-DUSE_PLUGIN_TELESCOPECONTROL="$(usex telescope)"
 		"$(cmake_use_find_package doc Doxygen)"
 	)