kde-apps: Move kdeedu-meta 15.12.3 from kde overlay

Package-Manager: portage-2.2.27

5 files changed, 213 insertions, 4 deletions

diff --git a/kde-apps/kstars/Manifest b/kde-apps/kstars/Manifest
index e26ec233ba61..b4906450566d 100644
--- a/kde-apps/kstars/Manifest
+++ b/kde-apps/kstars/Manifest
@@ -1 +1,2 @@
+DIST kstars-15.12.3.tar.xz 17064136 SHA256 b944eb9799250596990e5a0e3fcefe4c466f987980404bae09bb37fed70e43cd SHA512 a10326777fb4dc8565b4f1ae68cfe6c8f20b74e392eaabb72c67cc8afa8318e96de8a6685f04727e5d9db6d2dee9e35024a7d09e9ec7190192b035a1e0c406d6 WHIRLPOOL 71782f04b53dd0590b141f620b9c84d611fcf921ad9a37168c129722d8bc707ebe280d64b7184123a4e169eff2bbdb0c9f2195f9588ad12d119a1313fa1c8012
 DIST kstars-4.14.3.tar.xz 12374500 SHA256 771c46e8985724d7f5be74f4813bfba0a62cbb48e1c8d0cd27394a6f0ef15bde SHA512 c843506ae0d85e03b9ac3b11be73f35b66f9fc64adddf7a4643cb397fc59628920254aa056d7bf968b54893ce035d40d0c17a7d0fc576d3dae5799fd0f16ec3e WHIRLPOOL 752f69a01d8344aed4c276bb4920c6791bf223aac8c8adfb0ab9833425b625793978316033a1cfba5ae43d221896a9c93a4e5b43f19a42730cbe7fc282318a0a
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
new file mode 100644
index 000000000000..0623845a20f1
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-kf5-deps.patch
@@ -0,0 +1,79 @@
+From: Akarsh Simha <akarsh@kde.org>
+Date: Thu, 31 Dec 2015 10:40:37 +0000
+Subject: [NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=14ca537e2676267bed73a40f0b8efd94d7cbc761
+---
+[NEEDS TESTING] Remove "fake" KF5 dependencies from CMakeLists.txt
+
+Removed the following KF5 frameworks: JobWidgets, DBusAddons, TextEditor
+
+Moved the Notifications KF5 framework as required only if INDI is
+present.
+
+Builds both with and without INDI (but not in a completely thorough
+test) on my setup (ArchLinux)
+
+Jasem: please double check that it builds correctly for you too
+with/without INDI.
+
+CCMAIL: mutlaqja@ikarustech.com
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,16 +32,13 @@
+   GuiAddons
+   WidgetsAddons
+   NewStuff
+-  DBusAddons
++#  DBusAddons
+   I18n
+   Init
+-  JobWidgets
+   KIO
+   XmlGui
+   Plotting
+-  TextEditor
+   IconThemes
+-  Notifications
+ )
+ 
+ find_package(Eigen3 REQUIRED)
+@@ -61,6 +58,8 @@
+ find_package(INDI 1.2.0)
+ #FIXME is there a better way to do this?
+ if (INDI_FOUND)
++#FIXME is the following the right way of doing this?
++find_package(KF5 REQUIRED COMPONENTS Notifications)
+ SET(HAVE_INDI 1)
+ else(INDI_FOUND)
+ SET(HAVE_INDI 0)
+
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -541,10 +541,9 @@
+         KF5::KIOFileWidgets
+         KF5::WidgetsAddons
+         KF5::Plotting
+-        KF5::TextEditor
+-        KF5::DBusAddons
++#        KF5::TextEditor
++#        KF5::DBusAddons
+         KF5::IconThemes
+-        KF5::Notifications
+         Qt5::Gui
+         Qt5::PrintSupport
+         Qt5::Sql
+@@ -561,7 +560,9 @@
+   target_link_libraries(KStarsLib ${CFITSIO_LIBRARIES})
+ endif (CFITSIO_FOUND)
+ if (INDI_FOUND)
+-  target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT} ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES} z)
++  target_link_libraries(KStarsLib ${CMAKE_THREAD_LIBS_INIT}
++  ${INDI_LIBRARIES} ${INDI_CLIENT_LIBRARIES}
++  KF5::Notifications z)
+ endif (INDI_FOUND)
+ if (WCSLIB_FOUND)
+     target_link_libraries(KStarsLib ${WCSLIB_LIBRARIES})
+
diff --git a/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
new file mode 100644
index 000000000000..f819ec40decc
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.12.0-unused-qt-deps.patch
@@ -0,0 +1,60 @@
+From: Jasem Mutlaq <mutlaqja@ikarustech.com>
+Date: Wed, 30 Dec 2015 17:02:20 +0000
+Subject: Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+X-Git-Url: http://quickgit.kde.org/?p=kstars.git&a=commitdiff&h=2f09f40aca053048ffb65621e3c18780cdc5cbe3
+---
+Removing unncessary dependencies on Qt modules for Test OpenGL QML QtQuick QtMultimedia. We should re-enable QML/QtQuick if someone manager to migrate what is interesting tonight tool
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,8 @@
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+ 
+-find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg OpenGL PrintSupport Multimedia Test)
++#find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg PrintSupport)
++find_package(Qt5 5.2 REQUIRED COMPONENTS Gui Xml Sql Svg PrintSupport)
+ include(KDEInstallDirs)
+ include(KDECompilerSettings)
+ include(KDECMakeSettings)
+--- a/kstars/CMakeLists.txt
++++ b/kstars/CMakeLists.txt
+@@ -549,9 +549,8 @@
+         Qt5::PrintSupport
+         Qt5::Sql
+         Qt5::Svg
+-        Qt5::Multimedia
+-        Qt5::Qml
+-        Qt5::Quick
++        #Qt5::Qml
++        #Qt5::Quick
+ 	${ZLIB_LIBRARIES}
+         )
+ 
+--- a/kstars/kstars.cpp
++++ b/kstars/kstars.cpp
+@@ -39,7 +39,7 @@
+ #include "dialogs/finddialog.h"
+ #include "dialogs/exportimagedialog.h"
+ #include "observinglist.h"
+-#include "whatsinteresting/wiview.h"
++//#include "whatsinteresting/wiview.h"
+ 
+ #include "kstarsadaptor.h"
+ 
+--- a/kstars/kstarsactions.cpp
++++ b/kstars/kstarsactions.cpp
+@@ -30,8 +30,8 @@
+ #include <QDockWidget>
+ #include <QPointer>
+ #include <QInputDialog>
+-#include <QQuickWindow>
+-#include <QQuickView>
++//#include <QQuickWindow>
++//#include <QQuickView>
+ #include <QDebug>
+ #include <QAction>
+ #include <QFileDialog>
+
diff --git a/kde-apps/kstars/kstars-15.12.3.ebuild b/kde-apps/kstars/kstars-15.12.3.ebuild
new file mode 100644
index 000000000000..7e30f61935c9
--- /dev/null
+++ b/kde-apps/kstars/kstars-15.12.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_PUNT_BOGUS_DEPS="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 python-single-r1
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
+KEYWORDS=" ~amd64 ~x86"
+IUSE="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)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=sci-libs/cfitsio-0.390
+	sys-libs/zlib
+	indi? (
+		$(add_frameworks_dep knotifications)
+		>=sci-libs/indilib-1.0.0
+	)
+	wcs? ( sci-astronomy/wcslib )
+	xplanet? ( x11-misc/xplanet )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-15.12.0-unused-qt-deps.patch"
+	"${FILESDIR}/${PN}-15.12.0-unused-kf5-deps.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package indi INDI)
+		$(cmake-utils_use_find_package wcs WCSLIB)
+		$(cmake-utils_use_find_package xplanet Xplanet)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kstars/metadata.xml b/kde-apps/kstars/metadata.xml
index a724068e692a..90df4e902dac 100644
--- a/kde-apps/kstars/metadata.xml
+++ b/kde-apps/kstars/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
-	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<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>
 </pkgmetadata>