commit:     9b4e89b04949901853d0e7f34ac9962ccd4acc09
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 12 22:06:28 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 23:09:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b4e89b0

kde-apps/kstars: Add USE=fits,raw and fix DEPENDs

Package-Manager: portage-2.3.0

 kde-apps/kstars/kstars-16.08.49.9999.ebuild | 6 +++---
 kde-apps/kstars/kstars-9999.ebuild          | 9 ++++++---
 kde-apps/kstars/metadata.xml                | 9 +++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/kde-apps/kstars/kstars-16.08.49.9999.ebuild 
b/kde-apps/kstars/kstars-16.08.49.9999.ebuild
index 75897cc..80bb85b 100644
--- a/kde-apps/kstars/kstars-16.08.49.9999.ebuild
+++ b/kde-apps/kstars/kstars-16.08.49.9999.ebuild
@@ -11,10 +11,9 @@ inherit kde5 python-single-r1
 DESCRIPTION="Desktop Planetarium"
 HOMEPAGE="https://www.kde.org/applications/education/kstars 
https://edu.kde.org/kstars";
 KEYWORDS=""
-IUSE="indi wcs xplanet"
+IUSE="fits indi wcs xplanet"
 
 # TODO: AstrometryNet requires new package
-# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
 COMMON_DEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kconfigwidgets)
@@ -34,8 +33,8 @@ COMMON_DEPEND="
        $(add_qt_dep qtsvg)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtxml)
-       >=sci-libs/cfitsio-0.390
        sys-libs/zlib
+       fits? ( sci-libs/cfitsio )
        indi? (
                $(add_frameworks_dep knotifications)
                >=sci-libs/indilib-1.2.0
@@ -57,6 +56,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
        local mycmakeargs=(
+               $(cmake-utils_use_find_package fits CFitsio)
                $(cmake-utils_use_find_package indi INDI)
                $(cmake-utils_use_find_package wcs WCSLIB)
                $(cmake-utils_use_find_package xplanet Xplanet)

diff --git a/kde-apps/kstars/kstars-9999.ebuild 
b/kde-apps/kstars/kstars-9999.ebuild
index 75897cc..a543bc2 100644
--- a/kde-apps/kstars/kstars-9999.ebuild
+++ b/kde-apps/kstars/kstars-9999.ebuild
@@ -11,10 +11,9 @@ inherit kde5 python-single-r1
 DESCRIPTION="Desktop Planetarium"
 HOMEPAGE="https://www.kde.org/applications/education/kstars 
https://edu.kde.org/kstars";
 KEYWORDS=""
-IUSE="indi wcs xplanet"
+IUSE="fits indi raw wcs xplanet"
 
 # TODO: AstrometryNet requires new package
-# FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
 COMMON_DEPEND="
        $(add_frameworks_dep kconfig)
        $(add_frameworks_dep kconfigwidgets)
@@ -27,6 +26,7 @@ COMMON_DEPEND="
        $(add_frameworks_dep kplotting)
        $(add_frameworks_dep kwidgetsaddons)
        $(add_frameworks_dep kxmlgui)
+       $(add_qt_dep qtconcurrent)
        $(add_qt_dep qtdbus)
        $(add_qt_dep qtgui)
        $(add_qt_dep qtprintsupport)
@@ -34,12 +34,13 @@ COMMON_DEPEND="
        $(add_qt_dep qtsvg)
        $(add_qt_dep qtwidgets)
        $(add_qt_dep qtxml)
-       >=sci-libs/cfitsio-0.390
        sys-libs/zlib
+       fits? ( sci-libs/cfitsio )
        indi? (
                $(add_frameworks_dep knotifications)
                >=sci-libs/indilib-1.2.0
        )
+       raw? ( media-libs/libraw )
        wcs? ( sci-astronomy/wcslib )
        xplanet? ( x11-misc/xplanet )
 "
@@ -57,7 +58,9 @@ RDEPEND="${COMMON_DEPEND}
 
 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)
        )

diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index e237f3a..2102d7a 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
        <use>
+               <flag name="fits">Enable support for NASA's 
<pkg>sci-libs/cfitsio</pkg> library</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>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo KDE Project</name>
-       </maintainer>
 </pkgmetadata>

Reply via email to