[gentoo-commits] repo/gentoo:master commit in: app-office/skrooge/files/, app-office/skrooge/

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

commit:     c05153d361569c5892e0f90e5e3f9cf5b6ba5e7d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 18:37:02 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 18:38:50 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05153d3

app-office/skrooge: Version bump 2.3.0

Thanks to Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>.

Package-Manager: portage-2.2.28

 app-office/skrooge/Manifest                        |  2 +-
 .../skrooge/files/skrooge-2.3.0-glibc-2.23.patch   | 74 ++++++++++++++++++++++
 .../{skrooge-2.2.0.ebuild => skrooge-2.3.0.ebuild} | 30 +++++----
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index e2b5bfc..507ff24 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,2 @@
 DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
-DIST skrooge-2.2.0.tar.xz 16936804 SHA256 c711a63cff0874fdb0c9a1be954d6013dc77cafc30e779252fc50533ebae7eef SHA512 cf341b7d1e2302fbf8da569da42d9f26e0e5c8ce492ba41ffda27593a235d3e15037af9683b506450ebab12ab3129f83ddb4ac58d69b295e54ccb5eada3dfb1b WHIRLPOOL 881dfb2d7a987f51cd7d0819807de6380793f06a2a20e64da3e4e667410bde10c6d25fe53360d13fe03b297b30015dd2ac868af00a8132ed044c283a4a4566e2
+DIST skrooge-2.3.0.tar.xz 17533492 SHA256 76f57e2cede320848f1f1bef41b3be128aec9d59a8e643701b30bcae61f8a11a SHA512 b4ccd3b21852e726a4872b1df76e2a65f031b55dfc4adc7d9dddeb9a26a9b9c61a9a42c94004de2e159646c900a9d343a5b891053d6566f5572f40a18bfd51e3 WHIRLPOOL 3f6d5337af0d7d721cb0e050b1eda7da99e43a5ee0e07db815ce0bd384a98694601ee58f4becfddcbb85d636f1ba47178632c5bbc28ef0b65f3e482049cc6d1c

diff --git a/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
new file mode 100644
index 0000000..3df4428
--- /dev/null
+++ b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
@@ -0,0 +1,74 @@
+From: Stephane Mankowski <stephane@mankowski.fr>
+Date: Wed, 24 Feb 2016 14:07:00 +0000
+Subject: Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+X-Git-Url: http://quickgit.kde.org/?p=skrooge.git&a=commitdiff&h=dacb104d4c803679be744c198c70a871c2078dd0
+---
+Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+BUG:359679
+---
+
+
+--- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
++++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
+@@ -27,7 +27,6 @@
+ 
+ #include <qdom.h>
+ #include <qfileinfo.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -36,11 +35,6 @@
+ #include "skgobjectbase.h"
+ #include "skgpayeeobject.h"
+ #include "skgimportexportmanager.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ /**
+  * This plugin factory.
+@@ -386,7 +380,7 @@
+                                         }
+                                     }
+ 
+-                                    if (!isnan(info.value)) {
++                                    if (!std::isnan(info.value)) {
+                                         QChar accountType = mapIdType[info.account.text()];
+                                         if (accountType == 'C') {
+                                             suboperationsList.push_front(info);
+
+--- a/skgbasemodeler/skgdocument.cpp
++++ b/skgbasemodeler/skgdocument.cpp
+@@ -42,7 +42,6 @@
+ #include <qurl.h>
+ 
+ #include <sqlite3.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -51,11 +50,6 @@
+ #include "skgpropertyobject.h"
+ #include "skgtransactionmng.h"
+ #include "skgreport.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ #ifdef SKGCIPHER
+ #define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
+@@ -2693,7 +2687,7 @@
+     if (iValue > 0) {
+         p = '+' % p;
+     }
+-    if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
++    if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
+         p = QChar(8734);
+     }
+     return "<font color=\"" %
+

diff --git a/app-office/skrooge/skrooge-2.2.0.ebuild b/app-office/skrooge/skrooge-2.3.0.ebuild
similarity index 83%
rename from app-office/skrooge/skrooge-2.2.0.ebuild
rename to app-office/skrooge/skrooge-2.3.0.ebuild
index cfdb65f..a8f6c71 100644
--- a/app-office/skrooge/skrooge-2.2.0.ebuild
+++ b/app-office/skrooge/skrooge-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_GCC_MINIMAL="4.9"
 KDE_HANDBOOK="forceoptional"
@@ -40,19 +40,19 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5]
 	dev-libs/grantlee:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
 	activities? ( $(add_frameworks_dep kactivities) )
 	crypt? ( dev-db/sqlcipher )
 	!crypt? ( dev-db/sqlite:3 )
@@ -63,8 +63,8 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep designer)
 	dev-libs/libxslt
-	dev-qt/designer:5
 	virtual/pkgconfig
 	x11-misc/shared-mime-info
 "
@@ -77,6 +77,8 @@ RESTRICT="test"
 
 DOCS=( AUTHORS CHANGELOG README TODO )
 
+PATCHES=( "${FILESDIR}/${P}-glibc-2.23.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)