gentoo auto-resync : 01:02:2025 - 22:43:06

4 files changed, 142 insertions, 2 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index b40d3065a16d..a749ec34c8ed 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,4 +1,7 @@
 AUX kstars-3.7.4-cmake.patch 2189 BLAKE2B 517319f017daa9ee0ac4f16fe7d7d5ae380408890c4ecae0a46a672ea193895680ebf16806ae71fb370de336edb0373a6178c14c1038444dcd6441547a9e80ad SHA512 e1b26c11fad535537608ab5a5b99c8441fac4fa3cc4b916415d7c9997b2170c5ad5101c99360b19af146407041cf8d27fd5345e49183825b3d143167e713e9e5
+AUX kstars-3.7.5-cmake.patch 760 BLAKE2B bc4f2268bf5f40aaacaabd65f6ed85d26c6c4824cc5a61b38ead4e879cb7d0fbbab41cc5522d4b3af8a83a5d60d59b2241d0242cf851cd6b3b204a88ed368a02 SHA512 e0fa0601ba794fbc4d48d6442255e81b15ab695e262419fbc3edb76398a2449c5ce611f812a06d7ad17dddf168496db2b84da61de978d8060ed51eaff4ccd87e
 DIST kstars-3.7.4.tar.xz 163434540 BLAKE2B a59917c94503bca2faa23d000c51c8ef3b9c1150b9b9023e9c36d5e34b9780cae13aa08c614bdc319e0abd22f1beaca341bc6857215e18dbd932ae52e88a66ba SHA512 4b195c690d7ef15db93ff6c2cf6c064e1939713e72fe60930605e7dae137b65a4d6abb30a510ea15ac3b53a2ae5f25dcbbd06bc42461951f8d642701c9b5394f
-EBUILD kstars-3.7.4.ebuild 2962 BLAKE2B 077efa3928dae243dfaee23fd50c76e14d3efc64724a2106b8d1c4f051cf074d49be1715221108181fe65699df3fc317c729b3a2efc25f325501b49f83153059 SHA512 b776389781bceebd828e4693e972c0d29ab66e7b905f76677ca7b1f0ff9d81ad5bfb73289ab6af231671ad03ec23106f37917a3f7a00af19f7053dfd1d983ffd
+DIST kstars-3.7.5.tar.xz 163498784 BLAKE2B f8b8c0246ab3c6dccec4a6af2039f4ef80e71d4ac43eebad869123494f6418dc36a5e1a8044c49e8e58a07267d58daaee589850b0800b9843bfdd3411bedb286 SHA512 988a5e0221b283bb9d0bb0c24d8e7fa91f9618e1cb9a764cec823217349c17bb0c7bc70213e16d2d021bb2bf6d21488c1daacb30f26e4f6f60b012fa05afd257
+EBUILD kstars-3.7.4-r1.ebuild 3004 BLAKE2B 9fd336f8644fd541c3897cd39aa6b03ad93c9d26f6bab64090e694a79064aeb1ef9a5903cea47647e4af41e23337ada2137a9ddd84b35a746d1dc7741723782d SHA512 42d8aaed282eb01d976d288333e2e26e39a2ef292a934e229e8717fe424cd42dc473fcef1528f61d153a3b422837dbd12defbe5734360595ea3d2d621d0b8b26
+EBUILD kstars-3.7.5.ebuild 2812 BLAKE2B 2655f64e3b33c28499d2b6ede6740e3b3b637a07a57e2565e0b83784f6083031789deaa069aa9879c49426dc5dd8c727c146090d1394d3b0b0f433d328b67361 SHA512 cfa62985262579543352a05d86b43436cd2d5c0f50a1298a7232e5d6c3e7d649e05b1b711b0393e3b19ca01ea7b79bb78fe78014a2efa59708fe7003c8f22cf0
 MISC metadata.xml 610 BLAKE2B faaba355e30178d0a5469c2f1a0faf815acaf2c7412b4842a92620860c95f77d3ecb7174ad30c743686f781a81128a5038f3df83dcb520be14b0ea26160eb74a SHA512 95ef3e17df05b3fad294a1b6302bc6390bb3d8dd3d6b18400f74c7e82aea9e2888280f50b691a14b764933cdfce6ba9449e8cb1ef5a533cf8da52dfd43fd0838
diff --git a/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
new file mode 100644
index 000000000000..229076f3c5a3
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.7.5-cmake.patch
@@ -0,0 +1,26 @@
+From 51e5aff74ecfa40975cfb851f7a64a684a0fee0d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 1 Feb 2025 22:32:10 +0100
+Subject: [PATCH] Cleanup bogus (un-ifdef'd and duplicated) headers
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ kstars/ekos/focus/focus.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
+index 553a94e6f..1193115eb 100644
+--- a/kstars/ekos/focus/focus.cpp
++++ b/kstars/ekos/focus/focus.cpp
+@@ -12,8 +12,6 @@
+ #if defined(HAVE_OPENCV)
+ #include "focusblurriness.h"
+ #endif
+-#include "aberrationinspector.h"
+-#include "aberrationinspectorutils.h"
+ #include "kstars.h"
+ #include "kstarsdata.h"
+ #include "Options.h"
+-- 
+2.48.1
+
diff --git a/sci-astronomy/kstars/kstars-3.7.4.ebuild b/sci-astronomy/kstars/kstars-3.7.4-r1.ebuild
index 976be2788b54..ede9b019bef0 100644
--- a/sci-astronomy/kstars/kstars-3.7.4.ebuild
+++ b/sci-astronomy/kstars/kstars-3.7.4-r1.ebuild
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 	>=sci-libs/indilib-2.0.2
 	sci-libs/libnova:=
 	>=sci-libs/stellarsolver-2.2
+	<sci-libs/stellarsolver-2.6-r10
 	sys-libs/zlib
 	opencv? (
 		media-libs/opencv:=[ffmpeg]
@@ -61,7 +62,7 @@ COMMON_DEPEND="
 			media-libs/opencv[gtk3(-)]
 		)
 	)
-	password? ( dev-libs/qtkeychain:=[qt5(+)] )
+	password? ( >=dev-libs/qtkeychain-0.14.2:=[qt5(-)] )
 	raw? ( media-libs/libraw:= )
 "
 # TODO: Add back when re-enabled by upstream
diff --git a/sci-astronomy/kstars/kstars-3.7.5.ebuild b/sci-astronomy/kstars/kstars-3.7.5.ebuild
new file mode 100644
index 000000000000..af5b23d02f3e
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.7.5.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://apps.kde.org/kstars/ https://kstars.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="opencv +password raw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# https://wiki.gentoo.org/wiki/Project:Qt/Qt6_migration_notes#Still_unpackaged
+# >=dev-qt/qtdatavis3d-${QTMIN}:6
+COMMON_DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwebsockets-${QTMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/knotifyconfig-${KFMIN}:6
+	>=kde-frameworks/kplotting-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	sci-astronomy/wcslib:=
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	>=sci-libs/indilib-2.0.2
+	sci-libs/libnova:=
+	>=sci-libs/stellarsolver-2.6-r10
+	sys-libs/zlib
+	opencv? (
+		media-libs/opencv:=[ffmpeg]
+		|| (
+			media-libs/opencv[qt6(-)]
+			media-libs/opencv[gtk3(-)]
+		)
+	)
+	password? ( >=dev-libs/qtkeychain-0.14.2:=[qt6(+)] )
+	raw? ( media-libs/libraw:= )
+"
+# TODO: what about virtual/opengl?
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+	test? ( sci-astronomy/erfa )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	>=dev-qt/qt5compat-${QTMIN}:6[qml]
+	>=dev-qt/qtpositioning-${QTMIN}:6
+"
+
+CMAKE_SKIP_TESTS=(
+	# bug 842768, test declared unstable by upstream
+	TestKSPaths
+	# bugs 923871, 939788
+	TestPlaceholderPath # ki18n (KLocalizedString) failure
+	# all fail with offscreen plugin
+	TestEkos{Capture,FilterWheel,Focus,Mount,Scheduler{,Ops},Simulator}
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.{4,5}-cmake.patch # bug 895892
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYKSTARS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged
+		-DBUILD_QT5=OFF # KF6 please
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package opencv OpenCV)
+		$(cmake_use_find_package password Qt6Keychain)
+		$(cmake_use_find_package raw LibRaw)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" LC_TIME="C" TZ=UTC ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
+	fi
+	ecm_pkg_postinst
+}