Fix ofx aqbanking dep, #406909 by Tim Sammut.

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

4 files changed, 19 insertions, 159 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/Manifest b/app-office/gnucash/Manifest
index 4401fafafa18..a0862f8ce4dc 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnucash-2.4.7-python-detection.patch 1960 RMD160 fdd2282fd3f594770d873647562cfde54c6285ee SHA1 47b3355f0db503e4dcf3403d53eff56f874810e5 SHA256 9f7cb480ac23ec33bf2547786cc362ecb0151500f68785c0cb437e727f5a5e5d
 AUX gnucash-2.4.8-python-detection.patch 1945 RMD160 0026503ccc8c1094806dd222c01f9aa6446d6e95 SHA1 5f2a84b3f5e328457b1af2db5ab35ef55c0803df SHA256 649491376f5fa2aae65e918981eee3b25e3d99bc1a83c612e5b8e86429bf947a
 DIST gnucash-2.4.10.tar.bz2 9367104 RMD160 c08f8f046c24b9b28adf486ea75f9ada9d6e8441 SHA1 b1906f8143406fdf8cb5217233143cc08e708b99 SHA256 52e65623b5ad812b8eeb4c221951e9b0ba3c49e28916acfb7b92566da159e6cc
-DIST gnucash-2.4.7.tar.bz2 9297876 RMD160 678db346d2a0d3f019d7435ac3cf17df96ac7c1a SHA1 e99dd56949de27c19d9c3413d30c87a0f74e8ff9 SHA256 eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e
 DIST gnucash-2.4.8.tar.bz2 9345232 RMD160 030c5948e188765900bb5736c398f8d5ee6641d4 SHA1 cdd8793bc8e8cbb433a0237007023f4973a51781 SHA256 4aa11e7746bb5105682a223f9baf97200ecf2a1fcddbf871626805ac097fee19
-EBUILD gnucash-2.4.10.ebuild 3680 RMD160 d4a9bdd226e47772cf14150f092fe4630d27424f SHA1 6ea058215af75fd222fcbad5f06cba5978fd1dbf SHA256 568406e0f8d33f6e283d73e51ea50bd5a84cd3b5af3b65de84345c61bb8be315
-EBUILD gnucash-2.4.7.ebuild 3933 RMD160 3efebca8a265f078de02ba3fc6052eca471b4108 SHA1 3cac09f161ade798a9c02c1ac501d1231a4d3b0f SHA256 4470cff944013ec04a05158f8e02b48550d800f3ee1b4f01f695dad815952300
+EBUILD gnucash-2.4.10.ebuild 3685 RMD160 e54ef13caf216db8d1fea864765044b0f722bd12 SHA1 29cae37f24f33439f3fe41ede4bc3578779fc6d9 SHA256 9c3705e447138b0ff6fa5a4c309df5255907738f2c23db1541b47ef92c415e1f
 EBUILD gnucash-2.4.8.ebuild 3891 RMD160 a6ca46d3ff94f36c043b2354b5511f7693326c2e SHA1 c4f2aea9a9b48418c686d99775eac83f96ebfb12 SHA256 ab63c1493d6cdf0655120dd8e6b5ca343c2c1c6f7d8f67cda822b70794a23600
-MISC ChangeLog 37004 RMD160 67d92f307f182f21e1e23f22eb78faf86425500c SHA1 8240ab499787cac60ca11646361bcca797a86ed7 SHA256 398478d32d8a4f40263e1b7dc67c367d4c80ff1edaa6c7523522392e04b0f24f
+MISC ChangeLog 37146 RMD160 868c9aaa0961f997dacbc9f41f07f2118471a5a6 SHA1 19363f71fbed35526b74b628f0de554c45a92658 SHA256 5171e68efa2faa4a526b99fc42edb0e82fb25dac2ff7e1b0a122c0cb2f9936e8
 MISC metadata.xml 535 RMD160 c99ee40df2a1ff8e640e37e97bc26aafd7c95935 SHA1 0aa73584b27064001bad7f76ebaf799947c03bb8 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk9u3v8ACgkQCaWpQKGI+9T+jwCfSBFHlqTX6dEu+Z2JNOVIWOKo
+KKEAnjzGeOlRwATM31DF8ahvW8xRO3Cl
+=wSST
+-----END PGP SIGNATURE-----
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
-}