gentoo resync : 08.10.2021

4 files changed, 228 insertions, 0 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index bd449a468a49..dabc070f71d8 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index dd1b22ebd38c..65b08297dd37 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,4 +1,7 @@
 AUX kstars-3.5.3-fits-w-o-libraw.patch 954 BLAKE2B 0735f834e3979f5c5676b3635bb3ab2270b28338ca9f7db4813e83d93dfcfe64ef6fe163dd719826dce5225d4858f142a555379d86b6be8c8748911d896461e9 SHA512 190e9f624a9ed99e07f72ad3973f58443cb80b3645ee16378cbc0d18c215845baeffb5b871f8eaacb9aa8fb0385ea33122738bb7799c9237ed6ba824c2752873
+AUX kstars-3.5.5-FindERFA.cmake.patch 4147 BLAKE2B 1b97ac59da72d4e327e25efb72784d0cf74a5d22624596c2b2a818a6a0879f33f5f21404428748a0879aeb250e2fe9e06e2ca16e79cf2365823633725462a296 SHA512 4318b3aa133fdd3a5b2e36d67ceff3f020dccdc796c20ce85c081aa4753e82bee4bf97552ef40e6428abf9c540d48836be5b7cdc0a6706b494f4669e4626ee6e
 DIST kstars-3.5.3.tar.xz 79228112 BLAKE2B c82e76398630a657887a8b6720a801bce74bb2ebff5bb86f4546672794709a68c970c897074e9cc6846210250ad2d05e2b53af75b70ef2c0fa5504be12aa592b SHA512 383071130fa4674ba373cba2ecd46143a9cdef9f9e636f0bf33f66d9302baa913af4aa1713ba871dd7cee6eed95d8196055a02ab41c24e2729d74950aea742f8
+DIST kstars-3.5.5.tar.xz 79302220 BLAKE2B df8503c72c689301e70345169491dbc8e27116b44c75a78088f91da0d103965f4da359d4de22c3a177898cfe734f66b06810440c2d4dd7ec15862f0ad4d4edf0 SHA512 03ed4db0e3998c9501f77fb22e26046177d4bc427e769be1964ba3d54701a1240908117bc65424768917252710b73811e38ec61e2391182794b30ad6c9d68d96
 EBUILD kstars-3.5.3.ebuild 2587 BLAKE2B d06b66b27b64a7a480c6d5cce1fe9fd851464429d51d998e99cfe1157fe4bf3370f2e22dc1acac45f639fe239f0ee3cc7a26c3808888a5c594723fc2041d4d03 SHA512 04530c5e25e710766c9d6af1126f4ff9d339debab6dca99b0633ad3ebde3eab098f3d5184e7d32290b00520d8ef7ff7394583d7a149e8336787981e35ece5fe4
+EBUILD kstars-3.5.5.ebuild 2596 BLAKE2B 34f8add4ba22c4597ec30ed4fa85e3e8ac612eb6d9019a9be562d8b30fff935828184f0d5265a6d30f8b403c6afa93c21dafe51c1076f2f45e5b1752ad3ff013 SHA512 ae86588d75336adc912a84242702602f2f6c80de186947602b09587585b7554b27eece4c07ed8e940c7aab7983b66c012b29158f0e0cadaa7a49ed20fc8244c2
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
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
new file mode 100644
index 000000000000..920cdf9c72b5
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.5-FindERFA.cmake.patch
@@ -0,0 +1,125 @@
+From b920b785f8193414fd66fe2a6d69c2e2ebf22023 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+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 <heiko.becker@kde.org>
++#
++# 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
new file mode 100644
index 000000000000..204ec4d9076e
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.5.5.ebuild
@@ -0,0 +1,100 @@
+# 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
+}