gentoo resync : 05.12.2021

7 files changed, 13 insertions, 40 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index f1c50e25cd5d..d9b52baf3659 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 6e68bc63eef5..98987bae1cd1 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,6 @@
-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 2595 BLAKE2B 27b3b068ab19e14ad3d9dbe3b5e5f0564d4acb05f41e85d7c4098ae6bd129959b43bf8d368ba105fb229dbbef458dd9f0c614b134afde81dba98cd5daa30c077 SHA512 22ba4e8cd9c7e71c5212fad14a84e7fa3fd79019407e04044f02c41835c28b85cd564117f4519060781bd2c76a7b5960cfef196ccfd80561c3b63a75329b5b02
+DIST kstars-3.5.6.tar.xz 79127060 BLAKE2B bb5b2971a6a730237217709c599a11f4f09afa8c37fe56c4da9621c3b178aa9f8158aa3e21fb3461e512d47e6f32660c9a5cbfa2926fa1c2cc978182fce9b5b0 SHA512 5a1fb0e1d9226bdaca2657cf667f882ffca0b79a7be3286e8ba4346b7fee780ca37af1c4ef21d02ddbd25341b750ea95b0d33193baa0dca8d8aafe7d75261ec2
+EBUILD kstars-3.5.5.ebuild 2594 BLAKE2B b598fe83de5103702142e63de88c0f7460129c0de8734754ef63630a46ce18446238c5151e46980fa3adc1b9e678d5444988c8d805510f50c7ce067ca38a792c SHA512 488de12a6649e42874e9ccd1b4cd1d152b1eedbdeabbdc89c2a6bdfb3a2af54303ab3397b2a973fe800bba0f37139fb2f2696bfb6a3758b9c369cbe454d7d1f6
+EBUILD kstars-3.5.6.ebuild 2543 BLAKE2B 3b73c1ffca47f40165aba460faca7e20b99f64009c17a7ef2d2160012b166df22383bcc9460dc1fc7023db4c9c6893bd54d52a2f643a6237fe7e9aa70aef0430 SHA512 f4ba49fe9c1d19e607a33cedda38e402dd5a4d366002e9993e2addd6726d5c33795cceeae9e40af61c0c7bfdb46d7fa2ffc3ffaf0617f5a30f733d5b182292fd
 MISC metadata.xml 692 BLAKE2B a1be7f22ffff993276aaa943528cf39811e6567fdd9fe757d1045ab83e25010230f7d702bfef9c74ec71d62ff647edb4d7073e90dfb6147d100e4de6a225dfa1 SHA512 152e114ca9826e0599b530f6421e2ad5441b50b053cb81135cbf84dda3a7a37e7c7f989bb1d2f9bf826d9bf0cca97a3f0de5d9523f25fd0acbd3482348df0ed8
diff --git a/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
deleted file mode 100644
index a0bb66046f01..000000000000
--- a/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1adf58605d18ee24c68ca6762a94de75a09d738a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Mon, 26 Apr 2021 12:53:19 +0200
-Subject: [PATCH] Fix build without BUILD_KSTARS_LITE and libraw
-
----
- kstars/fitsviewer/fitsdata.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kstars/fitsviewer/fitsdata.cpp b/kstars/fitsviewer/fitsdata.cpp
-index 8300e9687..ca59d808e 100644
---- a/kstars/fitsviewer/fitsdata.cpp
-+++ b/kstars/fitsviewer/fitsdata.cpp
-@@ -524,7 +524,7 @@ bool FITSData::loadRAWImage(const QByteArray &buffer, const QString &extension,
-     Q_UNUSED(extension);
- 
- #if !defined(KSTARS_LITE) && !defined(HAVE_LIBRAW)
--    lastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
-+    m_LastError = i18n("Unable to find dcraw and cjpeg. Please install the required tools to convert CR2/NEF to JPEG.");
-     return false;
- #else
- 
--- 
-GitLab
-
diff --git a/sci-astronomy/kstars/kstars-3.5.5.ebuild b/sci-astronomy/kstars/kstars-3.5.5.ebuild
index 3faa52bf5310..f5f47a84c1d5 100644
--- a/sci-astronomy/kstars/kstars-3.5.5.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.5.ebuild
@@ -13,7 +13,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+"
diff --git a/sci-astronomy/kstars/kstars-3.5.3.ebuild b/sci-astronomy/kstars/kstars-3.5.6.ebuild
index b9300d695e86..ae17d174d3ba 100644
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.6.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.82.0
+QTMIN=5.15.2
 inherit ecm kde.org optfeature
 
 DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://apps.kde.org/en/kstars https://edu.kde.org/kstars/"
+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+"
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 	fits? ( sci-libs/cfitsio:= )
 	indi? (
 		sci-libs/gsl:=
-		>=sci-libs/indilib-1.9.0
+		>=sci-libs/indilib-1.9.1
 		sci-libs/libnova:=
 		sci-libs/stellarsolver
 	)
@@ -74,11 +74,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-fits-w-o-libraw.patch" ) # bug 790638
-
 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)
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 05ca006a9414..ac27b3f76ef2 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -14,5 +14,5 @@ DIST stellarium-dso-catalog-3.13.dat 28683353 BLAKE2B 6d7587f98ccb06a83e6befb1d5
 DIST stellarium_user_guide-0.21.1-1.pdf 31256531 BLAKE2B 511bbd2c7247156959966a038d387c0522f0539d6226c0db5c76abbe60a972a61530c7c0c5b4a93ad3d36a2eaf53260ad7d8ab09b207b90a56f35b0b67bfae42 SHA512 5ba8b4ccfc9ea2b374cc486bbd43d7aad344f8c1f204cf314f8b73b7a68199fcebac938021d7a94093514c95b61ac3dd1b6992a51ff7a5522cf025e430e51c7f
 DIST stellarium_user_guide-0.21.2-1.pdf 31351844 BLAKE2B f8a35dcc1c0d9a40ec8d640b3cc2ee1f5e154b0f06507e0ef9ccbabdc05add2c00704e611932710a60f2b21730c8398e52be0cb142428de77eec304489591db9 SHA512 7e0bb33583ac4e89ea3cd7be5585cc00d9ac473d99d4e0862be1a74edb66cbd13661bd5d7787b60a945e302e33e190cc30a51df10d363e1af49002129f8e399f
 EBUILD stellarium-0.21.1.ebuild 4041 BLAKE2B aec4e079a895882d66ca5e3c7c81cd2abbb972692a205f3f529c594229daf56c0b77921497fbf33019efdc50a75f44ea31e8ea30dd5d557f20c3de0850896e66 SHA512 e17e1c3c11de681a243c40589fff17c11a7b86b071c1f8772bcacb464432e22cca3a9cdb36a38d71c706b5c32187d86e7ca4e35ec5a3f91f453c3bb02768665d
-EBUILD stellarium-0.21.2.ebuild 4070 BLAKE2B 87aa184b9a17135831526dee646ef5191d47b7863f85386156f839c7a261ba419e48314804236b569a17016d77a4e83e2483d9ea29cf8b21228d0c042d261320 SHA512 787315a8f26549932d2a9287fe8d2b5df23d6c132005555b830c309a75a0897d6147a6e0efda8aca3ae57b2e5b31a323f63636eafe26f1374428e96cfb65f41d
+EBUILD stellarium-0.21.2.ebuild 4066 BLAKE2B 94e758cf2cf2d99f370ff6382acb470fe9d51fa0c933ef1accbfd10737d20091d2849ab419bbdd290fd58b63da5ed04ece490f5b7eb1c9d12cd32493af53b123 SHA512 b101963be54ac92f27dbf7e802eff39e7bb49ea39a5c014b5c3dee957aad845f1bb8d443ab802265ebfe475a93e2e52e8cd883b0ff057a268353f82c13e03ff2
 MISC metadata.xml 1197 BLAKE2B e58627df43d61288709e9a6bc4f77c91c14c672b8a3b87c43230f4b84f206675c907ddf54bf581c5f482943ba81ef5d9bbc89d85587725cb3c085565c53f5cac SHA512 fdce909883c678f3e6ebdb1e211135eddf8993eba88c46646005b223d74a126a5c98c61cd053f099d3f8ce0530e42ae02df24e5ebbd207b86cbca8556315f0a7
diff --git a/sci-astronomy/stellarium/stellarium-0.21.2.ebuild b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
index 06ba5edc4f0f..081f54b46aa9 100644
--- a/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.21.2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
 
 LICENSE="GPL-2+ SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ppc ppc64 ~riscv x86"
 IUSE="debug deep-sky doc gps media nls stars telescope test"
 
 # Python interpreter is used while building RemoteControl plugin