Add gcc4.3 patch to 0.8.8. Fix crypt dep in 1.0.0. Per bugs #264525 and #283118.

(Portage version: 2.2_rc38/cvs/Linux i686)

4 files changed, 28 insertions, 6 deletions

diff --git a/app-office/kmymoney2/ChangeLog b/app-office/kmymoney2/ChangeLog
index a46f5a8ba634..ee2f1f3ecc88 100644
--- a/app-office/kmymoney2/ChangeLog
+++ b/app-office/kmymoney2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/kmymoney2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.80 2009/08/19 16:10:48 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/ChangeLog,v 1.81 2009/09/07 12:21:05 scarabeus Exp $
+
+  07 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.8.8-gcc4.3.patch, kmymoney2-0.8.8.ebuild, kmymoney2-1.0.0.ebuild:
+  Add gcc4.3 patch to 0.8.8. Fix crypt dep in 1.0.0. Per bugs #264525 and
+  #283118.
 
 *kmymoney2-1.0.0 (19 Aug 2009)
 
diff --git a/app-office/kmymoney2/files/0.8.8-gcc4.3.patch b/app-office/kmymoney2/files/0.8.8-gcc4.3.patch
new file mode 100644
index 000000000000..93ed615eeadf
--- /dev/null
+++ b/app-office/kmymoney2/files/0.8.8-gcc4.3.patch
@@ -0,0 +1,11 @@
+--- kmymoney2/mymoney/storage/mymoneystoragebin.h.old	2009-06-02 13:17:27.000000000 +0200
++++ kmymoney2/mymoney/storage/mymoneystoragebin.h	2009-06-02 13:17:49.000000000 +0200
+@@ -107,7 +107,7 @@
+   const MyMoneyTransaction readTransaction(QDataStream& s);
+ 
+   void writeSplits(QDataStream& s, const MyMoneyTransaction& t);
+-  void writeSplit(QDataStream& s, const MyMoneySplit& s);
++  void writeSplit(QDataStream& s, const MyMoneySplit& t);
+   const QValueList<MyMoneySplit> readSplits(QDataStream& s);
+   const MyMoneySplit readSplit(QDataStream& s);
+ 
diff --git a/app-office/kmymoney2/kmymoney2-0.8.8.ebuild b/app-office/kmymoney2/kmymoney2-0.8.8.ebuild
index 07fbdee7766d..e2fcf9e100f7 100644
--- a/app-office/kmymoney2/kmymoney2-0.8.8.ebuild
+++ b/app-office/kmymoney2/kmymoney2-0.8.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.8.ebuild,v 1.7 2008/12/09 18:38:03 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-0.8.8.ebuild,v 1.8 2009/09/07 12:21:05 scarabeus Exp $
 
 inherit kde
 
@@ -28,7 +28,10 @@ need-kde 3.5
 # TODO: support maketest
 # (needs cppunit in DEPEND)
 
-PATCHES=( "${FILESDIR}/kmymoney2.desktop.diff" )
+PATCHES=(
+	"${FILESDIR}/kmymoney2.desktop.diff"
+	"${FILESDIR}/${PV}-gcc4.3.patch"
+)
 
 pkg_setup() {
 	if use hbci && ! built_with_use net-libs/aqbanking kde; then
diff --git a/app-office/kmymoney2/kmymoney2-1.0.0.ebuild b/app-office/kmymoney2/kmymoney2-1.0.0.ebuild
index 797ed83a42de..1d888602e7c9 100644
--- a/app-office/kmymoney2/kmymoney2-1.0.0.ebuild
+++ b/app-office/kmymoney2/kmymoney2-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-1.0.0.ebuild,v 1.1 2009/08/19 16:10:48 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney2/kmymoney2-1.0.0.ebuild,v 1.2 2009/09/07 12:21:05 scarabeus Exp $
 
 EAPI="2"
 inherit kde
@@ -26,7 +26,10 @@ DEPEND="${COMMON_DEPEND}
 	test? ( >=dev-util/cppunit-1.8.0 )"
 
 RDEPEND="${COMMON_DEPEND}
-	crypt? ( app-crypt/gnupg )"
+	crypt? (
+		app-crypt/gnupg
+		app-crypt/pinentry
+	)"
 
 need-kde 3.5