Backport patch from upstream to fix build with gmp-5.1.0 wrt bug #448842.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 126 insertions, 10 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 4c70e9a2b0af..dab988dc5be6 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/kmymoney
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.43 2012/11/14 20:00:20 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.44 2013/02/02 15:53:25 kensington Exp $
+
+*kmymoney-4.6.3-r1 (02 Feb 2013)
+
+  02 Feb 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kmymoney-4.6.3-gmp-5.1.0.patch, +kmymoney-4.6.3-r1.ebuild:
+  Backport patch from upstream to fix build with gmp-5.1.0 wrt bug #448842.
 
   14 Nov 2012; Johannes Huber <johu@gentoo.org>
   -files/kmymoney-4.6.1-qt48.patch,
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index c3ed5ab23c57..83adc9b824b8 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX kmymoney-4.6.2-gcc-4.7.patch 561 SHA256 652cd8ada83f9fdbce1809a27ac2b8bcfc4cd3807bcdf2137662b09527b9f780 SHA512 efdde69168abbb42adf041b5c9afa7ee217bdc73692532e57004e4ca4e427f59ab7dcdc9051515fb99c861e672b3b1e4ff7c6d1e707ce64d837b5dcff511f261 WHIRLPOOL b28ef04d51a2cac0086efc203bb1c056b297a695b51ba7d1128c26e70baf88fbf283b3bf0ceff71b920db52202e53f9b6ba9519ad43da80e7fe382c353e54b0f
+AUX kmymoney-4.6.3-gmp-5.1.0.patch 1101 SHA256 515dbbb70d07137886dd01f5522908858b09aaeedcb7c6bcdb07243d31797412 SHA512 262b4e8fe16f0bb8178ddeb297e20ea1416adfe131925735a98546c7088e77db6dbe11ca59ec9bb611142bc258d21305319e4bc95eece125cde40e0bb9336d24 WHIRLPOOL fb47ca60173c9af02ca4cb92b6c69154b06c7241da60084cb81c8b4e3a1447e9e972fb24095a72f06d1a3a479610dfb5e9a52ed9be50f398bf3a8309368a8f7d
 DIST kmymoney-4.6.3.tar.bz2 22114966 SHA256 94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e SHA512 4fc618718463a324c67abc4d8b43f682b364c63299aca25c6730c9a2f6a1affc1bec02b65352de1e6e5b58f06b66c600e96f1c20de126719d90c2a0b933fd00a WHIRLPOOL fd53a0dee4ccad438a3c15dee85aa9270b0806d39311045a1ca1e4f3cc1f969800e723a9aa780966c84c3a8f909a3d5e09e805deddfd548077f07fe1c7bdc015
+EBUILD kmymoney-4.6.3-r1.ebuild 1906 SHA256 809a3b5f43dcc0ce70bc3516e6b005b6d4b8d26b33b598604ecb58567b65f26b SHA512 fce1f9f29232fdc4be631082628eead32b55181fca2fff2f946d6f594182be00649a9794b7c008cf4818a071455da65d902568b78642a94422970a981660d0b9 WHIRLPOOL 514084134c969c572405dcb771db0eb0f8efe2626c28a5b1ef9310de3c32df2ca12f0468d8d05a6bd4cc0c9483f006e5e02082b9c4c3d5fe1348de9fc7fab948
 EBUILD kmymoney-4.6.3.ebuild 1898 SHA256 51dc0ef6a4ce212f1843c3c12310e458f70f7f51a8007ad4d698227c724089dc SHA512 9be19fa77e55fbfd3ec6ac0f293c6a9a16429b7c7033df7a3d63559aa9cfbdefb739a0ef88b661e918ff9f1d441709ed67723ff070a14e06edf3ec3f7e513ef1 WHIRLPOOL aca6fe7dc40de64c7f0dc1e94511a4281b0e390e538a1652289f835738228602166c2ce3a1be020b95dd7f0c24d40b2b6b8c012ee8cd9dde2ec2cccc45ea338a
-MISC ChangeLog 6432 SHA256 19566f73c5b0cf913a4f0f84c31f3c327c16dbc6129db7f035b6ba0ae906efe7 SHA512 91798f5a2c3eadda760c01aab814ec33931e3431bfc5e3fdde0e8e6671e91036a67d0ecf68281f3cb57ce756dc45803d8340e8e665614ab7f4a747d1ce7d121b WHIRLPOOL d6fb113bf248a2b1786758f5f5f0c499a05ee6c4a7500e3b86b2a239da9b01eea42cb4fc6b0518ba5ff5be541e6b6c66be24129b1b0efcb2635335e7eb628b32
+MISC ChangeLog 6673 SHA256 e09753bdd20a433cb46b554ab4b010dc704347259b6f9e90b854f50ef504bb8b SHA512 18d226a21bf69b5192cca7b5784d6130e6548c28c79b6a6fee86328050f40b2ec4d5050c9d670a1884d126bd1150e6a2267d94a2fbd1985afb9def595abdb4c7 WHIRLPOOL e077f4ae0442307142e4ee6045944e447842be3460e0fc6cf7fd6cc96e9c22440702f4135f84ef3ba5542c986e897ad511b8956e1ace106ffb96ee59c5894528
 MISC metadata.xml 327 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f SHA512 351c6dfb599393ce68da6cf8cee124a2074389e2419db77206e92a4cb5e37168d5c71bacc06024cc621b06456a5550306df29c40381538962b08a2a2b3f2a3d0 WHIRLPOOL f9f7364383513c4fff4875967aeeef0fb67cd472b3b6f04d19e9f6ba528bf4838389e8f24fc93a320b984d5040a6e21f7b7cedc50559f9033cb7c714e643b342
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQpAbZAAoJEO+t9ga+3I3a/0UH+wXMCPUkP0Pg7zfhfnzCbqPT
-09skhpl0ZjAuxyuDmtN54iEYswfQoMcu0uqpqaMCYgzF+/ADK7tHjAELfKRYOlar
-Lfe4v13unwMSPMm/+u9qAsx6qDRMV3fHwvABgvMsjZ/5Qdeq5hkQc6/UjoYaiFEM
-QGuhyX/BWGecJwFnU6eFRyByr1oyBS40hl/enIt3GlOrq5/dx6SOtY8a8JUuAw46
-pq95YctU4cEQy8t3L8rNtnRXPTH/+vEDMpcPgxMdflycBUmGZmrw1ytX5B8AQ+FC
-IztBCPf+e1NK4y6Je5NN6P4N1gAMNV0VKHsdxftj3DGQ3N6rUwxLJfNTF763icw=
-=bUKU
+iQEcBAEBCAAGBQJRDTZ5AAoJEMbwO6tnXQ0sBX0H/R4CQpWrfqAtdebJELKMfd8e
+aZTYjgKtCsEUwQsAPaZK57lC1iQXy/RLAQGbm816BWELLdCkWjNTX0yVvoFsZX5M
+MOu35NZbty9dxqfuWx8GRnsaYQEyL6wfZooy1AGq+uIBTstAutm/frvD8BitXeBe
+MISmnyv1cwRWzlmmC2sE8EJ4knrC/plAKGNCyysmDMer7Z3Ydodxmyk0U2y9fjqv
+ZdIveFOToLF6a6mqz68oA/yWEzSgUe+yd5gnZhj7+1kh/pcQb3Lay4ZDm8XFZA1F
+6gRKiVbuAr6zmPonuKPVtExzN8X0iRp4k8M6DWq3N4Cf6goMgjlCWgpKSAz05qk=
+=oY8K
 -----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch b/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch
new file mode 100644
index 000000000000..6e6752709352
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch
@@ -0,0 +1,29 @@
+From 77209f84a85360e98d2e805d412956a8f2a77db3 Mon Sep 17 00:00:00 2001
+From: Alex Merry <kde@randomguy3.me.uk>
+Date: Fri, 1 Feb 2013 15:31:54 +0000
+Subject: [PATCH] Fix build with GMP 5.1.0
+
+GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class
+or mpf_class.  So we have to have an explicit conversion.
+
+BUG: 312481
+---
+ kmymoney/mymoney/mymoneymoney.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp
+index aeed135..5de7fa9 100644
+--- a/kmymoney/mymoney/mymoneymoney.cpp
++++ b/kmymoney/mymoney/mymoneymoney.cpp
+@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool
+   // be much better than using KGlobal::locale()->formatMoney.
+   bool bNegative = false;
+   mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
+-  mpz_class right = (valueRef() - mpq_class(left)) * denom;
++  mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
+ 
+   if (right < 0) {
+     right = -right;
+-- 
+1.8.1.2
+
diff --git a/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild
new file mode 100644
index 000000000000..346e2a32ba42
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild,v 1.1 2013/02/02 15:53:25 kensington Exp $
+
+EAPI=5
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl
+hu it ja kk lt ms nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW"
+KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="test"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+
+inherit kde4-base
+
+DESCRIPTION="Personal finance manager for KDE"
+HOMEPAGE="http://kmymoney2.sourceforge.net/"
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug calendar doc hbci ofx quotes"
+
+COMMON_DEPEND="
+	app-crypt/gpgme
+	>=app-office/libalkimia-4.3.2
+	dev-cpp/glibmm:2
+	dev-cpp/libxmlpp:2.6
+	dev-libs/boost
+	dev-libs/glib:2
+	dev-libs/gmp
+	dev-libs/libgpg-error
+	dev-libs/libxml2
+	$(add_kdebase_dep kdepimlibs)
+	x11-misc/shared-mime-info
+	calendar? ( dev-libs/libical )
+	hbci? (
+		>=net-libs/aqbanking-5.0.1
+		>=sys-libs/gwenhywfar-4.0.1[qt4]
+	)
+	ofx? ( >=dev-libs/libofx-0.9.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	quotes? ( dev-perl/Finance-Quote )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6.2-gcc-4.7.patch"
+	"${FILESDIR}/${PN}-4.6.3-gmp-5.1.0.patch"
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake-utils_use_enable calendar LIBICAL)
+		$(cmake-utils_use_use doc DEVELOPER_DOC)
+		$(cmake-utils_use_enable hbci KBANKING)
+		$(cmake-utils_use_enable ofx LIBOFX)
+	)
+	kde4-base_src_configure
+}
+
+src_compile() {
+	kde4-base_src_compile
+
+	use doc && kde4-base_src_compile apidoc
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/")
+	kde4-base_src_install
+}