gentoo auto-resync : 03:11:2022 - 15:11:57

4 files changed, 2 insertions, 140 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index d48b53af3755..5a29f4f658e9 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,6 +1,3 @@
-AUX kstars-3.5.9-obsolete-header.patch 798 BLAKE2B 2da6771721d867595f0606676851e0ca4ee2865f8772f78e9eb0a4e09c53945033f5c2a8f680b9ae532682ee532f03945fd67299f725b41e9cf83995fbcb1bba SHA512 8000f925daaf4657d1405aab067438a05bdda110b683fe4cbfd995609203a22e1e6afa4221b5e29ec152aa1e4a4eae984146eefb306b836d4c634dc8a565c86f
-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.9.ebuild 2721 BLAKE2B ea153ee007ef799a7fd8f6ba5d9a0d51990de0bf668314e9478864bf1b0b0144192379d424163b7402c7af93bc7adaaf5a26842e043aa80e0560a07663b0bee5 SHA512 5d40d6df780fa35ee26f786f78e053ef8a18030a510bae8805595ab399612593b25c11b066867fc532c552b18ecc80d4d66bd0376b465159ed37830185c20e1f
-EBUILD kstars-3.6.1.ebuild 2655 BLAKE2B 426f1fbef08a8a013f8dcf0c67cd3451f081b71d96ef0bdfc2288f0e6d8783da04180591ffc08c0717599976d73e6e10564d5155b0ff1940343930a5e41f98ba SHA512 db451ab94b088a87e8f933f6fad7a1778c440d62190cebc651ff520e9906fc228134673156479012f7acda905e02fac33b36cef80209b96f05144b57e5e625ec
+EBUILD kstars-3.6.1.ebuild 2654 BLAKE2B 6a37b372eca2e7c549f62ca443941519f15788494d3cb98f3bcfe0549d8d3685a8799fc2d46d46286a4306210817c44094c4c7bc5b12c13829f2c9ebba7bb5ca SHA512 45e3b5e234b324397a80c3ff15bfeb0040369cef7ecb9b983fc2bae41e54d433f895fb1be576f1f06c36b62752511592ade74b6e0e2f91a5f0cf302143732ebb
 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
deleted file mode 100644
index 6cad0329d3ba..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.5.9-obsolete-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index c76af5d9b626..000000000000
--- a/sci-astronomy/kstars/kstars-3.5.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.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/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
-"
-
-PATCHES=( "${FILESDIR}/${P}-obsolete-header.patch" ) # bug 867814
-
-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
-}
diff --git a/sci-astronomy/kstars/kstars-3.6.1.ebuild b/sci-astronomy/kstars/kstars-3.6.1.ebuild
index 0b704f0a8789..ab00714ee37c 100644
--- a/sci-astronomy/kstars/kstars-3.6.1.ebuild
+++ b/sci-astronomy/kstars/kstars-3.6.1.ebuild
@@ -14,7 +14,7 @@ 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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ GPL-3+"