Version bump, remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

5 files changed, 13 insertions, 123 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index ca4fd5f43f6e..11eaf94e9e7f 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.238 2011/05/22 18:23:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.239 2011/06/06 10:33:36 pacho Exp $
+
+*gnucash-2.4.6 (06 Jun 2011)
+
+  06 Jun 2011; Pacho Ramos <pacho@gentoo.org> -files/r18166-to-r18167.diff,
+  -gnucash-2.2.9-r3.ebuild, -gnucash-2.4.4.ebuild, +gnucash-2.4.6.ebuild,
+  -files/test-dbi-business-stuff.h:
+  Version bump, remove old.
 
   22 May 2011; Kacper Kowalik <xarthisius@gentoo.org> gnucash-2.4.5.ebuild:
   ppc stable wrt #344059
diff --git a/app-office/gnucash/files/r18166-to-r18167.diff b/app-office/gnucash/files/r18166-to-r18167.diff
deleted file mode 100644
index 4dcb47ba242d..000000000000
--- a/app-office/gnucash/files/r18166-to-r18167.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-bug 275413

-http://svn.gnucash.org/trac/changeset?format=diff&new=18167&old=18166

---- src/import-export/aqbanking/gnc-ab-transfer.c

-+++ src/import-export/aqbanking/gnc-ab-transfer.c

-@@ -237,4 +237,11 @@

-             context = AB_ImExporterContext_new();

- 

-+            gui = gnc_GWEN_Gui_get(parent);

-+            if (!gui) {

-+                g_warning("gnc_ab_maketrans: Couldn't initialize Gwenhywfar GUI");

-+                aborted = TRUE;

-+                goto repeat;

-+            }

-+

-             /* Finally, execute the job */

-             AB_Banking_ExecuteJobs(api, job_list, context, 0);

diff --git a/app-office/gnucash/files/test-dbi-business-stuff.h b/app-office/gnucash/files/test-dbi-business-stuff.h
deleted file mode 100644
index baafe95c0bf7..000000000000
--- a/app-office/gnucash/files/test-dbi-business-stuff.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _TEST_DBI_BUSINESS_STUFF_H_
-#define _TEST_DBI_BUSINESS_STUFF_H_
-void test_dbi_business_store_and_reload( const gchar* driver, QofSession* session_1, const gchar* url );
-#endif
diff --git a/app-office/gnucash/gnucash-2.2.9-r3.ebuild b/app-office/gnucash/gnucash-2.2.9-r3.ebuild
deleted file mode 100644
index 95b7aa62185b..000000000000
--- a/app-office/gnucash/gnucash-2.2.9-r3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.2.9-r3.ebuild,v 1.7 2011/05/07 18:36:24 armin76 Exp $
-
-EAPI=2
-
-inherit eutils gnome2
-
-DOC_VER="2.2.0"
-
-DESCRIPTION="A personal finance manager"
-HOMEPAGE="http://www.gnucash.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.lzma
-	mirror://gentoo/${P}-goffice.patch.gz
-	http://dev.gentoo.org/~tove/files/${P}-goffice.patch.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ~ppc64 x86"
-
-IUSE="+doc ofx debug quotes"
-
-# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
-
-RDEPEND=">=dev-libs/glib-2.6.3:2
-	>=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:2
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.4
-	>=gnome-extra/gtkhtml-3.14:3.14
-	>=dev-libs/libxml2-2.5.10:2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/goffice-0.6[gnome]
-	ofx? ( >=dev-libs/libofx-0.8.3 )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	media-libs/libart_lgpl
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/pkgconfig
-	dev-util/intltool
-	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"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable ofx)
-		--disable-aqbanking
-		--disable-doxygen
-		--enable-locale-specific-tax
-		--disable-error-on-warning"
-}
-
-src_unpack() {
-	unpack ${P}.tar.lzma
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/r18166-to-r18167.diff
-	epatch "${DISTDIR}"/${P}-goffice.patch.gz
-	gnome2_src_prepare
-}
-
-src_test() {
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check \
-	|| die "Make check failed. See above for details."
-}
-
-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}
-#	prepalldocs
-	mv "${D}"/usr/share/doc/${PF} "${T}"/cantuseprepalldocs || die
-	dodoc "${T}"/cantuseprepalldocs/* || die
-}
diff --git a/app-office/gnucash/gnucash-2.4.4.ebuild b/app-office/gnucash/gnucash-2.4.6.ebuild
index 4dfb70e0fca6..6052ef947f73 100644
--- a/app-office/gnucash/gnucash-2.4.4.ebuild
+++ b/app-office/gnucash/gnucash-2.4.6.ebuild
@@ -1,11 +1,13 @@
 # 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.4.ebuild,v 1.5 2011/05/07 18:36:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.6.ebuild,v 1.1 2011/06/06 10:33:36 pacho Exp $
 
 EAPI="3"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
 PYTHON_DEPEND="python? 2:2.4"
 
-inherit eutils gnome2 python
+inherit gnome2 python
 
 DOC_VER="2.2.0"
 
@@ -59,11 +61,6 @@ DEPEND="${RDEPEND}
 "
 
 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"
@@ -122,6 +119,7 @@ src_prepare() {
 }
 
 src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
 	GUILE_WARN_DEPRECATED=no \
 	GNC_DOT_DIR="${T}"/.gnucash \
 	emake check \
@@ -133,8 +131,6 @@ src_install() {
 	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
 }