[gentoo-commits] proj/kde:master commit in: kde-apps/kalzium/

["Johannes Huber" <johu@gentoo.org>]

commit:     6211876af04121597fbc222dbe8ed5f7f6a16c68
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 16:55:08 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 16:55:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6211876a

kde-apps/kalzium: Franeworks merged to master

Package-Manager: portage-2.3.2

 kde-apps/kalzium/kalzium-5.9999.ebuild | 67 ----------------------------------
 kde-apps/kalzium/kalzium-9999.ebuild   | 49 ++++++++++++++++++-------
 2 files changed, 35 insertions(+), 81 deletions(-)

diff --git a/kde-apps/kalzium/kalzium-5.9999.ebuild b/kde-apps/kalzium/kalzium-5.9999.ebuild
deleted file mode 100644
index 2e727fc..0000000
--- a/kde-apps/kalzium/kalzium-5.9999.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-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=""
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		dev-cpp/eigen:3
-		sci-chemistry/avogadro
-		sci-chemistry/openbabel
-	)
-	solver? ( dev-ml/facile[ocamlopt] )
-"
-RDEPEND="${DEPEND}
-	sci-chemistry/chemical-mime-data
-"
-
-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
-}

diff --git a/kde-apps/kalzium/kalzium-9999.ebuild b/kde-apps/kalzium/kalzium-9999.ebuild
index 36f488c..0974434 100644
--- a/kde-apps/kalzium/kalzium-9999.ebuild
+++ b/kde-apps/kalzium/kalzium-9999.ebuild
@@ -4,23 +4,45 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="always"
-inherit kde4-base flag-o-matic
+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=""
-IUSE="debug editor +plasma solver"
+IUSE="editor solver"
 
 DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkdegames)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtopengl)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	editor? (
 		dev-cpp/eigen:3
 		sci-chemistry/avogadro
-		>=sci-chemistry/openbabel-2.2
-		dev-qt/qtopengl:4
+		sci-chemistry/openbabel
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
 "
@@ -33,13 +55,12 @@ src_configure(){
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
 	local mycmakeargs=(
-		-DBUILD_plasmoid=$(usex plasma)
-		-DWITH_Eigen3=$(usex editor)
-		-DWITH_Avogadro=$(usex editor)
-		-DWITH_OpenBabel2=$(usex editor)
-		-DWITH_OCaml=$(usex solver)
-		-DWITH_Libfacile=$(usex solver)
+		$(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)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }