[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/files/, sci-astronomy/kstars/

[Andreas Sturmlechner]

commit:     2c09e45056318e64b64629926dd8bd303166f91e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 10:34:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 26 10:51:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c09e450

sci-astronomy/kstars: 3.4.2 version bump

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-astronomy/kstars/Manifest                      |  1 +
 .../files/kstars-3.4.2-cfitsio-optional.patch      | 38 +++++++++
 sci-astronomy/kstars/kstars-3.4.2.ebuild           | 99 ++++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index d7250a27a2b..5a78e2ced9b 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1,3 @@
 DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74 SHA512 51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
 DIST kstars-3.4.1.tar.xz 71067324 BLAKE2B a794af21feb5254ca5e2898b048f9b33682dd70130d83b0874b30a7465920734ca0d581479a8b489202046c7be8b0ff6d7e5667ad1deb30f9c1b851b58f86d01 SHA512 f6380ad578d1fd39bf1cb115fb47dd519fe7ba3067e55ec9296d01559cba529f0f6a3aba363c2c107f3c0648db0d733d34de8c7b196c748f409b8d006ebe26af
+DIST kstars-3.4.2.tar.xz 76494596 BLAKE2B 228f4d9250ef6584e6de1164fc0fc2ba506574f34cfda4ad1347984adeeaaa4eee8e8d93cb2d8822635ad200e2df5d43ccc2cf48d2cd24449f21627de9189c9c SHA512 10e806c82b0704c6185c852c74035e7f74ef29d921df3bcde07cb161d86257e7deb4b13941294b699ed46ae5c8197a2f76dcd45599f0222139c584a626881304

diff --git a/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
new file mode 100644
index 00000000000..b486debf3e4
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.4.2-cfitsio-optional.patch
@@ -0,0 +1,38 @@
+From f66d634768fb8d18caded24646946f134b8e70c2 Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@××××××××××.com>
+Date: Sun, 3 May 2020 20:13:15 +0300
+Subject: Don't run fitsviewer test if no fitsio
+
+Summary: Should fix https://build.kde.org/view/Failing/job/Extragear/job/kstars/job/kf5-qt5%20WindowsMSVCQt5.14/ (tests are not working as fitsio not available on Windows)
+
+Reviewers: #kstars, TallFurryMan, mutlaqja
+
+Reviewed By: #kstars, TallFurryMan, mutlaqja
+
+Subscribers: TallFurryMan, kde-edu
+
+Tags: #kstars, #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D29388
+---
+ Tests/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
+index 020f697..1e3a09a 100644
+--- a/Tests/CMakeLists.txt
++++ b/Tests/CMakeLists.txt
+@@ -32,7 +32,10 @@ SET( TEST_KSLITE_LIBRARIES
+ 
+ add_subdirectory(auxiliary)
+ add_subdirectory(skyobjects)
+-add_subdirectory(fitsviewer)
++
++IF (CFITSIO_FOUND)
++    add_subdirectory(fitsviewer)
++ENDIF ()
+ 
+ IF (UNIX AND NOT APPLE AND CFITSIO_FOUND)
+     IF (BUILD_KSTARS_LITE)
+-- 
+cgit v1.1

diff --git a/sci-astronomy/kstars/kstars-3.4.2.ebuild b/sci-astronomy/kstars/kstars-3.4.2.ebuild
new file mode 100644
index 00000000000..0b20d1db44c
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.4.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.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/indilib-1.7.5
+		sci-libs/libnova
+	)
+	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}-cfitsio-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DFETCH_TRANSLATIONS=OFF
+		-DBUILD_DOC=$(usex handbook)
+		$(cmake_use_find_package fits CFitsio)
+		$(cmake_use_find_package indi INDI)
+		$(cmake_use_find_package password Qt5Keychain)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package wcs WCSLIB)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet" ; then
+		elog "${PN} has optional runtime support for x11-misc/xplanet"
+	fi
+	# same for AstrometryNet, which is not packaged.
+}