[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/

2018-01-16 Thread Andreas Sturmlechner 
commit: 4d0cc4250a72534366ba3e1fbcf2563f163b0f42
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 12:00:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 13:04:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0cc425

kde-apps/kalzium: Fix optional and missing DEPEND

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/kalzium-17.12.1-knewstuff-optional.patch | 58 
 kde-apps/kalzium/kalzium-17.12.1-r1.ebuild | 61 ++
 2 files changed, 119 insertions(+)

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 000..e60a6594a34
--- /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 
+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 000..b9e5af80eee
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kalzium/, kde-apps/kalzium/files/

2017-02-11 Thread Andreas Sturmlechner 
commit: 59928015ddc7ccbed718344e823fb342a62893bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 12 02:28:32 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 12 02:28:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59928015

kde-apps/kalzium: Fix build with KF-5.31

Package-Manager: portage-2.3.3

 .../kalzium/files/kalzium-16.12.2-kf-5.31.patch| 152 +
 kde-apps/kalzium/kalzium-16.12.2.ebuild|   2 +
 2 files changed, 154 insertions(+)

diff --git a/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch 
b/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch
new file mode 100644
index 00..05c912c946
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch
@@ -0,0 +1,152 @@
+From f233d458959548ab371e3faeca7313f746625afc Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Sun, 22 Jan 2017 14:46:24 +0100
+Subject: Fix build with extra-cmake-modules > 5.30
+
+Since a5f3a76e14799c68b5e8f74e375baa5f6f6ab4dc in
+extra-cmake-modules.git -fno-operator-names is passed to the build
+(when supported), causing a build error for kalzium.
+
+REVIEW: 129873
+---
+ src/calculator/titrationCalculator.cpp | 39 +++---
+ 1 file changed, 17 insertions(+), 22 deletions(-)
+
+diff --git a/src/calculator/titrationCalculator.cpp 
b/src/calculator/titrationCalculator.cpp
+index 44ea152..6ea9ac9 100644
+--- a/src/calculator/titrationCalculator.cpp
 b/src/calculator/titrationCalculator.cpp
+@@ -41,11 +41,6 @@
+ 
+ using namespace std;
+ 
+-#ifdef _MSC_VER
+-#define and &&
+-#define or ||
+-#endif
+-
+ titrationCalculator::titrationCalculator(QWidget * parent) : QWidget(parent)
+ {
+ xmin = 0;
+@@ -112,7 +107,7 @@ void titrationCalculator::plot()
+ }
+ QString mreporto;
+ int iter = 0;
+-if (uid.xaxis->text() == "" or uid.xaxis->text() == " ") {
++if (uid.xaxis->text() == "" || uid.xaxis->text() == " ") {
+ uid.xaxis->setText(i18n("nothing"));
+ }
+ if (tmpy == 0) {
+@@ -121,11 +116,11 @@ void titrationCalculator::plot()
+ //now we have to solve the system of equations NOTE:yvalue 
contains the equation of Y-axis variable
+ //we iterates the process until you have an equation in one only 
unknown variable or a numeric expression
+ mreporto = solve(yvalue);
+-while (end == 0 or lettere == 1) {
++while (end == 0 || lettere == 1) {
+ QByteArray ba = mreporto.toLatin1();
+ char *tmreport = ba.data();
+ ++iter;
+-if (end == 1 or lettere == 0) {
++if (end == 1 || lettere == 0) {
+ break;
+ }
+ if (iter > 100) {
+@@ -273,13 +268,13 @@ QString titrationCalculator::solve(char *yvalue)
+ QString tempyval;
+ QString ptem;
+ for (int i = 0; strlen(yvalue) + 1; ++i) {
+-if (!(yvalue[i]=='q' or yvalue[i]=='w' or yvalue[i]=='e' or 
yvalue[i]=='r' or yvalue[i]=='t' or yvalue[i]=='y' or yvalue[i]=='u' or 
yvalue[i]=='i' or yvalue[i]=='o' or yvalue[i]=='p' or yvalue[i]=='a' or 
yvalue[i]=='s' or yvalue[i]=='d' or yvalue[i]=='f' or yvalue[i]=='g' or 
yvalue[i]=='h' or yvalue[i]=='j' or yvalue[i]=='k' or yvalue[i]=='l' or 
yvalue[i]=='z' or yvalue[i]=='x' or yvalue[i]=='c' or yvalue[i]=='v' or 
yvalue[i]=='b' or yvalue[i]=='n' or yvalue[i]=='m' or yvalue[i]=='+' or 
yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or 
yvalue[i]=='(' or yvalue[i]==')' or yvalue[i]=='Q' or yvalue[i]=='W' or 
yvalue[i]=='E' or yvalue[i]=='R' or yvalue[i]=='T' or yvalue[i]=='Y' or 
yvalue[i]=='U' or yvalue[i]=='I' or yvalue[i]=='O' or yvalue[i]=='P' or 
yvalue[i]=='A' or yvalue[i]=='S' or yvalue[i]=='D' or yvalue[i]=='F' or 
yvalue[i]=='G' or yvalue[i]=='H' or yvalue[i]=='J' or yvalue[i]=='K' or 
yvalue[i]=='L' or yvalue[i]=='Z' or yvalue[i]=='X' or yvalue[i]=
 ='C' or yvalue[i]=='V' or yvalue[i]=='B' or yvalue[i]=='N' or yvalue[i]=='M' 
or yvalue[i]=='1' or yvalue[i]=='2' or yvalue[i]=='3' or yvalue[i]=='4' or 
yvalue[i]=='5' or yvalue[i]=='6' or yvalue[i]=='7' or yvalue[i]=='8' or 
yvalue[i]=='9' or yvalue[i]=='0' or yvalue[i]=='.' or yvalue[i]==',')) {
++if (!(yvalue[i]=='q' || yvalue[i]=='w' || yvalue[i]=='e' || 
yvalue[i]=='r' || yvalue[i]=='t' || yvalue[i]=='y' || yvalue[i]=='u' || 
yvalue[i]=='i' || yvalue[i]=='o' || yvalue[i]=='p' || yvalue[i]=='a' || 
yvalue[i]=='s' || yvalue[i]=='d' || yvalue[i]=='f' || yvalue[i]=='g' || 
yvalue[i]=='h' || yvalue[i]=='j' || yvalue[i]=='k' || yvalue[i]=='l' || 
yvalue[i]=='z' || yvalue[i]=='x' || yvalue[i]=='c' || yvalue[i]=='v' || 
yvalue[i]=='b' || yvalue[i]=='n' || yvalue[i]=='m' || yvalue[i]=='+' || 
yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || 
yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='Q' ||