commit: 3b11acb69aa0818f2bd052563257370193724fd5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Oct 7 10:08:08 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Oct 7 10:08:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b11acb6
sci-astronomy/kstars: drop 3.5.5 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-astronomy/kstars/Manifest | 1 - .../kstars/files/kstars-3.5.5-FindERFA.cmake.patch | 125 --------------------- sci-astronomy/kstars/kstars-3.5.5.ebuild | 100 ----------------- 3 files changed, 226 deletions(-) diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest index 96402061cfd3..2d920f9138be 100644 --- a/sci-astronomy/kstars/Manifest +++ b/sci-astronomy/kstars/Manifest @@ -1,3 +1,2 @@ -DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96 DIST kstars-3.5.9.tar.xz 104914664 BLAKE2B ae87000c6c5b106b1a0c748feb6c578d2a6d9b71e5bff05e1be392e576a8e5ac0eb663eb22c14a20e91ea4df7d12fc9e0a3477492ff9b920f5d36cc410138eeb SHA512 25ed432bc4276216c82e43f9ac952f6fa973d9baf64b2b89a62855e853f42cd1ee39cf5f0496ce1b3c6b894da227ba32c4246ab972301cd67b80679240fad757 DIST kstars-3.6.1.tar.xz 110215912 BLAKE2B 8bb0e4a966124adfe0a6fbda36879ab6d1331c8ab21ad9666e863c6b97acb4ae821a156a6433db8bc40ecec95d1ad4e5b1e6a2c615079268371ed006aae291b1 SHA512 6b5cdba4363d87ba462d2d98b101cae41dc1ae35861aec61ebb8d335b0186fff9625b566dc816bd792ae7746b711a044d5173a8f63063448ff5f55ddfcdb0b75 diff --git a/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch deleted file mode 100644 index 920cdf9c72b5..000000000000 --- a/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch +++ /dev/null @@ -1,125 +0,0 @@ -From b920b785f8193414fd66fe2a6d69c2e2ebf22023 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Tue, 21 Sep 2021 16:56:02 +0200 -Subject: [PATCH] Add FindERFA cmake module - -ERFA doesn't seem to come with a cmake find module or a config file, -so I wrote one, which also provides an imported target. ---- - CMakeLists.txt | 5 +-- - Tests/skyobjects/CMakeLists.txt | 5 ++- - cmake/modules/FindERFA.cmake | 72 +++++++++++++++++++++++++++++++++ - 3 files changed, 77 insertions(+), 5 deletions(-) - create mode 100644 cmake/modules/FindERFA.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b7b02258a..052987438 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -229,10 +229,7 @@ if(BUILD_TESTING) - # Find liberfa, which we check our computation against - find_package(ERFA) - MACRO_BOOL_TO_01(ERFA_FOUND HAVE_LIBERFA) -- set_package_properties(ERFA PROPERTIES DESCRIPTION "Essential Routines for Fundamental Astronomy" URL "https://github.com/liberfa/erfa"; TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)") -- if (ERFA_FOUND) -- include_directories(${ERFA_INCLUDE_DIR}) -- endif() -+ set_package_properties(ERFA PROPERTIES TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)") - endif () - - ## Libraw -diff --git a/Tests/skyobjects/CMakeLists.txt b/Tests/skyobjects/CMakeLists.txt -index 7dc9b918c..ca2d06209 100644 ---- a/Tests/skyobjects/CMakeLists.txt -+++ b/Tests/skyobjects/CMakeLists.txt -@@ -5,5 +5,8 @@ ADD_TEST( NAME TestSkyPoint COMMAND test_skypoint ) - endif() - - ADD_EXECUTABLE( test_starobject test_starobject.cpp ) --TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} ${ERFA_LIBRARIES}) -+TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} ) -+if (TARGET ERFA::ERFA) -+ TARGET_LINK_LIBRARIES( test_starobject ERFA::ERFA ) -+endif() - ADD_TEST( NAME TestStarobject COMMAND test_starobject ) -diff --git a/cmake/modules/FindERFA.cmake b/cmake/modules/FindERFA.cmake -new file mode 100644 -index 000000000..ea6f3e7d8 ---- /dev/null -+++ b/cmake/modules/FindERFA.cmake -@@ -0,0 +1,72 @@ -+# SPDX-FileCopyrightText: 2021 Heiko Becker <[email protected]> -+# -+# SPDX-License-Identifier: BSD-3-Clause -+ -+#[=======================================================================[.rst: -+FindERFA -+---------- -+ -+Try to find the ERFA (Essential Routines for Fundamental Astronomy) library. -+ -+This will define the following variables: -+ -+``ERFA_FOUND`` -+ True if the system has the ERFA library of at least the minimum -+ version specified by the version parameter to find_package() -+``ERFA_INCLUDE_DIRS`` -+ The ERFA include dirs for use with target_include_directories -+``ERFA_LIBRARIES`` -+ The ERFA libraries for use with target_link_libraries() -+``ERFA_VERSION`` -+ The version of ERFA that was found -+ -+If ``ERFA_FOUND` is TRUE, it will also define the following imported -+target: -+ -+``ERFA::ERFA`` -+ The ERFA library -+ -+#]=======================================================================] -+ -+find_package(PkgConfig QUIET) -+ -+pkg_check_modules(PC_ERFA QUIET erfa) -+ -+find_path(ERFA_INCLUDE_DIRS -+ NAMES erfa.h -+ HINTS ${PC_ERFA_INCLUDEDIR} -+) -+ -+find_library(ERFA_LIBRARIES -+ NAMES erfa -+ HINTS ${PC_ERFA_LIBDIR} -+) -+ -+set(ERFA_VERSION ${PC_ERFA_VERSION}) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(ERFA -+ FOUND_VAR -+ ERFA_FOUND -+ REQUIRED_VARS -+ ERFA_LIBRARIES -+ ERFA_INCLUDE_DIRS -+ VERSION_VAR -+ ERFA_VERSION -+) -+ -+if (ERFA_FOUND AND NOT TARGET ERFA::ERFA) -+ add_library(ERFA::ERFA UNKNOWN IMPORTED) -+ set_target_properties(ERFA::ERFA PROPERTIES -+ IMPORTED_LOCATION "${ERFA_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${ERFA_INCLUDE_DIRS}" -+ ) -+endif() -+ -+mark_as_advanced(ERFA_LIBRARIES ERFA_INCLUDE_DIRS) -+ -+include(FeatureSummary) -+set_package_properties(ERFA PROPERTIES -+ URL "https://github.com/liberfa/erfa/"; -+ DESCRIPTION "Essential Routines for Fundamental Astronomy" -+) --- -GitLab - diff --git a/sci-astronomy/kstars/kstars-3.5.5.ebuild b/sci-astronomy/kstars/kstars-3.5.5.ebuild deleted file mode 100644 index f5f47a84c1d5..000000000000 --- a/sci-astronomy/kstars/kstars-3.5.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -inherit ecm kde.org optfeature - -DESCRIPTION="Desktop Planetarium" -HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"; - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-2+ GPL-3+" -SLOT="5" -IUSE="fits indi +password raw wcs" - -REQUIRED_USE="indi? ( fits ) ${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/kauth-${KFMIN}: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 - sys-libs/zlib - fits? ( sci-libs/cfitsio:= ) - indi? ( - sci-libs/gsl:= - >=sci-libs/indilib-1.9.1 - sci-libs/libnova:= - sci-libs/stellarsolver - ) - password? ( dev-libs/qtkeychain:= ) - raw? ( media-libs/libraw:= ) - wcs? ( sci-astronomy/wcslib:= ) -" -# 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 -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpositioning-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -PATCHES=( "${FILESDIR}/${P}-FindERFA.cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DFETCH_TRANSLATIONS=OFF - -DBUILD_PYKSTARS=OFF - -DBUILD_DOC=$(usex handbook) - $(cmake_use_find_package fits CFitsio) - $(cmake_use_find_package indi INDI) - $(cmake_use_find_package indi Nova) - $(cmake_use_find_package password Qt5Keychain) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package wcs WCSLIB) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Display 'current' pictures of planets" x11-misc/xplanet - fi - ecm_pkg_postinst -}
