diff options
author | Johannes Huber <johu@gentoo.org> | 2017-03-09 21:37:09 +0100 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2017-03-09 21:37:09 +0100 |
commit | c3bb6e84f7a81bdfd4af5cd6d7019b50e2c33377 (patch) | |
tree | d96515b8779bb09a6101b113e11693fbb31ecb34 /kde-apps/kalzium | |
parent | dev-python/blessings: add missing setuptools DEPEND (diff) | |
download | gentoo-c3bb6e84f7a81bdfd4af5cd6d7019b50e2c33377.tar.gz gentoo-c3bb6e84f7a81bdfd4af5cd6d7019b50e2c33377.tar.bz2 gentoo-c3bb6e84f7a81bdfd4af5cd6d7019b50e2c33377.zip |
kde-apps: Remove KDE Applications 16.12.2
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Diffstat (limited to 'kde-apps/kalzium')
-rw-r--r-- | kde-apps/kalzium/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch | 152 | ||||
-rw-r--r-- | kde-apps/kalzium/kalzium-16.12.2.ebuild | 61 |
3 files changed, 0 insertions, 214 deletions
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest index 9af93d289e21..7f9feb8e223f 100644 --- a/kde-apps/kalzium/Manifest +++ b/kde-apps/kalzium/Manifest @@ -1,3 +1,2 @@ DIST kalzium-16.08.3.tar.xz 3944812 SHA256 d7eeaba3b856eb91da15950129a45a8fd2bd0885cb4bf2fe66897a5c33b090fb SHA512 7704961e700ad4b8f3a490c596eef78c41e8976e49517789d6369c9dc4b46a496e2eb8d1781a870bf6aae2a0426061f32e1267252fd87d24cb45dd45133bae25 WHIRLPOOL 6096505d67fcd57cd5225bc3322a1f58c9a2ccfd3f32c48bba6c74c587ac84e38664057b149cd5438df9052822c036c92628551d361ea575f68dc1a548b1dc5e -DIST kalzium-16.12.2.tar.xz 4589232 SHA256 50d7f97edc89544801b75140b08001a51d6f0844d046e08d9ae2f16528ce7710 SHA512 9838176c43e818c6b91b1bef2cb05a3a39a4c5e9923e0ff834647b7485a7bbb57678b85f628691955cac79e1bff473adbf59339c219ceb0b452d162f5bbd2b4a WHIRLPOOL cf940da475c0e289d2f6c7c1a12922bf0afb495c33d00cc6a7600e100404ea3b07be936c6bfe77ef94a4af65e3af9401ef282c26d24ed617ee9c6df8ab097915 DIST kalzium-16.12.3.tar.xz 4589228 SHA256 11519ce92658aa09ef1d7fe84b6a60f3e4b9f2b64990ce1a03f9eeb01c968e66 SHA512 b5d062951d6fb60fcb5029fcf9d64fc492956d90fc76d0247202ea332d3b58c02d161229e52482583f6b735f1bb4afbe0f89ec2465d8adbb9c67b2c49ebe1879 WHIRLPOOL 828f3f7b016149a17eec3a86e6c83bacdd28239412388d8209981d777f5526345c097e88d3c3371953e1a79c246a6ea97759b3a557739cb5733afd02243d2d80 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 deleted file mode 100644 index 05c912c946ac..000000000000 --- a/kde-apps/kalzium/files/kalzium-16.12.2-kf-5.31.patch +++ /dev/null @@ -1,152 +0,0 @@ -From f233d458959548ab371e3faeca7313f746625afc Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heirecka@exherbo.org> -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' || 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]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',')) { - break; //if current value is not a permitted value, this means that something is wrong - } -- 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]=='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]==',') { -+ 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]=='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]==',') { - lettere = 1; //if lettere == 0 then the equation contains only mnumbers - } -- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' 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]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') { - tempyval = tempyval + QString(yvalue[i]); - } else { - tempy = tempy + QString(yvalue[i]); -@@ -302,7 +297,7 @@ QString titrationCalculator::solve(char *yvalue) - end = 1; - } - if (tempy!=uid.xaxis->text()) { -- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' 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]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') { - //actually nothing - } else { - end = 0; -@@ -335,13 +330,13 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) { - QString tempyval; - tempy = ""; - 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' || 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]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',')) { - break; //if current value is not a permitted value, this means that something is wrong - } -- 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]=='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]==',') { -+ 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]=='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]==',') { - tempy = tempy + yvalue[i]; //if lettere == 0 then the equation contains only mnumbers - } -- if (yvalue[i]=='+' or yvalue[i]=='-' or yvalue[i]=='^' or yvalue[i]=='*' or yvalue[i]=='/' or yvalue[i]=='(' or yvalue[i]==')' 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]=='+' || yvalue[i]=='-' || yvalue[i]=='^' || yvalue[i]=='*' || yvalue[i]=='/' || yvalue[i]=='(' || yvalue[i]==')' || yvalue[i]=='1' || yvalue[i]=='2' || yvalue[i]=='3' || yvalue[i]=='4' || yvalue[i]=='5' || yvalue[i]=='6' || yvalue[i]=='7' || yvalue[i]=='8' || yvalue[i]=='9' || yvalue[i]=='0' || yvalue[i]=='.' || yvalue[i]==',') { - if (!tempyolda.isEmpty()) { - tempy = tempy + yvalue[i]; - if (tempyolda == uid.xaxis->text()) { -@@ -359,7 +354,7 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) { - tempyolda = tempyold; - } else { - tempyold = ""; -- if (((olda != 1) and (yvalue[i + 1] != '^')) or (yvalue[i] == '+' or yvalue[i] == '-' or yvalue[i] == '^' or yvalue[i] == '*' or yvalue[i] == '/' or yvalue[i] == '(' or yvalue[i] == ')')) { -+ if (((olda != 1) && (yvalue[i + 1] != '^')) || (yvalue[i] == '+' || yvalue[i] == '-' || yvalue[i] == '^' || yvalue[i] == '*' || yvalue[i] == '/' || yvalue[i] == '(' || yvalue[i] == ')')) { - tempyval = tempyval + QString(yvalue[i]); - } - } -@@ -374,7 +369,7 @@ QString titrationCalculator::solvex(char *yvalue, QString dnum) { - tempyold = ""; - olda = 1; - } -- if ((tempy==uid.xaxis->text()) and (!tempyolda.isEmpty())) { -+ if ((tempy==uid.xaxis->text()) && (!tempyolda.isEmpty())) { - if (yvalue[i + 1] != '^') { - tempyval = tempyval + dnum; - } -@@ -611,7 +606,7 @@ void titrationCalculator::on_actionOpen_triggered() - if (tmpchr != '|') { - tempyval = tempyval + tmpchr; - } else { -- if ((tablea == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) { -+ if ((tablea == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) { - if ((i % 2) != 0) { - QTableWidgetItem *titemo = uid.tableWidget->item((i - 1) / 2, 1); - if (titemo) { -@@ -626,7 +621,7 @@ void titrationCalculator::on_actionOpen_triggered() - ++i; - } - -- if ((tableb == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) { -+ if ((tableb == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) { - if ((i % 2) != 0) { - QTableWidgetItem *titemo = uid.tableWidget_2->item((i - 1) / 2, 1); - if (titemo) { -@@ -641,13 +636,13 @@ void titrationCalculator::on_actionOpen_triggered() - } - ++i; - } -- if ((xax == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) { -+ if ((xax == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) { - uid.xaxis->setText(tempyval); - } -- if ((yax == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) { -+ if ((yax == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) { - uid.yaxis->setText(tempyval); - } -- if ((notea == 1) and (tempyval != QString("table1")) and (tempyval != QString("table2")) and (tempyval != QString("xaxis")) and (tempyval != QString("yaxis")) and (tempyval != QString("note"))) { -+ if ((notea == 1) && (tempyval != QString("table1")) && (tempyval != QString("table2")) && (tempyval != QString("xaxis")) && (tempyval != QString("yaxis")) && (tempyval != QString("note"))) { - uid.note->setText(tempyval); - } - --- -cgit v0.11.2 - diff --git a/kde-apps/kalzium/kalzium-16.12.2.ebuild b/kde-apps/kalzium/kalzium-16.12.2.ebuild deleted file mode 100644 index a192923228bc..000000000000 --- a/kde-apps/kalzium/kalzium-16.12.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 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 ~arm ~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? ( - dev-cpp/eigen:3 - sci-chemistry/avogadro - sci-chemistry/openbabel - ) - solver? ( dev-ml/facile[ocamlopt] ) -" -RDEPEND="${DEPEND} - sci-chemistry/chemical-mime-data -" - -PATCHES=( "${FILESDIR}/${P}-kf-5.31.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 -} |