Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/, sci-astronomy/kstars/files/
Date: Sat, 02 Oct 2021 11:26:36
Message-Id: 1633173637.aa5e606c70e257749eb885e69215ba48fac9ecad.asturm@gentoo
1 commit: aa5e606c70e257749eb885e69215ba48fac9ecad
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 7 17:14:52 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 2 11:20:37 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa5e606c
7
8 sci-astronomy/kstars: 3.5.5 version bump
9
10 Package-Manager: Portage-3.0.23, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 sci-astronomy/kstars/Manifest | 1 +
14 .../kstars/files/kstars-3.5.5-FindERFA.cmake.patch | 125 +++++++++++++++++++++
15 sci-astronomy/kstars/kstars-3.5.5.ebuild | 100 +++++++++++++++++
16 3 files changed, 226 insertions(+)
17
18 diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
19 index 3ff6b55029c..846b1abcbb2 100644
20 --- a/sci-astronomy/kstars/Manifest
21 +++ b/sci-astronomy/kstars/Manifest
22 @@ -1 +1,2 @@
23 DIST kstars-3.5.3.tar.xz 79228112 BLAKE2B c82e76398630a657887a8b6720a801bce74bb2ebff5bb86f4546672794709a68c970c897074e9cc6846210250ad2d05e2b53af75b70ef2c0fa5504be12aa592b SHA512 383071130fa4674ba373cba2ecd46143a9cdef9f9e636f0bf33f66d9302baa913af4aa1713ba871dd7cee6eed95d8196055a02ab41c24e2729d74950aea742f8
24 +DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96
25
26 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
27 new file mode 100644
28 index 00000000000..920cdf9c72b
29 --- /dev/null
30 +++ b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
31 @@ -0,0 +1,125 @@
32 +From b920b785f8193414fd66fe2a6d69c2e2ebf22023 Mon Sep 17 00:00:00 2001
33 +From: Heiko Becker <heiko.becker@×××.org>
34 +Date: Tue, 21 Sep 2021 16:56:02 +0200
35 +Subject: [PATCH] Add FindERFA cmake module
36 +
37 +ERFA doesn't seem to come with a cmake find module or a config file,
38 +so I wrote one, which also provides an imported target.
39 +---
40 + CMakeLists.txt | 5 +--
41 + Tests/skyobjects/CMakeLists.txt | 5 ++-
42 + cmake/modules/FindERFA.cmake | 72 +++++++++++++++++++++++++++++++++
43 + 3 files changed, 77 insertions(+), 5 deletions(-)
44 + create mode 100644 cmake/modules/FindERFA.cmake
45 +
46 +diff --git a/CMakeLists.txt b/CMakeLists.txt
47 +index b7b02258a..052987438 100644
48 +--- a/CMakeLists.txt
49 ++++ b/CMakeLists.txt
50 +@@ -229,10 +229,7 @@ if(BUILD_TESTING)
51 + # Find liberfa, which we check our computation against
52 + find_package(ERFA)
53 + MACRO_BOOL_TO_01(ERFA_FOUND HAVE_LIBERFA)
54 +- 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)")
55 +- if (ERFA_FOUND)
56 +- include_directories(${ERFA_INCLUDE_DIR})
57 +- endif()
58 ++ set_package_properties(ERFA PROPERTIES TYPE OPTIONAL PURPOSE "BSD-compatible version of SOFA, used to test core computations of KStars (only needed by tests)")
59 + endif ()
60 +
61 + ## Libraw
62 +diff --git a/Tests/skyobjects/CMakeLists.txt b/Tests/skyobjects/CMakeLists.txt
63 +index 7dc9b918c..ca2d06209 100644
64 +--- a/Tests/skyobjects/CMakeLists.txt
65 ++++ b/Tests/skyobjects/CMakeLists.txt
66 +@@ -5,5 +5,8 @@ ADD_TEST( NAME TestSkyPoint COMMAND test_skypoint )
67 + endif()
68 +
69 + ADD_EXECUTABLE( test_starobject test_starobject.cpp )
70 +-TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} ${ERFA_LIBRARIES})
71 ++TARGET_LINK_LIBRARIES( test_starobject ${TEST_LIBRARIES} )
72 ++if (TARGET ERFA::ERFA)
73 ++ TARGET_LINK_LIBRARIES( test_starobject ERFA::ERFA )
74 ++endif()
75 + ADD_TEST( NAME TestStarobject COMMAND test_starobject )
76 +diff --git a/cmake/modules/FindERFA.cmake b/cmake/modules/FindERFA.cmake
77 +new file mode 100644
78 +index 000000000..ea6f3e7d8
79 +--- /dev/null
80 ++++ b/cmake/modules/FindERFA.cmake
81 +@@ -0,0 +1,72 @@
82 ++# SPDX-FileCopyrightText: 2021 Heiko Becker <heiko.becker@×××.org>
83 ++#
84 ++# SPDX-License-Identifier: BSD-3-Clause
85 ++
86 ++#[=======================================================================[.rst:
87 ++FindERFA
88 ++----------
89 ++
90 ++Try to find the ERFA (Essential Routines for Fundamental Astronomy) library.
91 ++
92 ++This will define the following variables:
93 ++
94 ++``ERFA_FOUND``
95 ++ True if the system has the ERFA library of at least the minimum
96 ++ version specified by the version parameter to find_package()
97 ++``ERFA_INCLUDE_DIRS``
98 ++ The ERFA include dirs for use with target_include_directories
99 ++``ERFA_LIBRARIES``
100 ++ The ERFA libraries for use with target_link_libraries()
101 ++``ERFA_VERSION``
102 ++ The version of ERFA that was found
103 ++
104 ++If ``ERFA_FOUND` is TRUE, it will also define the following imported
105 ++target:
106 ++
107 ++``ERFA::ERFA``
108 ++ The ERFA library
109 ++
110 ++#]=======================================================================]
111 ++
112 ++find_package(PkgConfig QUIET)
113 ++
114 ++pkg_check_modules(PC_ERFA QUIET erfa)
115 ++
116 ++find_path(ERFA_INCLUDE_DIRS
117 ++ NAMES erfa.h
118 ++ HINTS ${PC_ERFA_INCLUDEDIR}
119 ++)
120 ++
121 ++find_library(ERFA_LIBRARIES
122 ++ NAMES erfa
123 ++ HINTS ${PC_ERFA_LIBDIR}
124 ++)
125 ++
126 ++set(ERFA_VERSION ${PC_ERFA_VERSION})
127 ++
128 ++include(FindPackageHandleStandardArgs)
129 ++find_package_handle_standard_args(ERFA
130 ++ FOUND_VAR
131 ++ ERFA_FOUND
132 ++ REQUIRED_VARS
133 ++ ERFA_LIBRARIES
134 ++ ERFA_INCLUDE_DIRS
135 ++ VERSION_VAR
136 ++ ERFA_VERSION
137 ++)
138 ++
139 ++if (ERFA_FOUND AND NOT TARGET ERFA::ERFA)
140 ++ add_library(ERFA::ERFA UNKNOWN IMPORTED)
141 ++ set_target_properties(ERFA::ERFA PROPERTIES
142 ++ IMPORTED_LOCATION "${ERFA_LIBRARIES}"
143 ++ INTERFACE_INCLUDE_DIRECTORIES "${ERFA_INCLUDE_DIRS}"
144 ++ )
145 ++endif()
146 ++
147 ++mark_as_advanced(ERFA_LIBRARIES ERFA_INCLUDE_DIRS)
148 ++
149 ++include(FeatureSummary)
150 ++set_package_properties(ERFA PROPERTIES
151 ++ URL "https://github.com/liberfa/erfa/"
152 ++ DESCRIPTION "Essential Routines for Fundamental Astronomy"
153 ++)
154 +--
155 +GitLab
156 +
157
158 diff --git a/sci-astronomy/kstars/kstars-3.5.5.ebuild b/sci-astronomy/kstars/kstars-3.5.5.ebuild
159 new file mode 100644
160 index 00000000000..204ec4d9076
161 --- /dev/null
162 +++ b/sci-astronomy/kstars/kstars-3.5.5.ebuild
163 @@ -0,0 +1,100 @@
164 +# Copyright 1999-2021 Gentoo Authors
165 +# Distributed under the terms of the GNU General Public License v2
166 +
167 +EAPI=8
168 +
169 +ECM_HANDBOOK="forceoptional"
170 +KFMIN=5.82.0
171 +QTMIN=5.15.2
172 +inherit ecm kde.org optfeature
173 +
174 +DESCRIPTION="Desktop Planetarium"
175 +HOMEPAGE="https://apps.kde.org/kstars/ https://edu.kde.org/kstars/"
176 +
177 +if [[ ${KDE_BUILD_TYPE} = release ]]; then
178 + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
179 + KEYWORDS="~amd64 ~x86"
180 +fi
181 +
182 +LICENSE="GPL-2+ GPL-3+"
183 +SLOT="5"
184 +IUSE="fits indi +password raw wcs"
185 +
186 +REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
187 +
188 +COMMON_DEPEND="
189 + >=dev-qt/qtdatavis3d-${QTMIN}:5
190 + >=dev-qt/qtdbus-${QTMIN}:5
191 + >=dev-qt/qtdeclarative-${QTMIN}:5
192 + >=dev-qt/qtgui-${QTMIN}:5
193 + >=dev-qt/qtnetwork-${QTMIN}:5
194 + >=dev-qt/qtprintsupport-${QTMIN}:5
195 + >=dev-qt/qtsql-${QTMIN}:5
196 + >=dev-qt/qtsvg-${QTMIN}:5
197 + >=dev-qt/qtwebsockets-${QTMIN}:5
198 + >=dev-qt/qtwidgets-${QTMIN}:5
199 + >=kde-frameworks/kauth-${KFMIN}:5
200 + >=kde-frameworks/kconfig-${KFMIN}:5
201 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5
202 + >=kde-frameworks/kcoreaddons-${KFMIN}:5
203 + >=kde-frameworks/kcrash-${KFMIN}:5
204 + >=kde-frameworks/ki18n-${KFMIN}:5
205 + >=kde-frameworks/kio-${KFMIN}:5
206 + >=kde-frameworks/knewstuff-${KFMIN}:5
207 + >=kde-frameworks/knotifications-${KFMIN}:5
208 + >=kde-frameworks/knotifyconfig-${KFMIN}:5
209 + >=kde-frameworks/kplotting-${KFMIN}:5
210 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
211 + >=kde-frameworks/kxmlgui-${KFMIN}:5
212 + sys-libs/zlib
213 + fits? ( sci-libs/cfitsio:= )
214 + indi? (
215 + sci-libs/gsl:=
216 + >=sci-libs/indilib-1.9.1
217 + sci-libs/libnova:=
218 + sci-libs/stellarsolver
219 + )
220 + password? ( dev-libs/qtkeychain:= )
221 + raw? ( media-libs/libraw:= )
222 + wcs? ( sci-astronomy/wcslib:= )
223 +"
224 +# TODO: Add back when re-enabled by upstream
225 +# opengl? (
226 +# >=dev-qt/qtopengl-${QTMIN}:5
227 +# virtual/opengl
228 +# )
229 +DEPEND="${COMMON_DEPEND}
230 + dev-cpp/eigen:3
231 + >=dev-qt/qtconcurrent-${QTMIN}:5
232 +"
233 +RDEPEND="${COMMON_DEPEND}
234 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5
235 + >=dev-qt/qtpositioning-${QTMIN}:5
236 + >=dev-qt/qtquickcontrols-${QTMIN}:5
237 + >=dev-qt/qtquickcontrols2-${QTMIN}:5
238 +"
239 +
240 +PATCHES=( "${FILESDIR}/${P}-FindERFA.cmake.patch" )
241 +
242 +src_configure() {
243 + local mycmakeargs=(
244 + -DFETCH_TRANSLATIONS=OFF
245 + -DBUILD_PYKSTARS=OFF
246 + -DBUILD_DOC=$(usex handbook)
247 + $(cmake_use_find_package fits CFitsio)
248 + $(cmake_use_find_package indi INDI)
249 + $(cmake_use_find_package indi Nova)
250 + $(cmake_use_find_package password Qt5Keychain)
251 + $(cmake_use_find_package raw LibRaw)
252 + $(cmake_use_find_package wcs WCSLIB)
253 + )
254 +
255 + ecm_src_configure
256 +}
257 +
258 +pkg_postinst() {
259 + if [[ -z "${REPLACING_VERSIONS}" ]]; then
260 + optfeature "Display 'current' pictures of planets" x11-misc/xplanet
261 + fi
262 + ecm_pkg_postinst
263 +}