kde-apps/kalzium: Fix optional and missing DEPEND

Package-Manager: Portage-2.3.19, Repoman-2.3.6

2 files changed, 119 insertions, 0 deletions

diff --git a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
new file mode 100644
index 000000000000..e60a6594a34c
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
@@ -0,0 +1,58 @@
+From 4f7922a93bbea8582d29eebb194932708f9e21cd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 16 Jan 2018 12:53:56 +0100
+Subject: [PATCH] KF5NewStuff is only used in moleculeview, conditional on
+ Eigen3 and AvogadroLibs
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4309a683..a12d4e36 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     I18n
+     KDELibs4Support
+     KHtml
+-    NewStuff
+     Parts
+     Plotting
+     Solid
+@@ -93,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
+ endif(MSVC)
+ 
+ if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
++  find_package(KF5NewStuff REQUIRED)
+   # avoid compilerwarnings about redefinitions
+   # todo: use check_function_exits() ?
+   message(STATUS "Kalzium molecular editor enabled")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 623ba2e5..0b1936eb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -139,18 +139,17 @@ target_link_libraries(kalzium
+     KF5::Plotting
+     KF5::KHtml
+     KF5::KDELibs4Support
+-    KF5::NewStuff
+     KF5::UnitConversion
+     Qt5::Script
+     Qt5::Svg
+     Qt5::Quick
+     science
+-    ${OPENBABEL2_LIBRARIES}
+ )
+ if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
+       target_link_libraries(kalzium
++         KF5::NewStuff
+          Qt5::OpenGL
+          compoundviewer
+          AvogadroQtGui
+-- 
+2.15.1
+
diff --git a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..b9e5af80eeee
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		$(add_frameworks_dep knewstuff)
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${P}-knewstuff-optional.patch" )
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}