fix gcc4.3 and add ~amd64 for qbankmanager

(Portage version: 2.1.5_rc6)

3 files changed, 141 insertions, 4 deletions

diff --git a/app-office/qbankmanager/ChangeLog b/app-office/qbankmanager/ChangeLog
index 91dd05fc8fb2..e6766290695b 100644
--- a/app-office/qbankmanager/ChangeLog
+++ b/app-office/qbankmanager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/qbankmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.30 2008/02/22 21:02:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/ChangeLog,v 1.31 2008/04/28 11:32:43 hanno Exp $
+
+  28 Apr 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/qbankmanager-gcc-4.3.patch, qbankmanager-0.9.39.ebuild:
+  Add ~amd64 and fix compilation with gcc 4.3.
 
   22 Feb 2008; Hanno Boeck <hanno@gentoo.org> -qbankmanager-0.9.38.ebuild,
   qbankmanager-0.9.39.ebuild:
diff --git a/app-office/qbankmanager/files/qbankmanager-gcc-4.3.patch b/app-office/qbankmanager/files/qbankmanager-gcc-4.3.patch
new file mode 100644
index 000000000000..aa3a05769813
--- /dev/null
+++ b/app-office/qbankmanager/files/qbankmanager-gcc-4.3.patch
@@ -0,0 +1,127 @@
+--- src/kbanking/libs/kbanking.cpp
++++ src/kbanking/libs/kbanking.cpp
+@@ -35,7 +35,7 @@
+ #include "graphreport.h"
+ /* Note: add new reports to fn _sampleReportModules() */
+ 
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ #include <qmessagebox.h>
+ #include <qinputdialog.h>
+--- src/kbanking/libs/prg/account.cpp
++++ src/kbanking/libs/prg/account.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include <gwenhywfar/debug.h>
+ #include <stdlib.h>
+-#include <assert.h>
++#include <cassert>
+ 
+ 
+ 
+--- src/kbanking/libs/prg/category.cpp
++++ src/kbanking/libs/prg/category.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include <gwenhywfar/debug.h>
+ #include <stdlib.h>
+-#include <assert.h>
++#include <cassert>
+ 
+ 
+ 
+--- src/kbanking/libs/prg/refpointer.h
++++ src/kbanking/libs/prg/refpointer.h
+@@ -32,12 +32,13 @@
+  *
+  * @short Smart pointer RefPointer with helper classes. No C wrappers.*/
+ 
+-#include <assert.h>
+ #include <gwenhywfar/debug.h>
+ 
+ #ifdef __cplusplus
+-#include <stdio.h> /* DEBUG */
++#include <cassert>
++#include <cstdio> /* DEBUG */
+ #include <string>
++#include <cstdlib>
+ 
+ 
+ class RefPointerBase;
+@@ -766,7 +767,8 @@
+ };
+ 
+ #endif /* DOXYGEN_HIDE */
+-
++#else
++#include <assert.h>
+ #endif /* __cplusplus */
+ #endif /* REFPOINTER_H */
+ 
+--- src/kbanking/libs/widgets/accountlist.cpp
++++ src/kbanking/libs/widgets/accountlist.cpp
+@@ -16,7 +16,7 @@
+ 
+ 
+ #include "accountlist.h"
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ 
+ #include <gwenhywfar/debug.h>
+--- src/kbanking/libs/widgets/categorylist.cpp
++++ src/kbanking/libs/widgets/categorylist.cpp
+@@ -18,7 +18,7 @@
+ 
+ 
+ #include "categorylist.h"
+-#include <assert.h>
++#include <cassert>
+ 
+ #include <qstring.h>
+ #include <qlistview.h>
+--- src/kbanking/libs/widgets/payeelist.cpp
++++ src/kbanking/libs/widgets/payeelist.cpp
+@@ -16,7 +16,7 @@
+ 
+ 
+ #include "payeelist.h"
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ 
+ #include <gwenhywfar/debug.h>
+--- src/kbanking/libs/widgets/stolist.cpp
++++ src/kbanking/libs/widgets/stolist.cpp
+@@ -16,7 +16,7 @@
+ 
+ 
+ #include "stolist.h"
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ #include <qpainter.h>
+ #include <qdatetime.h>
+--- src/kbanking/libs/widgets/transactionlist.cpp
++++ src/kbanking/libs/widgets/transactionlist.cpp
+@@ -20,7 +20,7 @@
+ #include "category.h"
+ #include "kbanking.h"
+ 
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ #include <qpainter.h>
+ #include <qdatetime.h>
+--- src/kbanking/libs/widgets/transferlist.cpp
++++ src/kbanking/libs/widgets/transferlist.cpp
+@@ -16,7 +16,7 @@
+ 
+ 
+ #include "transferlist.h"
+-#include <assert.h>
++#include <cassert>
+ #include <qstring.h>
+ #include <qpainter.h>
+ #include <qdatetime.h>
diff --git a/app-office/qbankmanager/qbankmanager-0.9.39.ebuild b/app-office/qbankmanager/qbankmanager-0.9.39.ebuild
index 67e818c62dd7..69ade436e8f1 100644
--- a/app-office/qbankmanager/qbankmanager-0.9.39.ebuild
+++ b/app-office/qbankmanager/qbankmanager-0.9.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.39.ebuild,v 1.6 2008/02/22 21:02:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/qbankmanager/qbankmanager-0.9.39.ebuild,v 1.7 2008/04/28 11:32:43 hanno Exp $
 
 inherit eutils qt3
 
@@ -10,12 +10,12 @@ SRC_URI="mirror://sourceforge/aqbanking/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc sparc x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="debug"
 
 DEPEND=">=net-libs/aqbanking-2.2.5
 	=x11-libs/qt-3*"
-S=${WORKDIR}/${P}
+S="${WORKDIR}/${P}"
 
 pkg_setup() {
 	if ! built_with_use net-libs/aqbanking qt3; then
@@ -25,6 +25,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/qbankmanager-gcc-4.3.patch"
+}
+
 src_compile() {
 	econf PATH="/usr/qt/3/bin:${PATH}" \
 		`use_enable debug` || die