summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-01-30 22:47:22 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-01-30 22:47:22 +0000
commit47be86f738f9a668612da3b8d6f4022619467687 (patch)
tree59282d210c10821071b1780746d4167167c69c99 /app-office
parentFix dependencies. (diff)
downloadgentoo-2-47be86f738f9a668612da3b8d6f4022619467687.tar.gz
gentoo-2-47be86f738f9a668612da3b8d6f4022619467687.tar.bz2
gentoo-2-47be86f738f9a668612da3b8d6f4022619467687.zip
Fix multiple python slots support, fix test failures, disable python module test due to missing files, workaround guile configuration problem, bug #202205. Pin dependencies to appropriate slots. Add missing gnome-keyring dependencies, sort dependencies. Re-enable parallel build since it does not fail for me to get a bit more testing. Closes #346919.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/gnucash/ChangeLog13
-rw-r--r--app-office/gnucash/files/gnucash-2.4.0-disable-dynload-test.patch13
-rw-r--r--app-office/gnucash/files/gnucash-2.4.0-fix-tests-linking.patch255
-rw-r--r--app-office/gnucash/gnucash-2.4.0.ebuild71
4 files changed, 329 insertions, 23 deletions
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 8405c6b544a9..c0da9108ee96 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for app-office/gnucash
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.222 2010/12/23 11:41:00 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.223 2011/01/30 22:47:21 eva Exp $
+
+ 30 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> gnucash-2.4.0.ebuild,
+ +files/gnucash-2.4.0-disable-dynload-test.patch,
+ +files/gnucash-2.4.0-fix-tests-linking.patch:
+ Fix multiple python slots support, fix test failures, disable python module
+ test due to missing files, workaround guile configuration problem, bug
+ #202205. Pin dependencies to appropriate slots. Add missing gnome-keyring
+ dependencies, sort dependencies. Re-enable parallel build since it does not
+ fail for me to get a bit more testing. Closes #346919.
23 Dec 2010; Torsten Veller <tove@gentoo.org> -gnucash-2.3.15.ebuild:
Cleanup
diff --git a/app-office/gnucash/files/gnucash-2.4.0-disable-dynload-test.patch b/app-office/gnucash/files/gnucash-2.4.0-disable-dynload-test.patch
new file mode 100644
index 000000000000..c79c6e23ef87
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.0-disable-dynload-test.patch
@@ -0,0 +1,13 @@
+Disable dynload test. It is known to work but some libtool magic stops it from
+working on a system with an already installed gnucash.
+
+--- a/src/gnc-module/test/Makefile.am 2010-12-22 03:01:12.000000000 +0100
++++ b/src/gnc-module/test/Makefile.am 2011-01-25 20:15:21.000000000 +0100
+@@ -18,7 +20,6 @@
+ test-modsysver \
+ test-incompatdep \
+ test-agedver \
+- test-dynload \
+ test-scm-dynload \
+ test-scm-init
+
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
new file mode 100644
index 000000000000..74f117104c28
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.0-fix-tests-linking.patch
@@ -0,0 +1,255 @@
+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.0.ebuild
index 204f0484bd69..5eee3a049f70 100644
--- a/app-office/gnucash/gnucash-2.4.0.ebuild
+++ b/app-office/gnucash/gnucash-2.4.0.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/12/23 11:39:50 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.0.ebuild,v 1.2 2011/01/30 22:47:21 eva Exp $
-EAPI=3
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.4"
-#PYTHON_DEPEND="python? 2:2.4"
-
-inherit eutils gnome2
-inherit python
+inherit autotools eutils gnome2 python
DOC_VER="2.2.0"
@@ -22,18 +20,21 @@ IUSE="+doc ofx hbci chipcard debug mysql python quotes sqlite postgres webkit"
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
-RDEPEND=">=dev-libs/glib-2.6.3
+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-scheme/guile-www
>=dev-scheme/slib-3.1.4
- >=sys-libs/zlib-1.1.4
- >=dev-libs/popt-1.5
- >=x11-libs/gtk+-2.10
+ >=gnome-base/gconf-2
>=gnome-base/libgnomeui-2.4
>=gnome-base/libglade-2.4
- >=dev-libs/libxml2-2.5.10
- >=gnome-base/gconf-2
- >=x11-libs/goffice-0.6[gnome]
+ || ( <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
ofx? ( >=dev-libs/libofx-0.9.1 )
hbci? (
|| (
@@ -46,25 +47,26 @@ RDEPEND=">=dev-libs/glib-2.6.3
>=dev-perl/Finance-Quote-1.11
dev-perl/HTML-TableExtract )
webkit? ( net-libs/webkit-gtk )
- !webkit? ( >=gnome-extra/gtkhtml-3.14 )
+ !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] )
mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
- media-libs/libart_lgpl
- x11-libs/pango"
-
+"
DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-0.3
dev-util/pkgconfig
dev-util/intltool
+ gnome-base/gnome-common
sys-devel/libtool
- >=app-text/scrollkeeper-0.3"
+"
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
-MAKEOPTS="${MAKEOPTS} -j1"
+# XXX: does not break here
+#MAKEOPTS="${MAKEOPTS} -j1"
pkg_setup() {
if use webkit ; then
@@ -89,13 +91,40 @@ pkg_setup() {
if use python ; then
python_set_active_version 2
- python_pkg_setup
fi
}
+src_configure() {
+ # guile wrongly exports LDFLAGS as LIBS which breaks modules
+ # Filter until a better ebuild is available, bug #202205
+ local GUILE_LIBS=""
+ local lib
+ for lib in $(guile-config link); do
+ if [ "${lib#-Wl}" = "$lib" ]; then
+ GUILE_LIBS="$GUILE_LIBS $lib"
+ fi
+ done
+
+ econf GUILE_LIBS="${GUILE_LIBS}" ${G2CONF}
+}
+
src_prepare() {
gnome2_src_prepare
: > "${S}"/py-compile
+
+ # 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} \
+ || die "python tests sed failed"
+
+ intltoolize --force --copy --automake || die "intltoolize failed"
+ eautoreconf
}
src_test() {