gentoo resync : 22.05.2021

6 files changed, 33 insertions, 5 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 3b10f030dcf2..1702f3c494a0 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index b6b4c49872e2..c4a010fe3868 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,8 @@
+AUX kstars-3.5.3-fits-w-o-libraw.patch 954 BLAKE2B 0735f834e3979f5c5676b3635bb3ab2270b28338ca9f7db4813e83d93dfcfe64ef6fe163dd719826dce5225d4858f142a555379d86b6be8c8748911d896461e9 SHA512 190e9f624a9ed99e07f72ad3973f58443cb80b3645ee16378cbc0d18c215845baeffb5b871f8eaacb9aa8fb0385ea33122738bb7799c9237ed6ba824c2752873
 DIST kstars-3.5.1.tar.xz 78872552 BLAKE2B 8962d60a7e6224a7d6724a9883136599ca7acf874131b46ad30ca5fba6d222242d60f3eff3bee8df3e7db8807e6d6a3d363d2f63dd1540d7b80d9f76be3ee31f SHA512 a0684272967a314ca9ce5d835337d6c6f52f2b5cfb877f50b41a5fa8df51497fbb10445e14e0d04804f3ad3dfdba4379710dd82547b617f4ee9d78cec8feb0dc
 DIST kstars-3.5.2.tar.xz 78893892 BLAKE2B 3fc5c0544b3145af770f59b7c4ddbca3578c03a44e87b3114c1ca414242da9df44eb8cfe1440f1c55491a8e73ff329e8e4482c6becb610683fd2fb210a16dd2e SHA512 0ddd2987b4c34ff4d8a6287c61601eb33311d2403b3f1b0e503aa4bb6adb2b61f9c5d3aedfc7146b3503d2da6a0a9c6dd73d237135a06a7c824c84699bac0f3f
 DIST kstars-3.5.3.tar.xz 79228112 BLAKE2B c82e76398630a657887a8b6720a801bce74bb2ebff5bb86f4546672794709a68c970c897074e9cc6846210250ad2d05e2b53af75b70ef2c0fa5504be12aa592b SHA512 383071130fa4674ba373cba2ecd46143a9cdef9f9e636f0bf33f66d9302baa913af4aa1713ba871dd7cee6eed95d8196055a02ab41c24e2729d74950aea742f8
-EBUILD kstars-3.5.1.ebuild 2520 BLAKE2B ff759a51e60d389edd5b271877b33cacdcb5cf34959b10aa9191e7c8b2070ca1faf96ffdba6c95ac306d60f4381cfb42f8b8e39cb37183c47b115d4bb9b026c5 SHA512 832a3c5f312544074922b4c97f2ff925ee3ad8441c007ace687a5e724d4acf4eef137f5d66dd1a40ba2af7eb2d620201cd5486ee8219ccd8ca60a77ceba0fa88
-EBUILD kstars-3.5.2.ebuild 2521 BLAKE2B 65a157a7e9b9daf8d7cff4e141474a49b7c0c39f13a13dd2f949b3012e335cf31c1eb1d9b852e128f10b3eaeae13dcf54e9e5d0b68340c888bb89b1850a64048 SHA512 3ced37ff285a601a46bfd57944e7301ec7f964cfcd9b1cf643ede1295ad30e838f6b94510bf34dffd1281c5027456404ea4d14bd0409bc81cef22b2d34cd8a68
-EBUILD kstars-3.5.3.ebuild 2522 BLAKE2B 297a04f4546dabf0eca91b35a57cd8247f76029fe8d48355f2dadd93be71b3c787f539cd4ed5176abef9934fdb64f83de965f80a497c1ee9d3171015eb228be5 SHA512 9a7fe1ca6ca4c9389ccf3743dd23ca9a42c04a2f98c8f9df134d1b5347601a12c62cbf13450c9743f877afb8e9161806028d6b294aae185df485aba59e3530cc
+EBUILD kstars-3.5.1.ebuild 2518 BLAKE2B c6b21b5b0c6674dff5fc056a6b933d410f418621114ceb77f81ef96aa60c62f69f96b5960d6dbc2d8d236410a6f288f723a24fa05b268dffa912ffc33c735897 SHA512 01d75c7916862391faaff2c099d6f5c28a7452270e81612b9d4614830fc66f412087f008471aeff5b6868bdb634c925c56c2aae9fdff8a5bc572a880a3f11e7d
+EBUILD kstars-3.5.2.ebuild 2520 BLAKE2B ff759a51e60d389edd5b271877b33cacdcb5cf34959b10aa9191e7c8b2070ca1faf96ffdba6c95ac306d60f4381cfb42f8b8e39cb37183c47b115d4bb9b026c5 SHA512 832a3c5f312544074922b4c97f2ff925ee3ad8441c007ace687a5e724d4acf4eef137f5d66dd1a40ba2af7eb2d620201cd5486ee8219ccd8ca60a77ceba0fa88
+EBUILD kstars-3.5.3.ebuild 2589 BLAKE2B fe1866418d9a9677b45ceef41fe962a8a86f56b9570c2ccedc62d0d5840422ea2ebdc012d22853241a4e102b8393d4e06a17fd6807a0d82e3c8727af3dcb9a7d SHA512 66031b8511b2a37ac35fa37d5b0b1aeb32161930fb0e7f7b07cd024498c5a279fe13a0c7e538c7c25ece87819f6d2ca3e30d4da89549c912f53f1b7c2779cd51
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
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
new file mode 100644
index 000000000000..a0bb66046f01
--- /dev/null
+++ b/sci-astronomy/kstars/files/kstars-3.5.3-fits-w-o-libraw.patch
@@ -0,0 +1,25 @@
+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.1.ebuild b/sci-astronomy/kstars/kstars-3.5.1.ebuild
index 99aa66572d66..91445eee3808 100644
--- a/sci-astronomy/kstars/kstars-3.5.1.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.1.ebuild
@@ -9,7 +9,7 @@ QTMIN=5.15.1
 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"
diff --git a/sci-astronomy/kstars/kstars-3.5.2.ebuild b/sci-astronomy/kstars/kstars-3.5.2.ebuild
index 87c337a6da60..99aa66572d66 100644
--- a/sci-astronomy/kstars/kstars-3.5.2.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/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.3.ebuild
index 8c5431d2e410..49493cc295d5 100644
--- a/sci-astronomy/kstars/kstars-3.5.3.ebuild
+++ b/sci-astronomy/kstars/kstars-3.5.3.ebuild
@@ -74,6 +74,8 @@ 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