gentoo resync : 22.01.2019

3 files changed, 119 insertions, 2 deletions

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 43c2babb9d9a..a9426eb6d2e5 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,4 +1,5 @@
 AUX stellarium-0.18.2-as-needed.patch 6217 BLAKE2B 5e4df179b4364f1bf56d2c9f719d07783d25ee95242ca33fe6ea2843fecd74a63aeff3675913bc3dde7cc0f75603a3a256dd7b08c54800c5ff8fd57af7f8976c SHA512 1107d8960c337606bc9526100ef963c252a616f77566253dbac4c96706a4a0c0830dcd9496759fb46f7aa27cc667364cd820567cde3eccc2a00eeb5eecffe6e0
+AUX stellarium-0.18.2-fix-test.patch 4006 BLAKE2B 7938122b34510015fe16f3ecc5a5c2f0348ac36460ae9b68dd19350baa21b59ec1ee70a08e81f9d31536f7fb547c39db0d42b75404685b255cda8c638b44f67f SHA512 c33b5decb1e0d7d410a9a3eac9c114961fc45b193e5e8131eadd6bb5f0b520d36de74e3e08b26e8a8103910c342e135be2ba7be5f08d0fc27e23ac15b7d28e85
 DIST stars_4_1v0_1.cat 17040932 BLAKE2B 6715c129b27bb82b4b9b432bd56ed56dcbb1fbe9b9b608154656431119e75ab27e3c8afa66bce0fed1b2f7d080df49e770ddf63241f253e9f6f139be8238349d SHA512 adf2241d0a8b58eb6b8ad5f885dd8a3a66610a63ae949f17f26e81f1ac8d1094d77879e361a0de3929e0d447b0de77142e0c7de0f1f123bd145e130fbfbe0f9a
 DIST stars_4_1v0_2.cat 16948302 BLAKE2B 6efe02c6343fa3cd121879dddd3017dbd42a7c8965481b1ab79a258cedc4adc85df25240003b95c325eb35a8ed9686c38b2590f78aff9cd400ecac675583232d SHA512 80e5b2d0bc78c09658e84e7ee57309be290ba66a131ff38aa471235ff513d7824b28f6852ba1fdb485f86ede1fb2388cfb6327b2f1fe60bb097ce0cdbe48d2cb
 DIST stars_5_2v0_1.cat 42580300 BLAKE2B eb6528c0577b3f2001a8b03cc5a4e08fa4e75723f677d0dda98d27c50791d9825c0e0feca7b00f0cb82ce362bc83f3e8dc2260d14e81e4a070cbbfa44f2107ba SHA512 6fc0f7352d1165a0744cc932b6d379741e4614d5a95edd136522c789eaa8d1bcf05d7445f7dfd6896e8183aa64bf37b3610d87902b54542f62f2418b285892e0
@@ -8,5 +9,5 @@ DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9
 DIST stellarium-0.16.0.tar.gz 204675673 BLAKE2B fe34ab611569e23277ae9f273d1ae72139d5b860d0ae1b5650a9744960ce8bac6953d7de98b60bd224374aa77db33c00081ed90d1683b2007ef1b5068af158ff SHA512 0f75441435ff1d0fa149264116e9ae6ec3b3553f7c66e78832bdb0ffd55cbef656b820680134d95f89c73e80ef283372660ea7545db7fff205da66cf4cf8e9d6
 DIST stellarium-0.18.2.tar.gz 265334731 BLAKE2B d8527f93f2ea856466f98e7ab326a34e4265c4937c4d399755878cc6bbb1202580c825a6253e090986ebc80119fb33881b120a1ed6873278dacef75a1e69c517 SHA512 f658b19524b78739a5125ac7c89f5d2b48284d8696da54e39d2390bbbe5eeb8da70837c4e9055a650a492f3f71ebbc966c4c1341729982ba37d93b26fcb91912
 EBUILD stellarium-0.16.0-r1.ebuild 2678 BLAKE2B 4ad1b128b5d332059796e02782935c7fbb4c355339264eb5679e86a2d10e734f76bb203c6b18401e7ef96f7b851b862a9a7d6501e86a76a45aa831dcd856d01f SHA512 db6a1df905b969aa878ed6bd5274e7496696805df7200366f70621929aa83239d5d20082d89eab83af02cd99b843d695ab8dbcbe3e750da54f3d2bbc3b68cabf
-EBUILD stellarium-0.18.2.ebuild 2375 BLAKE2B f974927509125a102d88d0ccd3f8727892b036ea557ea4d2b8ec05474c116f8e096999b6e3c18732613bd8634149bb745693e8eef028fbe0472e0aa7fc216ce2 SHA512 36c2609a7cfaa05062920e1b2c2d487541c4a1efed8470b04bab14d1c7fcc6166ba8d98c349963e3b71ba7ea2396d63d193e5f0ba70d7a7865a1c64867bec3f3
+EBUILD stellarium-0.18.2.ebuild 2411 BLAKE2B 8fd1ea3be9e761a94c875c4b7251833d3698f06d3258ed43ebb51e3d30415367df302511e84d3a11abc4036405d07f640cd5375b6bc16912e3ee19a397689e2a SHA512 327edbe6ceecdceedfa111d6fb5037279f04ab5e5f1334a241b1c3ed246a5860c60b6089f522e9b2a314dbb1dd2811527b1c8a72c0e2438193f429b6d93f3d27
 MISC metadata.xml 758 BLAKE2B 69f3db0b3705b55f1eb04d67e0e6d6baab7e7e7df214f0a5386b74efd2863b63290581cd6c5b90000bab20a423902722ab560a670aa25796c7d555875a5961ac SHA512 33bc261705580ece702dce6d2f4d4143e80daa072a09bfbb40bb522d3a494f5f438d560a3ff0aa089313b365015189aa909b831a95166c8e709477dc6625a31c
diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
new file mode 100644
index 000000000000..340893634982
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
@@ -0,0 +1,113 @@
+From d20954d0a9a7890865a2d4b09a01d62f2ed0d8e9 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 6 Jan 2019 13:20:59 +0000
+Subject: [PATCH 1/2] Fix test, when building out of source.
+
+https://bugs.gentoo.org/674472 has details.
+---
+ src/CMakeLists.txt          | 2 ++
+ src/core/StelFileMgr.cpp    | 9 +++++----
+ src/tests/testEphemeris.cpp | 5 -----
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6a46d006b2..10db29593b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -646,5 +646,7 @@ IF(ENABLE_TESTING)
+     ADD_DEPENDENCIES(buildTests testEphemeris)
+     ADD_TEST(testEphemeris testEphemeris)
+     SET_TARGET_PROPERTIES(testEphemeris PROPERTIES FOLDER "src/tests")
++    SET_TESTS_PROPERTIES(testEphemeris PROPERTIES
++        ENVIRONMENT "STELLARIUM_DATA_ROOT=${PROJECT_SOURCE_DIR}")
+ 
+ ENDIF (ENABLE_TESTING)
+diff --git a/src/core/StelFileMgr.cpp b/src/core/StelFileMgr.cpp
+index c88fd72b86..95126152f2 100644
+--- a/src/core/StelFileMgr.cpp
++++ b/src/core/StelFileMgr.cpp
+@@ -26,6 +26,7 @@
+ #include <QString>
+ #include <QDebug>
+ #include <QStandardPaths>
++#include <QProcessEnvironment>
+ 
+ #include <stdio.h>
+ 
+@@ -78,11 +79,11 @@ void StelFileMgr::init()
+ 
+ 	
+ 	// Determine install data directory location
+-
+-	// If we are running from the build tree, we use the files from the current directory
+-	if (QFileInfo(CHECK_FILE).exists())
++	QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
++	QString envRoot = env.value("STELLARIUM_DATA_ROOT", ".");
++	if (QFileInfo(envRoot + QDir::separator() + QString(CHECK_FILE)).exists())
+ 	{
+-		installDir = ".";
++		installDir = envRoot;
+ 	}
+ 	else
+ 	{
+diff --git a/src/tests/testEphemeris.cpp b/src/tests/testEphemeris.cpp
+index 26b4d83b98..ba5ac2a315 100644
+--- a/src/tests/testEphemeris.cpp
++++ b/src/tests/testEphemeris.cpp
+@@ -42,12 +42,7 @@ QTEST_GUILESS_MAIN(TestEphemeris)
+ 
+ void TestEphemeris::initTestCase()
+ {
+-	#ifndef Q_OS_WIN
+-	// FIXME: StelFileMgr::init(); is disabled on Windows due it will caused problem "could not find install location"
+-	//        on Windows machines without installed Stellarium (e.g. AppVeyor). So, it will be give "false positive
+-	//        test pass" at the moment for DE42x ephemeris.
+ 	StelFileMgr::init();
+-	#endif
+ 
+ 	de430FilePath = StelFileMgr::findFile("ephem/" + QString(DE430_FILENAME), StelFileMgr::File);
+ 	de431FilePath = StelFileMgr::findFile("ephem/" + QString(DE431_FILENAME), StelFileMgr::File);	
+
+From 2620a64db14e5feb5db8cb085dacef592556ded1 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 6 Jan 2019 15:56:52 +0000
+Subject: [PATCH 2/2] Fix testExtinction on i686
+
+https://bugs.gentoo.org/674472
+---
+ src/tests/testExtinction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/testExtinction.cpp b/src/tests/testExtinction.cpp
+index bfb6ff8479..6a4c22212c 100644
+--- a/src/tests/testExtinction.cpp
++++ b/src/tests/testExtinction.cpp
+@@ -41,5 +41,5 @@ void TestExtinction::testBase()
+ 	mag=2.0f;
+ 	extCls.setExtinctionCoefficient(0.25);
+ 	extCls.forward(vert, &mag);
+-	QVERIFY(mag==2.25);
++	QVERIFY(fabs(mag-2.25)<0.0001);
+ }
+From 3ffebb1ce599e2f0062472ee05060a5de5838101 Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sun, 6 Jan 2019 18:00:41 +0000
+Subject: [PATCH 2/2] Try fix #587 differently
+
+---
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 10db29593b..18cae6be4d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -546,6 +546,8 @@ IF(ENABLE_TESTING)
+     ADD_DEPENDENCIES(buildTests testStelFileMgr)
+     ADD_TEST(testStelFileMgr testStelFileMgr)
+     SET_TARGET_PROPERTIES(testStelFileMgr PROPERTIES FOLDER "src/tests")
++    SET_TESTS_PROPERTIES(testStelFileMgr PROPERTIES
++        ENVIRONMENT "STELLARIUM_DATA_ROOT=.")
+ 
+     SET(tests_testStelSphereGeometry_SRCS
+         tests/testStelSphereGeometry.hpp
diff --git a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
index 42b839f37191..78116c5ed4a6 100644
--- a/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.18.2.ebuild
@@ -43,7 +43,10 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-PATCHES=( "${FILESDIR}"/${P}-as-needed.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-fix-test.patch
+)
 
 src_prepare() {
 	cmake-utils_src_prepare