gentoo resync : 11.07.2019

2 files changed, 0 insertions, 160 deletions

diff --git a/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch b/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
deleted file mode 100644
index 71fc8ccf2d70..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.18.2-as-needed.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e1bd46e11fead134ee9d8ec4d72f2592c3e18c72 Mon Sep 17 00:00:00 2001
-From: Alexey Sokolov <sokolov@google.com>
-Date: Thu, 8 Nov 2018 23:30:02 +0000
-Subject: [PATCH] Fix build with --as-needed
-
-Fixes the following error:
-
-/usr/bin/x86_64-pc-linux-gnu-g++  -O2 -pipe -march=bdver2 -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-unused-result  -Wl,-O1 -Wl,--as-needed -rdynamic CMakeFiles/stellarium.dir/main.cpp.o CMakeFiles/stellarium.dir/stellarium_autogen/mocs_compilation.cpp.o  -o stellarium -lz external/libqtcompress_stel.a external/libglues_stel.a external/libqcustomplot_stel.a ../plugins/AngleMeasure/src/libAngleMeasure.a ../plugins/ArchaeoLines/src/libArchaeoLines.a ../plugins/CompassMarks/src/libCompassMarks.a ../plugins/Exoplanets/src/libExoplanets.a ../plugins/EquationOfTime/src/libEquationOfTime.a ../plugins/FOV/src/libFOV.a ../plugins/MeteorShowers/src/libMeteorShowers.a ../plugins/NavStars/src/libNavStars.a ../plugins/Novae/src/libNovae.a ../plugins/Observability/src/libObservability.a ../plugins/Oculars/src/libOculars.a ../plugins/PointerCoordinates/src/libPointerCoordinates.a ../plugins/Pulsars/src/libPulsars.a ../plugins/Quasars/src/libQuasars.a ../plugins/RemoteControl/src/libRemoteControl.a ../plugins/RemoteSync/src/libRemoteSync.a ../plugins/Satellites/src/libSatellites.a ../plugins/Scenery3d/src/libScenery3d.a ../plugins/SolarSystemEditor/src/libSolarSystemEditor.a ../plugins/Supernovae/src/libSupernovae.a ../plugins/TextUserInterface/src/libTextUserInterface.a ../plugins/TelescopeControl/src/libTelescopeControl.a libstelMain.a external/libqtcompress_stel.a -lz external/libglues_stel.a ../plugins/AngleMeasure/src/libAngleMeasure.a ../plugins/ArchaeoLines/src/libArchaeoLines.a ../plugins/CompassMarks/src/libCompassMarks.a ../plugins/Exoplanets/src/libExoplanets.a external/libqcustomplot_stel.a /usr/lib64/libQt5PrintSupport.so.5.11.1 ../plugins/EquationOfTime/src/libEquationOfTime.a ../plugins/FOV/src/libFOV.a ../plugins/MeteorShowers/src/libMeteorShowers.a ../plugins/NavStars/src/libNavStars.a ../plugins/Novae/src/libNovae.a ../plugins/Observability/src/libObservability.a ../plugins/Oculars/src/libOculars.a ../plugins/PointerCoordinates/src/libPointerCoordinates.a ../plugins/Pulsars/src/libPulsars.a ../plugins/Quasars/src/libQuasars.a ../plugins/RemoteControl/src/libRemoteControl.a ../plugins/RemoteSync/src/libRemoteSync.a ../plugins/Satellites/src/libSatellites.a ../plugins/Scenery3d/src/libScenery3d.a ../plugins/SolarSystemEditor/src/libSolarSystemEditor.a ../plugins/Supernovae/src/libSupernovae.a ../plugins/TextUserInterface/src/libTextUserInterface.a ../plugins/TelescopeControl/src/libTelescopeControl.a /usr/lib64/libQt5SerialPort.so.5.11.1 ../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a ../plugins/TelescopeControl/src/Lx200/libTelescopeControl_Lx200.a ../plugins/TelescopeControl/src/INDI/libTelescopeControl_INDI.a external/libindiclient.a external/libzlib_stel.a -lpthread ../plugins/TelescopeControl/src/NexStar/libTelescopeControl_NexStar.a ../plugins/TelescopeControl/src/Rts2/libTelescopeControl_Rts2.a ../plugins/TelescopeControl/src/common/libTelescopeControl_common.a /usr/lib64/libQt5Concurrent.so.5.11.1 /usr/lib64/libQt5Network.so.5.11.1 /usr/lib64/libQt5Widgets.so.5.11.1 /usr/lib64/libQt5Gui.so.5.11.1 /usr/lib64/libQt5Script.so.5.11.1 /usr/lib64/libQt5Core.so.5.11.1
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::dealloc(QListData::Data*) [clone .isra.21]':
-/usr/include/qt5/QtCore/qlist.h:494: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `TelescopeConfigurationDialog::listSerialPorts()':
-/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:73: undefined reference to `QSerialPortInfo::availablePorts()'
-/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:80: undefined reference to `QSerialPortInfo::portName() const'
-/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:81: undefined reference to `QSerialPortInfo::vendorIdentifier() const'
-/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:82: undefined reference to `QSerialPortInfo::productIdentifier() const'
-/mnt/portagetmp/portage/sci-astronomy/stellarium-0.18.2/work/stellarium-0.18.2/plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp:78: undefined reference to `QSerialPortInfo::systemLocation() const'
-../plugins/TelescopeControl/src/gui/libTelescopeControl_gui.a(TelescopeConfigurationDialog.cpp.o): In function `QList<QSerialPortInfo>::detach_helper(int)':
-/usr/include/qt5/QtCore/qlist.h:462: undefined reference to `QSerialPortInfo::QSerialPortInfo(QSerialPortInfo const&)'
-/usr/include/qt5/QtCore/qlist.h:468: undefined reference to `QSerialPortInfo::~QSerialPortInfo()'
-collect2: error: ld returned 1 exit status
----
- plugins/TelescopeControl/src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/TelescopeControl/src/CMakeLists.txt b/plugins/TelescopeControl/src/CMakeLists.txt
-index e8dc3212fe..34586b7528 100644
---- a/plugins/TelescopeControl/src/CMakeLists.txt
-+++ b/plugins/TelescopeControl/src/CMakeLists.txt
-@@ -22,15 +22,15 @@ ADD_LIBRARY(TelescopeControl-static STATIC
- SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES OUTPUT_NAME "TelescopeControl")
- 
- TARGET_LINK_LIBRARIES(TelescopeControl-static
--    Qt5::Core
--    Qt5::Widgets
--    Qt5::SerialPort
-     TelescopeControl_gui
-     TelescopeControl_Lx200
-     TelescopeControl_INDI
-     TelescopeControl_NexStar
-     TelescopeControl_Rts2
-     TelescopeControl_common
-+    Qt5::Core
-+    Qt5::Widgets
-+    Qt5::SerialPort
-     )
- 
- SET_TARGET_PROPERTIES(TelescopeControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
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
deleted file mode 100644
index 340893634982..000000000000
--- a/sci-astronomy/stellarium/files/stellarium-0.18.2-fix-test.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-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