commit: eacadb6e2a8f287c1649d551b658942d29e5b04b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Oct 22 08:00:24 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Oct 22 08:04:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eacadb6e
sci-astronomy/kstars: drop 3.7.8 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-astronomy/kstars/Manifest | 1 - .../files/kstars-3.7.5-cmake-install-paths.patch | 37 ------- .../kstars/files/kstars-3.7.8-unused-dep.patch | 55 ---------- sci-astronomy/kstars/kstars-3.7.8.ebuild | 112 --------------------- 4 files changed, 205 deletions(-) diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest index e2285f41dfb7..918059e5bec6 100644 --- a/sci-astronomy/kstars/Manifest +++ b/sci-astronomy/kstars/Manifest @@ -1,2 +1 @@ -DIST kstars-3.7.8.tar.xz 50942300 BLAKE2B c41132a7b7bcc093bad630ff2787e821ecabab0c1e6b6202a976e8cd0affc7a12996738fdd042aa5fec38d31575717abc2d7ebef9b6c64f5940166054ad3f8b6 SHA512 1ae1ae02572b832a8b3a45785c353147333baa811c280b132c0597a3ad8dec8a7cfa26458587a4fc7c81847b29c93f2375cc9ce35c4b613583bfdee70727c460 DIST kstars-3.7.9.tar.xz 51113076 BLAKE2B 1cbdec01a9c4b7d0ab06afa4c7310d99154a5c86270b63e4a06cb499a749cf83a9d1b0e87d07247935eec52f0fcd0173400857bd5917b245e004300c4d3a49f4 SHA512 4e28a5f150880dc193c2512afef2bc73220f693e8eceb19047cae7475d8e9640e09e1578ec4076d025ef56597387efd6a6b2ea7dc31f883c2a0ff063391a75c0 diff --git a/sci-astronomy/kstars/files/kstars-3.7.5-cmake-install-paths.patch b/sci-astronomy/kstars/files/kstars-3.7.5-cmake-install-paths.patch deleted file mode 100644 index 3afd10f0cecc..000000000000 --- a/sci-astronomy/kstars/files/kstars-3.7.5-cmake-install-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5eb98b999a8427ea3c827edd12b3e11e5207ca47 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Thu, 3 Apr 2025 22:49:27 +0200 -Subject: [PATCH] CMake: s/DATA_INSTALL_DIR/KDE_INSTALL_DATADIR/ - -Gentoo-bug: https://bugs.gentoo.org/953100 -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - kstars/data/fr/CMakeLists.txt | 3 +-- - kstars/data/nds/CMakeLists.txt | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/kstars/data/fr/CMakeLists.txt b/kstars/data/fr/CMakeLists.txt -index 070297450..d0f33cc5b 100644 ---- a/kstars/data/fr/CMakeLists.txt -+++ b/kstars/data/fr/CMakeLists.txt -@@ -1,5 +1,4 @@ - ########### install files ############### - --install( FILES info_url.dat DESTINATION ${DATA_INSTALL_DIR}/kstars/fr --) -+install(FILES info_url.dat DESTINATION ${KDE_INSTALL_DATADIR}/kstars/fr) - -diff --git a/kstars/data/nds/CMakeLists.txt b/kstars/data/nds/CMakeLists.txt -index ba15f6cf8..09629dab8 100644 ---- a/kstars/data/nds/CMakeLists.txt -+++ b/kstars/data/nds/CMakeLists.txt -@@ -1,5 +1,4 @@ - ########### install files ############### - --install( FILES info_url.dat DESTINATION ${DATA_INSTALL_DIR}/kstars/nds --) -+install(FILES info_url.dat DESTINATION ${KDE_INSTALL_DATADIR}/kstars/nds) - --- -2.49.0 - diff --git a/sci-astronomy/kstars/files/kstars-3.7.8-unused-dep.patch b/sci-astronomy/kstars/files/kstars-3.7.8-unused-dep.patch deleted file mode 100644 index 043ecae0d737..000000000000 --- a/sci-astronomy/kstars/files/kstars-3.7.8-unused-dep.patch +++ /dev/null @@ -1,55 +0,0 @@ -See also: https://invent.kde.org/education/kstars/-/merge_requests/1559 - -From 08fe922629a92c62877586b42f38d79038b32382 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Tue, 9 Sep 2025 19:33:14 +0200 -Subject: [PATCH] Drop obsolete KDocTools dependency - -Amends fb9e10684d42202c30bf31e6387e69258527f9e8 - -Signed-off-by: Andreas Sturmlechner <[email protected]> ---- - CMakeLists.txt | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb0f62740..f65dae76f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,7 +147,6 @@ else(BUILD_KSTARS_LITE) - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Config - Crash -- DocTools - WidgetsAddons - NewStuff - I18n -@@ -165,7 +164,6 @@ else(BUILD_KSTARS_LITE) - find_package(KF6 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Config - Crash -- DocTools - WidgetsAddons - NewStuff - I18n -@@ -518,17 +516,7 @@ IF (NOT ANDROID) - enable_testing(true) - add_subdirectory(Tests) - ENDIF() -- # Make it possible to use the po files fetched by the fetch-translations step - ki18n_install(po) -- if (BUILD_QT5) -- find_package(KF5DocTools CONFIG) -- else() -- find_package(KF6DocTools CONFIG) -- endif() -- if(KF5DocTools_FOUND OR KF6DocTools_FOUND) -- kdoctools_install(po) -- endif() -- - ENDIF () - - if(NOT APPLE) #This is not used on MacOS --- -2.51.0 - diff --git a/sci-astronomy/kstars/kstars-3.7.8.ebuild b/sci-astronomy/kstars/kstars-3.7.8.ebuild deleted file mode 100644 index 1cb6f3a78708..000000000000 --- a/sci-astronomy/kstars/kstars-3.7.8.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=6.9.0 -QTMIN=6.8.1 -inherit ecm kde.org optfeature xdg - -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.7 - 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=( - # downstream patches - "${FILESDIR}"/${PN}-3.7.4-cmake.patch # bug 895892 - "${FILESDIR}"/${PN}-3.7.5-cmake-install-paths.patch # bug 953100 - "${FILESDIR}"/${P}-unused-dep.patch # pending MR upstream -) - -src_configure() { - local mycmakeargs=( - -DBUILD_PYKSTARS=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LibXISF=ON # not packaged - -DBUILD_WITH_QT6=ON # KF6 please - -DBUILD_QT5=OFF # KF6 please - $(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 - xdg_pkg_postinst -}
