gentoo auto-resync : 06:10:2022 - 01:20:42

4 files changed, 149 insertions, 1 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 2056c34eaa7b..cc830872a999 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,6 +1,9 @@
 AUX kstars-3.5.5-FindERFA.cmake.patch 4147 BLAKE2B 1b97ac59da72d4e327e25efb72784d0cf74a5d22624596c2b2a818a6a0879f33f5f21404428748a0879aeb250e2fe9e06e2ca16e79cf2365823633725462a296 SHA512 4318b3aa133fdd3a5b2e36d67ceff3f020dccdc796c20ce85c081aa4753e82bee4bf97552ef40e6428abf9c540d48836be5b7cdc0a6706b494f4669e4626ee6e
+AUX kstars-3.5.9-obsolete-header.patch 798 BLAKE2B 2da6771721d867595f0606676851e0ca4ee2865f8772f78e9eb0a4e09c53945033f5c2a8f680b9ae532682ee532f03945fd67299f725b41e9cf83995fbcb1bba SHA512 8000f925daaf4657d1405aab067438a05bdda110b683fe4cbfd995609203a22e1e6afa4221b5e29ec152aa1e4a4eae984146eefb306b836d4c634dc8a565c86f
 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
 EBUILD kstars-3.5.5.ebuild 2594 BLAKE2B b598fe83de5103702142e63de88c0f7460129c0de8734754ef63630a46ce18446238c5151e46980fa3adc1b9e678d5444988c8d805510f50c7ce067ca38a792c SHA512 488de12a6649e42874e9ccd1b4cd1d152b1eedbdeabbdc89c2a6bdfb3a2af54303ab3397b2a973fe800bba0f37139fb2f2696bfb6a3758b9c369cbe454d7d1f6
-EBUILD kstars-3.5.9.ebuild 2513 BLAKE2B c7ededae44c0e54307d4eadc4c2fb1cec37f7874135bfdd26e1b65e4ea956c62072f0556c996c60ef7d6fc9cc0d519fe41bab90a0605d9a22b4f62bb1ce2ff58 SHA512 b59eb346402fe3395a50c4b39760ca18f3429e6281abb4631ebab071faab2f8ff396d2134697f31a259d011be3c1e736d6d894e42115528fd95e25600734005f
+EBUILD kstars-3.5.9.ebuild 2722 BLAKE2B 639a41bd7aca337e4e2995d4070c6b70c4794cf5602941fcb57f81ef6237f20eea91f86ad908e9442fe2eb6b0312769f8ab4a5452843d93b0dae29cb174817d8 SHA512 583a593f3d2374a55cf04a25683756f715e6ae806b1af0f2e7a1528b881142fdd69cf92ec851ce2013f49c92d4daf2a119a14421e5a8248752436efab672ea25
+EBUILD kstars-3.6.1.ebuild 2656 BLAKE2B 5d570dae8a2f86f911bd900abab56a896d068bc467dfa48fac9c93706cdfba05e7c2b4954d42dc27771cc9b3bb312435f7c462ba02e9ca231c79ec1519feebba SHA512 2ee6314fc63e7a2c641b2709cf366b06df21c5edbf5d71c46586beafb298b639abe3b8dd68dca2ff2d788f7e882009292dbd940cc5d131166c86a4a446630da0
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch b/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
new file mode 100644
index 000000000000..6cad0329d3ba
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
@@ -0,0 +1,26 @@
+From bc80093354457d8f057115a75877ce330e65e79e Mon Sep 17 00:00:00 2001
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Fri, 1 Jul 2022 22:04:52 +0300
+Subject: [PATCH] engine.h no longer available with latest KF5
+
+* asturm 2022-10-05: Cleanup unrelated style changes.
+
+---
+ Tests/kstars_ui/test_catalog_download.cpp | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Tests/kstars_ui/test_catalog_download.cpp b/Tests/kstars_ui/test_catalog_download.cpp
+index 111e5a70f..d94c99f5f 100644
+--- a/Tests/kstars_ui/test_catalog_download.cpp
++++ b/Tests/kstars_ui/test_catalog_download.cpp
+@@ -4,7 +4,6 @@
+ #include "test_kstars_startup.h"
+ 
+ #include "Options.h"
+-#include <engine.h>
+ #include <KNS3/DownloadWidget>
+ #include <KNS3/Button>
+ #include <KMessageBox>
+-- 
+GitLab
+
diff --git a/sci-astronomy/kstars/kstars-3.5.9.ebuild b/sci-astronomy/kstars/kstars-3.5.9.ebuild
index 4a205c269d69..e30e6b5fb1d3 100644
--- a/sci-astronomy/kstars/kstars-3.5.9.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.9.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
 KFMIN=5.82.0
 QTMIN=5.15.2
 inherit ecm kde.org optfeature
@@ -73,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-obsolete-header.patch" ) # bug 867814
+
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
@@ -89,6 +92,15 @@ src_configure() {
 	ecm_src_configure
 }
 
+src_test() {
+	# bug 842768, test declared unstable by upstream
+	local myctestargs=(
+		-E "(TestKSPaths)"
+	)
+
+	ecm_src_test
+}
+
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
diff --git a/sci-astronomy/kstars/kstars-3.6.1.ebuild b/sci-astronomy/kstars/kstars-3.6.1.ebuild
new file mode 100644
index 000000000000..d007348c45e0
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.6.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.5
+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/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-2.2
+	)
+	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
+"
+
+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
+}
+
+src_test() {
+	# bug 842768, test declared unstable by upstream
+	local myctestargs=(
+		-E "(TestKSPaths)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "Display 'current' pictures of planets" x11-misc/xplanet
+	fi
+	ecm_pkg_postinst
+}