[gentoo-commits] proj/kde:master commit in: kde-apps/kstars/files/, kde-apps/kstars/

[Michael Palimaka]

commit:     146f785c1201511e349861f0dc6bf0a95a9cb818
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Dec  1 21:18:43 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 13:17:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=146f785c

kde-apps/kstars: Fix DEPENDs, force handbook optional, Qt5OpenGL optional

Package-Manager: portage-2.2.26

 .../files/kstars-15.08.3-qtopengl-optional.patch   | 20 +++++++++++++
 ...ars-15.08.3.ebuild => kstars-15.08.3-r1.ebuild} | 33 ++++++++++++--------
 kde-apps/kstars/kstars-15.12.49.9999.ebuild        | 30 +++++++++++--------
 kde-apps/kstars/kstars-9999.ebuild                 | 35 ++++++++++++++--------
 4 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/kde-apps/kstars/files/kstars-15.08.3-qtopengl-optional.patch b/kde-apps/kstars/files/kstars-15.08.3-qtopengl-optional.patch
new file mode 100644
index 0000000..f006950
--- /dev/null
+++ b/kde-apps/kstars/files/kstars-15.08.3-qtopengl-optional.patch
@@ -0,0 +1,20 @@
+commit 3f34fb893070a66995b407b4c6cf71c3598eefd8
+Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
+Date:   Tue Dec 1 21:51:00 2015 +0100
+
+    Make Qt5OpenGL optional, currently it isn't even in use
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e0187bb..3a241df 100644
+--- 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 ${QT_MIN_VERSION} REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg PrintSupport Multimedia)
++find_package(Qt5OpenGL ${QT_MIN_VERSION} COMPONENTS)
+ include(KDEInstallDirs)
+ include(KDECompilerSettings)
+ include(KDECMakeSettings)

diff --git a/kde-apps/kstars/kstars-15.08.3.ebuild b/kde-apps/kstars/kstars-15.08.3-r1.ebuild
similarity index 72%
rename from kde-apps/kstars/kstars-15.08.3.ebuild
rename to kde-apps/kstars/kstars-15.08.3-r1.ebuild
index 028afb9..b03c752 100644
--- a/kde-apps/kstars/kstars-15.08.3.ebuild
+++ b/kde-apps/kstars/kstars-15.08.3-r1.ebuild
@@ -4,21 +4,22 @@
 
 EAPI=5
 
-KDE_HANDBOOK="true"
+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="fits indi wcs xplanet"
-
-REQUIRED_USE="indi? ( fits )"
+IUSE="indi wcs xplanet"
 
 # TODO: AstrometryNet requires new package
 # FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -30,15 +31,12 @@ DEPEND="
 	$(add_frameworks_dep kplotting)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	dev-cpp/eigen:3
+	dev-qt/qtdbus:5
 	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
@@ -49,13 +47,22 @@ DEPEND="
 	wcs? ( sci-astronomy/wcslib )
 	xplanet? ( x11-misc/xplanet )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 "
 
-# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
-# Inspiration from https://git.reviewboard.kde.org/r/110787/
-PATCHES=( "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch" )
+src_prepare() {
+	# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
+	# Inspiration from https://git.reviewboard.kde.org/r/110787/
+	epatch "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch"
+
+	epatch "${FILESDIR}/${PN}-15.08.3-qtopengl-optional.patch"
+
+	kde5_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/kstars/kstars-15.12.49.9999.ebuild b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
index 080ea8d..58926c4 100644
--- a/kde-apps/kstars/kstars-15.12.49.9999.ebuild
+++ b/kde-apps/kstars/kstars-15.12.49.9999.ebuild
@@ -4,21 +4,22 @@
 
 EAPI=5
 
-KDE_HANDBOOK="true"
+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=""
-IUSE="fits indi wcs xplanet"
-
-REQUIRED_USE="indi? ( fits )"
+IUSE="indi wcs xplanet"
 
 # TODO: AstrometryNet requires new package
 # FIXME: doesn't build without sci-libs/cfitsio as of 15.04.0
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -27,18 +28,16 @@ DEPEND="
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kplotting)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	dev-cpp/eigen:3
+	dev-qt/qtdbus:5
 	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
@@ -49,13 +48,18 @@ DEPEND="
 	wcs? ( sci-astronomy/wcslib )
 	xplanet? ( x11-misc/xplanet )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 "
 
-# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
-# Inspiration from https://git.reviewboard.kde.org/r/110787/
-PATCHES=( "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch" )
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-15.08.3-qtopengl-optional.patch"
+
+	kde5_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(

diff --git a/kde-apps/kstars/kstars-9999.ebuild b/kde-apps/kstars/kstars-9999.ebuild
index 080ea8d..b3ee255 100644
--- a/kde-apps/kstars/kstars-9999.ebuild
+++ b/kde-apps/kstars/kstars-9999.ebuild
@@ -4,21 +4,22 @@
 
 EAPI=5
 
-KDE_HANDBOOK="true"
+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=""
-IUSE="fits indi wcs xplanet"
-
-REQUIRED_USE="indi? ( fits )"
+IUSE="indi wcs xplanet"
 
 # 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 kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
@@ -27,35 +28,43 @@ DEPEND="
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kplotting)
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	dev-cpp/eigen:3
+	dev-qt/qtdbus:5
 	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 )
+	indi? ( >=sci-libs/indilib-1.1.0 )
 	wcs? ( sci-astronomy/wcslib )
 	xplanet? ( x11-misc/xplanet )
 "
-RDEPEND="${DEPEND}
+# TODO: Add back when re-enabled by upstream
+# 	opengl? (
+# 		dev-qt/qtopengl:5
+# 		virtual/opengl
+# 	)
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+"
+RDEPEND="${COMMON_DEPEND}
 	${PYTHON_DEPS}
 "
 
-# Regression from commit e9f1b544eda238c068fbbbbf612f291c734ea5aa
-# Inspiration from https://git.reviewboard.kde.org/r/110787/
-PATCHES=( "${FILESDIR}/${PN}-15.04.0-use-python2-explicitly.patch" )
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-15.08.3-qtopengl-optional.patch"
+
+	kde5_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(