Version bump. Fix linking against already installed gnucash libraries, bug #359033.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 176 insertions, 5 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 416225c9b0fc..48d597d8db7d 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,13 @@
 # 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.232 2011/03/29 19:31:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.233 2011/04/19 06:48:37 eva Exp $
+
+*gnucash-2.4.5 (19 Apr 2011)
+
+  19 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> +gnucash-2.4.5.ebuild,
+  +files/gnucash-2.4.5-link-system-libs.patch:
+  Version bump. Fix linking against already installed gnucash libraries, bug
+  #359033.
 
   29 Mar 2011; Pacho Ramos <pacho@gentoo.org> gnucash-2.4.4.ebuild:
   Fix RDEPEND, bug #360533 by Sebastian Lipp).
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 81cdf4abe3d1..f11e9401f573 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnucash-2.4.5-link-system-libs.patch 578 RMD160 4dbed2bc8018f6d4766fae03b7d924e407d93723 SHA1 009321ff8b72dce3681cf452aa1cde6c1afc4d25 SHA256 b0509fa4079ff0db9611fd714042ef11419a29bb7536385b174dbb49d0cc0391
 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.4.tar.bz2 9259413 RMD160 caef4b3e20ef093b3a2697d8ea3a49632525ac43 SHA1 016fccdfe5134783c95dcd5add5190270ade59f2 SHA256 f8a6a276e8a87a398d25abb9dd66540910d946aa3f8a0a8a7283b65277f49a64
+DIST gnucash-2.4.5.tar.bz2 9264705 RMD160 ae475c31f18bdd4edb3e8c72951b09942f19acdc SHA1 4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126 SHA256 edc76109ca6cc31ee02734d4dd129d1177bc4b4e6de40e7de9e5752fc38faf92
 EBUILD gnucash-2.2.9-r3.ebuild 2338 RMD160 6bcb6b71d9a379c1fe14b1bf48a54e3172757b85 SHA1 0116725a7f85af4f5ce327ff4f847328a9754ff4 SHA256 1a44fd9542adb42955b079d55720df34d4e9dbc992e0af8c7cfe9f1b440ab262
 EBUILD gnucash-2.4.4.ebuild 3748 RMD160 36b3d9f87072c33e2e8cf2239e9c646bd499e22d SHA1 ec6e650156b32f398bd041d31dc02ef2989f2dc9 SHA256 241a52d657fb450a0ffe530b671380a865455eb6257d21d6278af6909ed5fc9b
-MISC ChangeLog 33795 RMD160 f67725e15844c32841e4fe5d7bb1c50a5d72af55 SHA1 2af1865a9b0573252ce39c6e6e288072753087c2 SHA256 da9e7233f64d271984272dd62ecaaa5b23335aff1419aa40839d9faa805b2aa1
+EBUILD gnucash-2.4.5.ebuild 3953 RMD160 e5161ebdb9c1dba37d4d1ef697edb18fd61364a4 SHA1 695c8f9216dd186b759f24769637f1dcd7e9a32a SHA256 1226680517985d2a23480e5d74cfb880c8357241178e7ccb5c6197617062aa57
+MISC ChangeLog 34036 RMD160 d93248a366f4e74f44c3fb38df5542cf10475f82 SHA1 1b48c9dcceb006cc1d5d30b294cc62db0e01fcd9 SHA256 a8452e214e6e687ee62988a27d844724556511e0087727bcb485ef50c04f1c57
 MISC metadata.xml 535 RMD160 c99ee40df2a1ff8e640e37e97bc26aafd7c95935 SHA1 0aa73584b27064001bad7f76ebaf799947c03bb8 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2SM3oACgkQCaWpQKGI+9SrngCdHrfLRhXfq+hB/C9sLseZG6gq
-FFYAnAheu5OxpZpIwEIOwYNsWx92jlU9
-=hbBl
+iEYEARECAAYFAk2tMEsACgkQ1fmVwcYIWAamgwCgrYelX3U/w8UyknbgoaaXwpRl
+CtMAn0gXHTOqOfa5o+wBZMwnrzHZN7TO
+=lUoS
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/files/gnucash-2.4.5-link-system-libs.patch b/app-office/gnucash/files/gnucash-2.4.5-link-system-libs.patch
new file mode 100644
index 000000000000..9f08deb69703
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.4.5-link-system-libs.patch
@@ -0,0 +1,14 @@
+Gentoo bug: #359033
+
+Avoid linking against system's. Gnucash-2.2.9 didn't have gnc_html_new, gnc_html_copy and gnc_html_export symbol.
+
+--- a/src/bin/Makefile.am	2011-04-19 00:04:59.000000000 +0200
++++ b/src/bin/Makefile.am	2011-04-19 00:03:27.000000000 +0200
+@@ -67,6 +67,7 @@
+   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
+   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+   ${top_builddir}/src/gnc-module/libgnc-module.la \
++  ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
+   ${GUILE_LIBS} \
+   ${GLIB_LIBS} \
+   ${GNOME_LIBS} \
diff --git a/app-office/gnucash/gnucash-2.4.5.ebuild b/app-office/gnucash/gnucash-2.4.5.ebuild
new file mode 100644
index 000000000000..40d0d07817b4
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.4.5.ebuild
@@ -0,0 +1,147 @@
+# 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.5.ebuild,v 1.1 2011/04/19 06:48:37 eva Exp $
+
+EAPI="3"
+PYTHON_DEPEND="python? 2:2.4"
+
+inherit autotools eutils gnome2 python
+
+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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~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/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? ( >=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} )"
+#ELTCONF="--patch-only"
+
+# 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
+		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"
+
+	# Do not relink to system libraries, bug #XXX
+	epatch "${FILESDIR}/${PN}-2.4.5-link-system-libs.patch"
+
+	intltoolize --force --copy --automake || die
+	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}
+#	prepalldocs
+	mv "${ED}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
+	dodoc "${T}"/cantuseprepalldocs/* || die
+	find "${ED}" -name '*.la' -delete || die
+}