Fix ofx aqbanking dep, #406909 by Tim Sammut.

(Portage version: 2.1.10.51/cvs/Linux x86_64)

3 files changed, 7 insertions, 155 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index ab8ead4c28c7..11525e581fba 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.255 2012/03/05 21:53:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.256 2012/03/25 09:01:45 pacho Exp $
+
+  25 Mar 2012; Pacho Ramos <pacho@gentoo.org> -gnucash-2.4.7.ebuild,
+  gnucash-2.4.10.ebuild:
+  Fix ofx aqbanking dep, #406909 by Tim Sammut.
 
   05 Mar 2012; Brent Baude <ranger@gentoo.org> gnucash-2.4.8.ebuild:
   Marking gnucash-2.4.8 ppc stable for bug 393007
diff --git a/app-office/gnucash/gnucash-2.4.10.ebuild b/app-office/gnucash/gnucash-2.4.10.ebuild
index 429f88d97bb9..bea735b44a9b 100644
--- a/app-office/gnucash/gnucash-2.4.10.ebuild
+++ b/app-office/gnucash/gnucash-2.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.10.ebuild,v 1.1 2012/02/13 10:31:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.10.ebuild,v 1.2 2012/03/25 09:01:45 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -38,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.13:2
 	x11-libs/pango
 	cxx? ( dev-cpp/gtkmm:2.4 )
 	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk]
+	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
 		sys-libs/gwenhywfar[gtk]
 		chipcard? ( sys-libs/libchipcard )
 	)
diff --git a/app-office/gnucash/gnucash-2.4.7.ebuild b/app-office/gnucash/gnucash-2.4.7.ebuild
deleted file mode 100644
index ab51b36f2436..000000000000
--- a/app-office/gnucash/gnucash-2.4.7.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.7.ebuild,v 1.6 2012/02/10 03:53:51 patrick Exp $
-
-EAPI="3"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit gnome2 python eutils autotools
-
-DOC_VER="2.2.0"
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-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:2
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	>=dev-scheme/slib-3.1.4
-	>=gnome-base/gconf-2:2
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4:2.0
-	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? ( >=net-libs/aqbanking-5[gtk]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	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] )
-	mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] )
-"
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3
-	dev-util/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
-
-pkg_setup() {
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use webkit ; then
-		G2CONF+=" --with-html-engine=webkit"
-	else
-		G2CONF+=" --with-html-engine=gtkhtml"
-	fi
-
-	if use sqlite || use mysql || use postgres ; then
-		G2CONF+=" --enable-dbi"
-	else
-		G2CONF+=" --disable-dbi"
-	fi
-
-	G2CONF+="
-		$(use_enable cxx gtkmm)
-		$(use_enable debug)
-		$(use_enable ofx)
-		$(use_enable hbci aqbanking)
-		$(use_enable python python-bindings)
-		--disable-doxygen
-		--enable-locale-specific-tax
-		--disable-error-on-warning"
-
-	if use python ; then
-		python_set_active_version 2
-	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
-
-	use python && python_convert_shebangs -r 2 .
-
-	# 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"
-
-	# Find python in a faster way, bug #344231, upstream bug #????
-	epatch "${FILESDIR}/${PN}-2.4.7-python-detection.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check \
-	|| die "Make check failed. See above for details."
-}
-
-src_install() {
-	# Parallel installation fails from time to time, bug #359123
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install GNC_DOC_INSTALL_DIR=/usr/share/doc/${PF}
-
-	rm -rf "${ED}"/usr/share/doc/${PF}/{examples/,COPYING,INSTALL,*win32-bin.txt,projects.html}
-	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/* || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize gnucash
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup gnucash
-}