Version bump with a lot of bugfixes, remove old.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 37 insertions, 274 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index b537904ab870..f537ab8c1ab1 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.228 2011/03/13 19:47:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.229 2011/03/15 10:02:14 pacho Exp $
+
+*gnucash-2.4.4 (15 Mar 2011)
+
+  15 Mar 2011; Pacho Ramos <pacho@gentoo.org> -gnucash-2.4.0.ebuild,
+  -files/gnucash-2.4.0-fix-tests-linking.patch, +gnucash-2.4.4.ebuild:
+  Version bump with a lot of bugfixes, remove old.
 
   13 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> gnucash-2.2.9-r3.ebuild:
   alpha/sparc stable wrt #355077
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 3e0db9a41352..f23fb1c508d7 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,11 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnucash-2.4.0-disable-dynload-test.patch 420 RMD160 1fdf8bfe6fade75b540c622796141cb88c0e0233 SHA1 39d26f7391d50369362cb93f4d671cf4a88ddefa SHA256 63dbf5dc7078f7f3972426232ae544f7d0fe3d7ff1b324929124aad1ed2824fd
-AUX gnucash-2.4.0-fix-tests-linking.patch 10196 RMD160 9ce703f138e862bba793867df2ec476831d72db8 SHA1 a613c3ba61f80ed4928c110ac436a241f4b1db59 SHA256 634df452382d283e25fafc336aae0f778cfa37b423a9c29445ac97fce469c77e
 AUX r18166-to-r18167.diff 613 RMD160 0bedad00ccf3c9f3627bbbba04f981f2933bfd1a SHA1 0eb0d51e0a1c2cf9e8996c4d0ab287522079b941 SHA256 68b4e3a9c0235101596984a08e7d7c498f38fe4614b087a94a48fb7e5548d0a2
 AUX test-dbi-business-stuff.h 184 RMD160 ff1afe7eb47109eff9fb156b8ff198117a544b24 SHA1 50d376f25c17c2cf365313abdfc793b50b55e378 SHA256 c02868e392f5ae2c0d7098052dab19690c07b49dafe07afecc5d1ad76ff7e6fd
 DIST gnucash-2.2.9-goffice.patch.gz 2020 RMD160 fb9ae007b246f7fe5c0c3404b7a60a94ff2148ff SHA1 8c567c461640881b0ff00743a6b16cc6f6be67b5 SHA256 d25d9043962c9090c54568bb8d37d4adfa8ff18592df10b7b4f53d3809c1e797
 DIST gnucash-2.2.9.tar.lzma 5210184 RMD160 2e16625b59762a52cea09cfa8139138ee21c6fb2 SHA1 b7debe12fcb2770f5ec4524ec56c57adbdad19d2 SHA256 07b02908d614da6d9d83db07bca6054ed662be58c4de7c541d8c5b8263256c17
-DIST gnucash-2.4.0.tar.bz2 9272663 RMD160 ca762a18d18560c44f1bb87fe8bfd7967cccd365 SHA1 dd89e3c3d87b0c0c4f3f5ffd886363783d5d5576 SHA256 da38efe54786ef01cfe784839717d1b8fa785074ae0ce5fc8b99c6354b161d34
+DIST gnucash-2.4.4.tar.bz2 9259413 RMD160 caef4b3e20ef093b3a2697d8ea3a49632525ac43 SHA1 016fccdfe5134783c95dcd5add5190270ade59f2 SHA256 f8a6a276e8a87a398d25abb9dd66540910d946aa3f8a0a8a7283b65277f49a64
 EBUILD gnucash-2.2.9-r3.ebuild 2326 RMD160 259f537c46d02a27c0c88e915d04bd67375c5a94 SHA1 bb5627d9960f1dc26472ac8b656e1b3a900d839d SHA256 b7d5e9b54dc056e8c401a464a8f8257ad2e07191988f78b9d4b3e6ae0ae537a6
-EBUILD gnucash-2.4.0.ebuild 3828 RMD160 58b890936f6f5a7b6d9e8cef98089f42cb39158d SHA1 5ab3f7c8102997931664f698c66170c909e7b3e7 SHA256 518af1ef8d1e61f828ae85d3ce4bcaf5f2256f0e6c2a29f37d1b12a047bccc18
-MISC ChangeLog 33165 RMD160 be6509d103708f069405b07368c3c55d27b2092b SHA1 2caf26284115cdbe2a45051f3af38f39f42f6824 SHA256 7dac1be03a24549d60add4e776640c08365b106bb518b7f8c0c44568bceed26e
+EBUILD gnucash-2.4.4.ebuild 3868 RMD160 dfba567a318cdbb6230335f70dd4cf3fd5eb995f SHA1 bfa393e56b3a69dd8812756cecc9f13f847cf5e2 SHA256 5b47d2e024d6e7b7958ca79c7b6994399dff2395a1214fb98db4c89d6bf2e6c5
+MISC ChangeLog 33383 RMD160 7321795362e29e82ef67c8690c84261f32f4e9e8 SHA1 edf4280c9147ae8b59aad38564c59eab14f796fe SHA256 a871db0d1e87a8abd242c265ddf6b619a01d74db2f8df4d1768cff129e07aac4
 MISC metadata.xml 535 RMD160 c99ee40df2a1ff8e640e37e97bc26aafd7c95935 SHA1 0aa73584b27064001bad7f76ebaf799947c03bb8 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1/OS4ACgkQCaWpQKGI+9StIQCfe9s4WQrOT7HMUQGFMFh3eEUB
+2awAnjSPm29+91oEYUli9NWfqj0Y9gsh
+=0Oo8
+-----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/files/gnucash-2.4.0-fix-tests-linking.patch b/app-office/gnucash/files/gnucash-2.4.0-fix-tests-linking.patch
deleted file mode 100644
index 74f117104c28..000000000000
--- a/app-office/gnucash/files/gnucash-2.4.0-fix-tests-linking.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-From 192b8c0b93e2755518cd04ef1197a774dc8083bd Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 26 Jan 2011 21:40:14 +0100
-Subject: [PATCH] Fix tests link failures
-
-It looks like internal copy of libqof needs to be explicitely mentionned
-in a couple of places for tests to find the proper library and not the
-one already installed on the system which may or may not have the
-required symbols.
----
- src/app-utils/test/Makefile.am                |    2 +-
- src/backend/xml/test/Makefile.am              |    5 +++--
- src/bin/Makefile.am                           |   10 +++++-----
- src/business/business-core/test/Makefile.am   |    2 +-
- src/core-utils/test/Makefile.am               |    2 +-
- src/engine/test/Makefile.am                   |    6 +++---
- src/import-export/ofx/test/Makefile.am        |    1 +
- src/import-export/qif-import/test/Makefile.am |    2 +-
- src/import-export/test/Makefile.am            |    3 ++-
- src/register/ledger-core/test/Makefile.am     |    1 +
- src/register/register-core/test/Makefile.am   |    3 ++-
- src/register/register-gnome/test/Makefile.am  |    1 +
- src/report/report-gnome/test/Makefile.am      |    1 +
- 13 files changed, 23 insertions(+), 16 deletions(-)
-
-diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am
-index 52baf4a..5c0fd96 100644
---- a/src/app-utils/test/Makefile.am
-+++ b/src/app-utils/test/Makefile.am
-@@ -33,13 +33,13 @@ TESTS_ENVIRONMENT = \
-   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
- 
- LDADD = \
-+   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-+   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-    ${top_builddir}/src/engine/libgncmod-engine.la \
-    ${top_builddir}/src/gnc-module/libgnc-module.la \
-    ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-    ${top_builddir}/src/test-core/libtest-core.la \
-    ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
--   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
--   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-    ${GUILE_LIBS} \
-    ${GCONF_LIBS}
- 
-diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am
-index 85c5f75..8989542 100644
---- a/src/backend/xml/test/Makefile.am
-+++ b/src/backend/xml/test/Makefile.am
-@@ -218,14 +218,15 @@ check_PROGRAMS = \
- 
- noinst_HEADERS = test-file-stuff.h
- 
--LDADD = ${top_builddir}/src/test-core/libtest-core.la \
-+LDADD = \
-+        ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-+        ${top_builddir}/src/test-core/libtest-core.la \
-         ${top_builddir}/src/gnc-module/libgnc-module.la \
-         ${top_builddir}/src/engine/libgncmod-engine.la \
-         ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
-         ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-         ./libgnc-test-file-stuff.la \
-         ${LIBXML2_LIBS} \
--        ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-         ${top_builddir}/lib/libc/libc-missing.la
- 
- AM_CPPFLAGS = \
-diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
-index f740b39..1e70d98 100644
---- a/src/bin/Makefile.am
-+++ b/src/bin/Makefile.am
-@@ -61,16 +61,16 @@ bin_PROGRAMS = ${BIN_NAME}
- gnucash_SOURCES = gnucash-bin.c ${GNUCASH_RESOURCE_FILE}
- gnucash_LDADD = \
-   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
--  ${GUILE_LIBS} \
--  ${GLIB_LIBS} \
--  ${GNOME_LIBS} \
--  ${GTK_LIBS} \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/gnome/libgnc-gnome.la \
-   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
--  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
--  ${top_builddir}/src/gnc-module/libgnc-module.la
-+  ${top_builddir}/src/gnc-module/libgnc-module.la \
-+  ${GUILE_LIBS} \
-+  ${GLIB_LIBS} \
-+  ${GNOME_LIBS} \
-+  ${GTK_LIBS}
- 
- GNUCASH_BIN_INSTALL_NAME=`echo ${BIN_NAME} | sed -e '$(transform)'`
- 
-diff --git a/src/business/business-core/test/Makefile.am b/src/business/business-core/test/Makefile.am
-index 9495d13..d3fec0d 100644
---- a/src/business/business-core/test/Makefile.am
-+++ b/src/business/business-core/test/Makefile.am
-@@ -11,11 +11,11 @@ AM_CPPFLAGS = \
-   ${GLIB_CFLAGS}
- 
- LDADD = \
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${top_builddir}/src/gnc-module/libgnc-module.la \
-   ${top_builddir}/src/test-core/libtest-core.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ../libgncmod-business-core.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${GLIB_LIBS}
- 
- TESTS = \
-diff --git a/src/core-utils/test/Makefile.am b/src/core-utils/test/Makefile.am
-index 7b3c131..4bd2759 100644
---- a/src/core-utils/test/Makefile.am
-+++ b/src/core-utils/test/Makefile.am
-@@ -9,9 +9,9 @@ AM_CPPFLAGS = \
-   ${GLIB_CFLAGS}
- 
- LDADD = \
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ../libgnc-core-utils.la \
-   ${top_builddir}/src/test-core/libtest-core.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${GLIB_LIBS}
- 
- # these tests are ordered kind more or less in the order
-diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am
-index 0682759..0c9ab68 100644
---- a/src/engine/test/Makefile.am
-+++ b/src/engine/test/Makefile.am
-@@ -12,12 +12,12 @@ AM_CPPFLAGS = \
-   ${GLIB_CFLAGS}
- 
- LDADD = \
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${top_builddir}/src/gnc-module/libgnc-module.la \
-   ${top_builddir}/src/test-core/libtest-core.la \
-   ../libgncmod-engine.la \
-   ../test-core/libgncmod-test-engine.la \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${GLIB_LIBS}
- 
- # these tests are ordered kind more or less in the order
-@@ -84,8 +84,8 @@ check_PROGRAMS = \
- 
- test_link_SOURCES = test-link.c
- test_link_LDADD = ../libgncmod-engine.la \
--  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-+  ${top_builddir}/src/core-utils/libgnc-core-utils.la
- 
- EXTRA_DIST = \
-   test-create-account \
-diff --git a/src/import-export/ofx/test/Makefile.am b/src/import-export/ofx/test/Makefile.am
-index 0283ed7..81d7f4b 100644
---- a/src/import-export/ofx/test/Makefile.am
-+++ b/src/import-export/ofx/test/Makefile.am
-@@ -5,5 +5,6 @@ check_PROGRAMS=test-link
- 
- test_link_SOURCES=test-link.c
- test_link_LDADD=\
-+	$(top_builddir)/src/libqof/qof/libgnc-qof.la \
- 	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-     ../libgncmod-ofx.la 
-diff --git a/src/import-export/qif-import/test/Makefile.am b/src/import-export/qif-import/test/Makefile.am
-index 118354c..eabcc86 100644
---- a/src/import-export/qif-import/test/Makefile.am
-+++ b/src/import-export/qif-import/test/Makefile.am
-@@ -6,11 +6,11 @@ test_link_SOURCES = \
-   test-link.c
- 
- test_link_LDADD=../libgncmod-qif-import.la \
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-   ${top_builddir}/src/gnome/libgnc-gnome.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${LIBXML2_LIBS}
- 
-diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am
-index f9be395..9ae60ff 100644
---- a/src/import-export/test/Makefile.am
-+++ b/src/import-export/test/Makefile.am
-@@ -10,12 +10,13 @@ AM_CPPFLAGS = \
-   ${GLIB_CFLAGS}
- 
- LDADD = \
-+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-   ${top_builddir}/src/gnc-module/libgnc-module.la \
-   ${top_builddir}/src/test-core/libtest-core.la \
-   ../libgncmod-generic-import.la \
-   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
--  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
-   ${GLIB_LIBS}
- 
- TESTS = \
-diff --git a/src/register/ledger-core/test/Makefile.am b/src/register/ledger-core/test/Makefile.am
-index f6461cf..ca78cf5 100644
---- a/src/register/ledger-core/test/Makefile.am
-+++ b/src/register/ledger-core/test/Makefile.am
-@@ -4,6 +4,7 @@ check_PROGRAMS = test-link-module
- 
- test_link_module_SOURCES=test-link-module.c
- test_link_module_LDADD=\
-+	$(top_builddir)/src/libqof/qof/libgnc-qof.la \
- 	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-     ../libgncmod-ledger-core.la
- 
-diff --git a/src/register/register-core/test/Makefile.am b/src/register/register-core/test/Makefile.am
-index 20a240d..e4c1126 100644
---- a/src/register/register-core/test/Makefile.am
-+++ b/src/register/register-core/test/Makefile.am
-@@ -12,7 +12,8 @@ check_PROGRAMS = \
-   test-link-module
- 
- test_link_module_SOURCES=test-link-module.c
--test_link_module_LDADD= \
-+test_link_module_LDADD=\
-+  $(top_builddir)/src/libqof/qof/libgnc-qof.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-diff --git a/src/register/register-gnome/test/Makefile.am b/src/register/register-gnome/test/Makefile.am
-index 83409d6..ddf3347 100644
---- a/src/register/register-gnome/test/Makefile.am
-+++ b/src/register/register-gnome/test/Makefile.am
-@@ -13,6 +13,7 @@ check_PROGRAMS = \
- 
- test_link_module_SOURCES = test-link-module.c
- test_link_module_LDADD = \
-+  $(top_builddir)/src/libqof/qof/libgnc-qof.la \
-   ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am
-index 5884ccd..f31c4cf 100644
---- a/src/report/report-gnome/test/Makefile.am
-+++ b/src/report/report-gnome/test/Makefile.am
-@@ -20,6 +20,7 @@ TESTS_ENVIRONMENT = \
-   $(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
- 
- LDADD = \
-+	$(top_builddir)/src/libqof/qof/libgnc-qof.la \
-     ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
- 	${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la
- 
--- 
-1.7.4.rc2
-
diff --git a/app-office/gnucash/gnucash-2.4.0.ebuild b/app-office/gnucash/gnucash-2.4.4.ebuild
index 5eee3a049f70..27bc998c8435 100644
--- a/app-office/gnucash/gnucash-2.4.0.ebuild
+++ b/app-office/gnucash/gnucash-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild,v 1.2 2011/01/30 22:47:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.4.ebuild,v 1.1 2011/03/15 10:02:16 pacho Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.4"
@@ -16,25 +16,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+doc ofx hbci chipcard debug mysql python quotes sqlite postgres webkit"
+IUSE="chipcard cxx debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
 
 RDEPEND=">=dev-libs/glib-2.13:2
 	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10
-	>=dev-scheme/guile-1.8.3[deprecated,regex]
+	>=dev-libs/libxml2-2.5.10:2
+	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
 	dev-scheme/guile-www
 	>=dev-scheme/slib-3.1.4
-	>=gnome-base/gconf-2
+	>=gnome-base/gconf-2:2
 	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4
+	>=gnome-base/libglade-2.4:2.0
 	|| ( <gnome-base/gnome-keyring-2.29 gnome-base/libgnome-keyring )
 	media-libs/libart_lgpl
 	>=sys-libs/zlib-1.1.4
 	>=x11-libs/gtk+-2.14:2
 	x11-libs/goffice:0.8[gnome]
 	x11-libs/pango
+	cxx? ( dev-cpp/gtkmm:2.4 )
 	ofx? ( >=dev-libs/libofx-0.9.1 )
 	hbci? (
 		|| (
@@ -46,7 +47,7 @@ RDEPEND=">=dev-libs/glib-2.13:2
 	quotes? ( dev-perl/DateManip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
-	webkit? ( net-libs/webkit-gtk )
+	webkit? ( net-libs/webkit-gtk:2 )
 	!webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 )
 	sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] )
 	postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] )
@@ -62,13 +63,14 @@ DEPEND="${RDEPEND}
 
 PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
 #ELTCONF="--patch-only"
-DOCS="doc/README.OFX doc/README.HBCI"
 
 # FIXME: no the best thing to do but it'd be even better to fix autofoo
 # XXX: does not break here
 #MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
+	DOCS="doc/README.OFX doc/README.HBCI"
+
 	if use webkit ; then
 		G2CONF+=" --with-html-engine=webkit"
 	else
@@ -80,7 +82,9 @@ pkg_setup() {
 	else
 		G2CONF+=" --disable-dbi"
 	fi
+
 	G2CONF+="
+		$(use_enable cxx gtkmm)
 		$(use_enable debug)
 		$(use_enable ofx)
 		$(use_enable hbci aqbanking)
@@ -112,12 +116,11 @@ src_prepare() {
 	gnome2_src_prepare
 	: > "${S}"/py-compile
 
+	use python && python_convert_shebangs -r 2 .
+
 	# Disable test broken by libtool magic ???
 	epatch "${FILESDIR}/${PN}-2.4.0-disable-dynload-test.patch"
 
-	# Fix test linking issues
-	epatch "${FILESDIR}/${PN}-2.4.0-fix-tests-linking.patch"
-
 	# Disable python binding tests because of missing file
 	sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
 		-i src/optional/python-bindings/Makefile.{am,in} \
@@ -137,9 +140,9 @@ src_test() {
 src_install() {
 	gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
 
-	rm -rf "${D}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
+	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
 #	prepalldocs
-	mv "${D}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
+	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
 	dodoc "${T}"/cantuseprepalldocs/* || die
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }