commit: 2fc674d0a7b02a43691657cd0542b56f51107a8c
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Apr 23 00:40:49 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 20:16:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2fc674d0
[kde-apps/kstars] Frameworks merged to master
Package-Manager: portage-2.2.18
.../kstars-15.04.0-use-python2-explicitly.patch | 11 ++++
kde-apps/kstars/kstars-9999.ebuild | 61 +++++++++++++++++-----
kde-apps/kstars/metadata.xml | 2 +
3 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/kde-apps/kstars/files/kstars-15.04.0-use-python2-explicitly.patch
b/kde-apps/kstars/files/kstars-15.04.0-use-python2-explicitly.patch
new file mode 100644
index 0000000..5dce23c
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.04.0-use-python2-explicitly.patch
@@ -0,0 +1,11 @@
+--- kstars/skycomponents/supernovaecomponent.cpp 2015-04-23
15:10:15.927651208 +0200
++++ kstars/skycomponents/supernovaecomponent.cpp.new 2015-04-23
15:11:03.107647326 +0200
+@@ -233,7 +233,7 @@
+ //qDebug()<<filename;
+ m_Parser = new QProcess;
+ connect( m_Parser, SIGNAL( finished( int, QProcess::ExitStatus ) ), this,
SLOT( slotDataFileUpdateFinished( int, QProcess::ExitStatus ) ) );
+- m_Parser->start("python", args);
++ m_Parser->start("python2", args);
+ }
+
+ void SupernovaeComponent::slotDataFileUpdateFinished( int exitCode,
QProcess::ExitStatus exitStatus )
diff --git a/kde-apps/kstars/kstars-9999.ebuild
b/kde-apps/kstars/kstars-9999.ebuild
index 3176814..c9b6ba9 100644
--- a/kde-apps/kstars/kstars-9999.ebuild
+++ b/kde-apps/kstars/kstars-9999.ebuild
@@ -4,32 +4,65 @@
EAPI=5
-KDE_HANDBOOK="optional"
-inherit flag-o-matic kde4-base
+KDE_HANDBOOK="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
-DESCRIPTION="KDE Desktop Planetarium"
+DESCRIPTION="Desktop Planetarium"
HOMEPAGE="http://www.kde.org/applications/education/kstars
http://edu.kde.org/kstars";
KEYWORDS=""
-IUSE="debug fits indi"
+IUSE="fits indi wcs xplanet"
REQUIRED_USE="indi? ( fits )"
+# TODO: AstrometryNet requires new package
+# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kplotting)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
dev-cpp/eigen:3
- $(add_kdeapps_dep libkdeedu)
- fits? ( >=sci-libs/cfitsio-0.390 )
- indi? ( >=sci-libs/indilib-0.9.8 )
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ >=sci-libs/cfitsio-0.390
+ sys-libs/zlib
+ indi? ( >=sci-libs/indilib-1.0.0 )
+ wcs? ( sci-astronomy/wcslib )
+ xplanet? ( x11-misc/xplanet )
+"
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}
"
-RDEPEND="${DEPEND}"
-src_configure() {
- # Bug 308903
- use ppc64 && append-flags -mminimal-toc
+# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
+# Inspiration from https://git.reviewboard.kde.org/r/110787/
+PATCHES=( "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch" )
+src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_with fits CFitsio)
- $(cmake-utils_use_with indi)
+ $(cmake-utils_use_find_package indi)
+ $(cmake-utils_use_find_package wcs WCSLIB)
+ $(cmake-utils_use_find_package xplanet Xplanet)
)
- kde4-base_src_configure
+ kde5_src_configure
}
diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index 79595fb..730c4cb 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -4,6 +4,8 @@
<use>
<flag name="fits">Enable support for the FITS image format
through cfitsio</flag>
<flag name="indi">Enable support for Astronomical control
library using libindi</flag>
+ <flag name="wcs">Enable support for World Coordinate System
library using wcslib</flag>
+ <flag name="xplanet">Enable support for Xplanet</flag>
</use>
<herd>kde</herd>
</pkgmetadata>
