gentoo resync : 16.02.1018

6 files changed, 3 insertions, 191 deletions

diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index 179544e228e7..71042cf1fb3a 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,7 +1,3 @@
-AUX kstars-2.9.5-libraw-0.19.patch 2568 BLAKE2B 95e725554f6e8f13b115891c968772f42caf97d7bdce1edc6ef34de67ffd777ae6464dd001b955169f892da704bd6f48ebe94cd4c50332301c38aa7f44ab2180 SHA512 1bfe27d312506802ad2191871b744ca8780bf3626c563f41eef5ad576e7d1cd056b2ec49c8c23ef8da43a198e61e46d379b9e637fffdefc7c796f95317363022
-AUX kstars-2.9.5-qt-5.11.patch 776 BLAKE2B ab6d180fb89b526e4a50df17f24dad512bc25705611636076d287109d8ab6c4109030819458e0760339a59f3185451966c70e3970324cd152d486a18f3a5d6bb SHA512 6287dfdb0720e53d38ca6b24bd5c1c5cfd01af5db36de2b7d45551ac0c57d50d892a31830d8a3328fa1f36ebefc87635380593af97f6d5db0f17705dcb7742d3
-DIST kstars-2.9.5.tar.xz 64033600 BLAKE2B 1d858d40d1ebccb1ae3217d8f3a464089171a6a9777cf759902017b373ceac3c7e56febf6ec3b2bed5db6cef779252e2d653e3c513545bf55261465465df2274 SHA512 850e3ad31f0c60547c406dc24bf3064f86867557f97acd63fb951d49fb09d7d20462a85016f8c645f316de0310cf7969e08c19e00fc0bedb5c1b006dfda0622b
 DIST kstars-3.0.0.tar.xz 63604404 BLAKE2B 23754eb1d29b9e7793fac71869045a4e172f8c9aa32dc55d529ef40bf03251d035a2edc68508d887c204389364c2dceba2c9984985bf2ddcc357fc835924f215 SHA512 e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08
-EBUILD kstars-2.9.5.ebuild 1991 BLAKE2B 64a352285ceb91cdb78814ef8e3f6778f5a5f9f17bbeb17621fff6e535b437266face23e4a6dfd77d03f8016a5800369574803ba6872f24dcf8d8d4e78febfb4 SHA512 871fe72fc42571a39681bf73e34f3d9f723adca8f1030d05adc2873e97fb866d2379c19c5d881ef49222135f2fb1dcc3171b360fd1b513a6a4b66fb6a6600830
-EBUILD kstars-3.0.0.ebuild 2201 BLAKE2B a11649bba50a6860bc5182f059527737e0bc30af6917c4c84819bb1e29fa35fd37df68149da4d27add2e1172e275a201df6c26eaf6f8c14d477e4f1906770fe5 SHA512 495cbfb01652addd8d119cebca97aa900a1f96dcfd80d138911d9800e7abba1d07821b6a9399de5f15b41c57ad3a2d8ffe500f512f810501d6feeccea253656a
-MISC metadata.xml 680 BLAKE2B 939326c39a45f1414df4a7069788e2bb5679b9a85d6db00aed248a9883cf70c1863379db1fc2f60c2954b80ec68b7771c21e3e9542a1b7ae8cf91ac839c4520d SHA512 7f7fa0ca9f30515093f7e65abc6b3e759921245d047393da96efccecdd61dfacf4bab59a19c63c3d86f9af7222d9f53ebe0823b459181575f735215f70b422aa
+EBUILD kstars-3.0.0.ebuild 2199 BLAKE2B 6a15c7174ad19e05253c89ad9f7744b80ecbeacd3aa4c5f3f25a938a0b9ab56a3ba7c377b78f60c6650b9c7ae9879d64e1583a97bd6ad77d39a4f398fe837626 SHA512 126b54bb36b0407fe49a0da961e7b93aec43f211d17c1120b27ad3d962392b21ddaa17345b6f357982e8493c3e35877a352d563592fe210556007793cddab926
+MISC metadata.xml 623 BLAKE2B 9c82c20c0824fb19b9e6a2fe9e144fa92aff5c15eb3cfb660f2d4ec985ea6f9218ebe3cd64862529dc2877cd5cf4209e54b6bfa6ccb9acd6eeac568a910b7c43 SHA512 030a49974d3cf1944ab6e0abe805e8d81763d3c173e5366344d11cc8415b0f55f8423de99a5e587e24bf078f0a0c2522770f2609c20b57d25bc9ba65e8bba8a6
diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch b/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
deleted file mode 100644
index 7db3faada9bd..000000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-libraw-0.19.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 25630e41c71990d619f9f96693624056a8d89039 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino@kde.org>
-Date: Tue, 31 Jul 2018 20:48:17 +0200
-Subject: cmake: fix enabling of exceptions
-
-Use the ECM module KDECompilerSettings unconditionally on every
-platform, as it provides the kde_enable_exceptions cmake macro needed.
-This might break build on android, but then the exclusion of
-KDECompilerSettings on android is a 2 years old hack, most probably
-working around a different issue which will need its own investigation,
-and fix.
-
-Use kde_enable_exceptions() unconditionally, which will do the right job
-for all the different compilers. This also removes the -Dfexceptions
-defines (which effectively does nothing), and the manual -fexceptions in
-htmesh.
-
-Incidentally, this fixes the build with libraw 0.19.0, which requires
-the usage of exceptions in case LIBRAW_NO_MEMPOOL_CHECK is not defined.
-
-* 2018-12-23: asturm@gentoo.org: backported to 2.9.5.
-
----
- CMakeLists.txt               | 9 ++++-----
- kstars/htmesh/CMakeLists.txt | 4 ----
- 2 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69f2409..73224cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,10 +87,7 @@ include(ECMAddAppIcon)
- include(KDEInstallDirs)
- include(MacroBoolTo01)
- include(ECMQtDeclareLoggingCategory)
--if(NOT CMAKE_TOOLCHAIN_FILE STREQUAL ${CMAKE_SOURCE_DIR}/android/toolchain-android.cmake)
--    #We get error "could not find main method" with this module
--    include(KDECompilerSettings NO_POLICY_SCOPE)
--endif()
-+include(KDECompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(FeatureSummary)
- 
-@@ -252,8 +249,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- endif()
- add_definitions(-DQT_NO_CAST_TO_ASCII)
- 
-+# Needed for htmesh, and libraw
-+kde_enable_exceptions()
-+
- if (UNIX)
--  add_definitions(-Dfexceptions)
- 
-   # TEMPORARY: To disable QCustomPlot warning until 2.0.0 is released which fixes these warnings
-   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor")
-diff --git a/kstars/htmesh/CMakeLists.txt b/kstars/htmesh/CMakeLists.txt
-index e76d84e..0dbdc8f 100644
---- a/kstars/htmesh/CMakeLists.txt
-+++ b/kstars/htmesh/CMakeLists.txt
-@@ -32,10 +32,6 @@ IF (ANDROID)
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- ENDIF ()
- 
--#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
--#TODO is there KF5_ENABLE_EXCEPTIONS?
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
--
- add_library(htmesh STATIC ${HTMesh_LIB_SRC})
- 
- add_definitions(-D_EXPORTING)
--- 
-cgit v1.1
-
diff --git a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch b/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
deleted file mode 100644
index 72d4b8e4a48a..000000000000
--- a/sci-astronomy/kstars/files/kstars-2.9.5-qt-5.11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cf510e4aee93bf1392df8e35931ba9bb9a07fc16 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 25 Apr 2018 22:05:50 +0200
-Subject: [PATCH] Fix build with Qt 5.11 (missing QDoubleValidator)
-
-Reviewers: mutlaqja
-
-Subscribers: #kde_edu
-
-Tags: #kde_edu
-
-Differential Revision: https://phabricator.kde.org/D12525
----
- kstars/dialogs/focusdialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kstars/dialogs/focusdialog.cpp b/kstars/dialogs/focusdialog.cpp
-index d09ce9273..b264ee5c9 100644
---- a/kstars/dialogs/focusdialog.cpp
-+++ b/kstars/dialogs/focusdialog.cpp
-@@ -24,6 +24,7 @@
- #include "skyobjects/skypoint.h"
- 
- #include <KLocalizedString>
-+#include <QDoubleValidator>
- #include <KMessageBox>
- #include <QPushButton>
- 
--- 
-2.17.0
-
diff --git a/sci-astronomy/kstars/kstars-2.9.5.ebuild b/sci-astronomy/kstars/kstars-2.9.5.ebuild
deleted file mode 100644
index 5bc717c962f0..000000000000
--- a/sci-astronomy/kstars/kstars-2.9.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Desktop Planetarium"
-HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-IUSE="fits indi raw wcs xplanet"
-
-REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
-
-# TODO: AstrometryNet requires new package
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	fits? ( sci-libs/cfitsio )
-	indi? ( >=sci-libs/indilib-1.4.0 )
-	raw? ( media-libs/libraw:= )
-	wcs? ( sci-astronomy/wcslib )
-	xplanet? ( x11-misc/xplanet )
-"
-# TODO: Add back when re-enabled by upstream
-# 	opengl? (
-# 		$(add_qt_dep qtopengl)
-# 		virtual/opengl
-# 	)
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	dev-cpp/eigen:3
-"
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-libraw-0.19.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package indi INDI)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package wcs WCSLIB)
-		$(cmake-utils_use_find_package xplanet Xplanet)
-	)
-
-	kde5_src_configure
-}
diff --git a/sci-astronomy/kstars/kstars-3.0.0.ebuild b/sci-astronomy/kstars/kstars-3.0.0.ebuild
index 6e6e693abac0..6fd64bafb989 100644
--- a/sci-astronomy/kstars/kstars-3.0.0.ebuild
+++ b/sci-astronomy/kstars/kstars-3.0.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Desktop Planetarium"
diff --git a/sci-astronomy/kstars/metadata.xml b/sci-astronomy/kstars/metadata.xml
index 0b308e6b13c3..5dba7fdb56aa 100644
--- a/sci-astronomy/kstars/metadata.xml
+++ b/sci-astronomy/kstars/metadata.xml
@@ -10,6 +10,5 @@
 		<flag name="indi">Enable support for Astronomical control library using libindi</flag>
 		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
 		<flag name="wcs">Enable support for World Coordinate System library using wcslib</flag>
-		<flag name="xplanet">Enable support for Xplanet</flag>
 	</use>
 </pkgmetadata>