gentoo resync : 30.05.2020

7 files changed, 137 insertions, 3 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 0741ac04d956..c4f5c535aecc 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index c5aad6ab706f..0340c9a4e9bd 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,5 +1,6 @@
+AUX kstars-3.4.2-cfitsio-optional.patch 1100 BLAKE2B d4c19fa448a43e1851fd80fbe87c1401eab6afb2a97d9d41d4a56c231acc2e9f25d6317131f21b08cf1cc68eea20fd5542bdd27b61fb5d5f93701e23c5299a30 SHA512 2b7cfa980ee8318431109d5aa0aace1babb9eb71f7f2c26d8a7e69c2f94746c1fb69e4201c311f12ac5b678e1a71261fd7121d4e91fc432dd1e735699bf7221c
 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
 EBUILD kstars-3.3.9.ebuild 2529 BLAKE2B 69969a3abe445536b217c1b04129161d09f2fa662bc3fc9daf0968f729feccaedc0067835b532660600f945142a3d348ca480e2ec4d66c3d341a56bbcecf6186 SHA512 4d99467b932bcb5c3bae57f8e864de4cf2dc63a60903cfca568e969ba186a2d90ec30c2c7b63e062d1e624e9b71a450864f2dfa94ac3da1ca107b58ad939a462
-EBUILD kstars-3.4.1.ebuild 2532 BLAKE2B 4ba6158282de19076247a076b4592b9bdc4bcaa68b989968b619f9b965981538194e3f9be848208e7d4d045d38ed559a086289ba156d996ac433a84bb2f463ae SHA512 59c53a247c82e06ae15b35a8ff9bc24e904593e63ca1b9e3a32b5eb8ae4c13a60a29b5b89f4af55a1d11f5f0af68f26aa85a63cf80eb9c204f578947db352afd
+EBUILD kstars-3.4.2.ebuild 2587 BLAKE2B 02a4dc34e43617239f993df310ca017791c499db82f99778e4f1353df4c5dc382c70d758788097efb3a7681c60c4bfbcd8802270b2653dbf8782a0d69d1cac6b SHA512 d29dbdc71f0ff607206152e8f92480c568d87c4b94ef5b0f861d514bca76697fe8650f7ab1b9e09736b32a86a478976b0171a0a46f6b78fa0f714bafe63b51ef
 MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
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 000000000000..b486debf3e4c
--- /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@ikarustech.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.1.ebuild b/sci-astronomy/kstars/kstars-3.4.2.ebuild
index 027a65724d58..0b20d1db44c3 100644
--- a/sci-astronomy/kstars/kstars-3.4.1.ebuild
+++ b/sci-astronomy/kstars/kstars-3.4.2.ebuild
@@ -73,6 +73,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-cfitsio-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DFETCH_TRANSLATIONS=OFF
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index ef123da408af..9e53dd73d3c6 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -4,5 +4,7 @@ DIST stars_6_2v0_1.cat 148352404 BLAKE2B c605b284b3d768cb1619ada3f58d406fa7737f0
 DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b05b5de8599be1bbdd2a8053cbcec44b0e58bc9248364666db9cdf23449edf236e3f21fdc0e8f1a4a706afc919 SHA512 43b866eb793e8812c9d5502101a6c985d2055fb88bdbda274726bcd51e1527ecf342b22acd673318c9c8e88cac68eace18de8f27d29ffe64933fd32a5b84c5e3
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.19.3.tar.gz 326218851 BLAKE2B 286d2559a2152f030640ed88778f57f1213d0d8b9e990d0aa1ad5138396fe9641083ec76554e1296dc79d914955e289d23046af42299df6217bbfbaca76b2f18 SHA512 c2948603a3b84fd2b7002cbd9993a2432ca0908d9236aca03c03ff0cf0706728a407218096e94da2b2a623b5434c109906d94ee5069a2d57a8e35af7c8455ff7
+DIST stellarium-0.20.1.tar.gz 343991703 BLAKE2B 59580dd2bca885893bfc68faaf966a727e3d7c0774f59726e23cec132cbfca4ae518983db2e52d4d3d3f1ec96c7ce876168bb23959178ebf212ee6bb357299b3 SHA512 685a306391dc681cc21834a226e35c769e11909f625ff7461d7e896ba412ad595871e93c69981b342099f46829f9f3ef3e276be867dc5ea5523fa60a99cc21d1
 EBUILD stellarium-0.19.3.ebuild 2232 BLAKE2B c1361b4194d0f838fa3b46f79854ec77ab415fad392c6b0ad19c77f9a7bf8f965101c2526c8b88e72d9b5c4cdc8f4795b588ea025887f0ad0f6444d1d33cabe5 SHA512 469ed98be0cd3637c5b77b22e81db860cfe503c03b60c414e7ee9ca63bf9ca2fa63d6eac68163052b13b2cbedede72ac9c85ed5f09c4ed0d02e4bc8a339022af
-MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
+EBUILD stellarium-0.20.1.ebuild 2236 BLAKE2B 83d3d63e8046e0abaa596e51e79607aa695b789119720e68bad42f307490a2b3413e620d397c4a0ee1dab4f9a7cdfba686219536744211771939633893bc72dd SHA512 a79c2d1e0c3c5f60447eafd1a232c07938215a7525f98579e2d1927336f28d51622f2933b2f72c76fdd6976b98d5d62250306e7babeba590c2195f248f37cb6d
+MISC metadata.xml 1004 BLAKE2B f5e3c9d2641b2cededfb9ac848a72acbe0949d5fec6bba73dcce51fcfb2f83e711e5036d2d7a4be6dad6bd357e2a243776ba185c572e655e6c0fc00321d16453 SHA512 9da973b4a8b3ca85c19b9f0a07f21b625f28ce242de061a2ef2c14c8f36f7ce58b335abc82ac9e639fba1b72c6a513bc886df42ed961c8a711f7205d5333c05d
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 05142448e046..2e00add2cfd9 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>alexey+gentoo@asokolov.org</email>
+    <name>Alexey Sokolov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-astronomy@gentoo.org</email>
     <name>Gentoo Astronomy Project</name>
diff --git a/sci-astronomy/stellarium/stellarium-0.20.1.ebuild b/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
new file mode 100644
index 000000000000..6be1804cb2f4
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.20.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://www.stellarium.org/"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gps media nls stars test"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtserialport:5
+	dev-qt/qtwidgets:5
+	media-fonts/dejavu
+	sys-libs/zlib
+	virtual/opengl
+	gps? ( dev-qt/qtpositioning:5 )
+	media? ( dev-qt/qtmultimedia:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}