gentoo auto-resync : 04:12:2024 - 02:07:22

7 files changed, 190 insertions, 4 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index c63407ca7442..5f8306193fbb 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/calcmysky/Manifest b/sci-astronomy/calcmysky/Manifest
index 65538a450ced..34ee0ed8bec1 100644
--- a/sci-astronomy/calcmysky/Manifest
+++ b/sci-astronomy/calcmysky/Manifest
@@ -1,5 +1,5 @@
 DIST calcmysky-0.3.2.tar.gz 2166906 BLAKE2B c306b780b76ace936c373c4c554ed25fdfc3a507ebe34950634527c32deb59b99feb4d55e1b82150dd0611caf8835a1d178ec2a044a2ddf7b2ade604d6edb67a SHA512 a7f69b25c54be86ce179a118ca8a6d606e2c0fe7dc238b46620237e311dc5198a2aeb70e4885cc6553a26f7c38b78b5a338115a4606161fa249a806e891f88b6
 DIST calcmysky-0.3.3.tar.gz 2167016 BLAKE2B 93c1990a96ce4eb7c033ba3763aac2f347c5575c860522d99d7a0ab813d7bffbd678df32cbf3a249e8043e53560d355cb8656d9fce54df07aa9eb82cdfbdb0f7 SHA512 186281ad2aafac7006117cfb65d91c8053ab3caa9d4f67e5463471538bae40fd8fcc954c3fe9b9d2ca7bba4e6a1fdf8de33980469930cc23b1c21ee4b333917e
 EBUILD calcmysky-0.3.2.ebuild 1221 BLAKE2B a7bec01e878b0b3b96f2eca6779c4a5207a7afe39089950350f334e23ecdfcad281d24ba4a70ed6545dfd13876ed9920026b239da394406b17895647ddd3aaf7 SHA512 a34625b4a8409eedf26025666c9f6b05904cf71d2fd46751c8c37f0fee5bc8e7773fb01a8590c89cfd4c25b8bfe4f3848c6d90563fb14d1ba87326410a6d49fd
-EBUILD calcmysky-0.3.3.ebuild 1222 BLAKE2B 256649c71dc225387a4808ea0c1e2c03f81cbf74d13274005fcf18b3869eeb91872476f84d3ae603211b1f481b23f10658898b726ab0c4ad96a08c9207fc1ded SHA512 f8e8dcb45e5899df5fb2bc713f65e944b3682daf6237db56fcbb62bb62a7c5c2251df4e8df58b86e654e4a41be5689e9f72efeb7babd3bef82105a1e2017e8e2
+EBUILD calcmysky-0.3.3.ebuild 1221 BLAKE2B 5b6c96ff1932a11b740d218ec98f9225180927ed5a9c0595006ac715e121b091e3fd3ac95d50c7e1faa56b28de52aaafbefe3debebe8412f9bf06034ef614296 SHA512 3e48c01ed09dcd101b68d9110afa30a1bd603da3d78d08109d8adbf47a8cb0ac950431d00f45642ea1eaa15ecf57d54b27981d17769b378e16d28c2915b0a360
 MISC metadata.xml 583 BLAKE2B 796ee2e5ee532cde2207c3ba32bd508a2ce335b8b5907b8065e196489850fe24f48e975680fed14460322096c780571b986a5a18e9e89f2abdb255dbf8874346 SHA512 f5cfcad23404c3a0da231d35aefa72e02effc420b448c1864e65021a346e3c7c259cd8cc109bdb5240a0d3344f384efe1245ea4afb5eccf6ace1041e62553487
diff --git a/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild b/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild
index bd1d665e6e80..80cec5a5f753 100644
--- a/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild
+++ b/sci-astronomy/calcmysky/calcmysky-0.3.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-3"
 # subslot is soversion
 SLOT="0/15"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv ~x86"
 
 IUSE="qt5 qt6"
 REQUIRED_USE="|| ( qt5 qt6 )"
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index d5c276a497e0..a7b487957f29 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,3 +1,6 @@
+AUX kstars-3.7.4-cmake.patch 2189 BLAKE2B 517319f017daa9ee0ac4f16fe7d7d5ae380408890c4ecae0a46a672ea193895680ebf16806ae71fb370de336edb0373a6178c14c1038444dcd6441547a9e80ad SHA512 e1b26c11fad535537608ab5a5b99c8441fac4fa3cc4b916415d7c9997b2170c5ad5101c99360b19af146407041cf8d27fd5345e49183825b3d143167e713e9e5
 DIST kstars-3.7.3.tar.xz 162015484 BLAKE2B 650198b01c6e51d6725cce68fa3ac51d04e415355a24d36d75d0267b6c5536c1f13962307e36359452ae857364eaf7e548c17068568030946d388189e4982b2e SHA512 981e7040745bfc1e52339a653945ec3283cb4bfa8f5018cf890a1ae8b10a7e860de5c4c99ab7b3f14e6eae856c6ac65e39cf1856263609cf1d6541bd7224e87f
+DIST kstars-3.7.4.tar.xz 163434540 BLAKE2B a59917c94503bca2faa23d000c51c8ef3b9c1150b9b9023e9c36d5e34b9780cae13aa08c614bdc319e0abd22f1beaca341bc6857215e18dbd932ae52e88a66ba SHA512 4b195c690d7ef15db93ff6c2cf6c064e1939713e72fe60930605e7dae137b65a4d6abb30a510ea15ac3b53a2ae5f25dcbbd06bc42461951f8d642701c9b5394f
 EBUILD kstars-3.7.3.ebuild 2814 BLAKE2B 0498f25a54e95a83801c7aa5e7ba77acca7fba9ab6a3eae302e6458eb769f85263a706768caaede11ca5c28367cda068f1a9ffd4179142be1a65b759bf932ac9 SHA512 6f8db0657b3f0df93247779fb0c8ff83656806cd90ed3d9d0bd8a93ac783572658a17190902a324d0f5b7b78a3d65806407f9b3518895ab052a28e0d8d8d5a5b
-MISC metadata.xml 514 BLAKE2B 59cb277db1acfe3514683284ae5b608e51d63b30fe5722cb1e8f8934848f04790ec82ab74ebab38eb565097b803e8132b8abfacbef4cee7197e3b8b0ae1a10ef SHA512 ab9e49e872c880b13ddbc698fbeef9366d642423ada0d64fdd4b1ebadeeba09dbf289855084153c444a77f1b1f03deaf54baf68d8b64a6c57f684e7ceee02c43
+EBUILD kstars-3.7.4.ebuild 2963 BLAKE2B 6e4d39a684d7739783d1f72bc4d26f1a3ee8635b3c66a9fb34884445d026230908e42757739582de89738526e5cd17897439d4b986140208f8f9e493e71ab965 SHA512 234468b60b7a42ee481b93f79be442d7f014fdce87f5b076cfc365f138ad85463ac4e58328102379c3166f12d29bf1ed14551f54be99e4eea37e0d99851d58a6
+MISC metadata.xml 700 BLAKE2B f9524066a8291fc5cb6e56221dcaf951e8782810d7b3716689459a4647fd73ae97ba5c1e8b2f2b392bcb00911be2507c1def1468d0e8af375547e29cbfcd9f6a SHA512 7dd92ec748cdc2a1aa74674426371bcd4df4b180c47c3a9fdd02496546a5b75017fbd8f1e90e89b1a6833479400e9fec62a4ff31bdc1a963d53f3389cfbf3ee1
diff --git a/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
new file mode 100644
index 000000000000..8306f1150f7b
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.7.4-cmake.patch
@@ -0,0 +1,62 @@
+From 5c66594069b836e0fe806653e344f4e36d1e9c1e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 3 Dec 2024 19:46:01 +0100
+Subject: [PATCH] Thanks, but no thanks
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 091078e4c..af6ec66f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,7 +343,7 @@ add_definitions(-DQT_NO_CAST_TO_ASCII)
+ # Needed for htmesh, and libraw
+ kde_enable_exceptions()
+ 
+-if (UNIX)
++if (0)
+ 
+   # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
+@@ -362,7 +362,7 @@ if (ANDROID)
+ endif ()
+ 
+ # Add security (hardening flags)
+-IF (UNIX OR APPLE OR ANDROID)
++IF (0)
+     SET(SEC_COMP_FLAGS "${SEC_COMP_FLAGS} -fstack-protector-all -Wcast-align -fPIE")
+     # This is ill-defined, but I searched for a solution for quite a long time to no avail
+     # - FORTIFY_SOURCE generates a warning when there is no code optimization, and warnings will become errors at some point
+@@ -394,7 +394,7 @@ IF (UNIX OR APPLE OR ANDROID)
+ ENDIF ()
+ 
+ # Clang Format support
+-IF (UNIX OR APPLE)
++IF (0)
+     SET(FORMAT_CODE OFF CACHE BOOL "Enable Clang Format")
+     IF (FORMAT_CODE MATCHES ON)
+         FILE(GLOB_RECURSE ALL_SOURCE_FILES *.c *.cpp *.h)
+@@ -415,7 +415,7 @@ ENDIF ()
+ 
+ SET(FIX_WARNINGS OFF CACHE BOOL "Enable strict compilation mode to turn compiler warnings to errors")
+ # Warning, debug and linker flags
+-IF (UNIX OR APPLE)
++IF (0)
+     SET(COMP_FLAGS "")
+     SET(LINKER_FLAGS "")
+     # Verbose warnings and turns all to errors
+@@ -479,7 +479,7 @@ ENDIF ()
+ 
+ # Sanitizer support
+ SET(SANITIZERS OFF CACHE BOOL "Sanitizer support for gcc and Clang")
+-IF (SANITIZERS AND
++IF (0 AND
+     ((UNIX AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR CMAKE_COMPILER_IS_GNUCXX) OR
+      (APPLE AND (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_COMPILER_IS_GNUCXX))))
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer")
+-- 
+2.47.1
+
diff --git a/sci-astronomy/kstars/kstars-3.7.4.ebuild b/sci-astronomy/kstars/kstars-3.7.4.ebuild
new file mode 100644
index 000000000000..2e8b93ce0378
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.7.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.115.0
+QTMIN=5.15.12
+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="5"
+IUSE="opencv +password raw"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdatavis3d-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebsockets-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kplotting-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	sci-astronomy/wcslib:=
+	sci-libs/cfitsio:=
+	sci-libs/gsl:=
+	>=sci-libs/indilib-2.0.2
+	sci-libs/libnova:=
+	>=sci-libs/stellarsolver-2.2
+	sys-libs/zlib
+	opencv? (
+		media-libs/opencv:=[ffmpeg]
+		|| (
+			media-libs/opencv[qt5(-)]
+			media-libs/opencv[qt6(-)]
+			media-libs/opencv[gtk3(-)]
+		)
+	)
+	password? ( dev-libs/qtkeychain:=[qt5(+)] )
+	raw? ( media-libs/libraw:= )
+"
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		>=dev-qt/qtopengl-${QTMIN}:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sci-astronomy/erfa )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpositioning-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+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}/${P}-cmake.patch" # bug 895892
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_PYKSTARS=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package opencv OpenCV)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(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
+}
diff --git a/sci-astronomy/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml
index 576d990a2f03..b52c30d91afd 100644
--- a/sci-astronomy/kstars/metadata.xml
+++ b/sci-astronomy/kstars/metadata.xml
@@ -6,9 +6,11 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kstars</bugs-to>
+		<remote-id type="kde-invent">education/kstars</remote-id>
 	</upstream>
 	<use>
+		<flag name="opencv">Enable contrast type focus measures via <pkg>media-libs/opencv</pkg></flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
 	</use>