Version bump, drop old (#525172)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 30 insertions, 5 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 422ed69c2a35..8ac1143efff5 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.282 2014/05/04 12:09:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.283 2014/10/14 11:40:13 pacho Exp $
+
+*gnucash-2.6.4 (14 Oct 2014)
+
+  14 Oct 2014; Pacho Ramos <pacho@gentoo.org> +files/gnucash-2.6.4-guile1.patch,
+  +gnucash-2.6.4.ebuild, -gnucash-2.6.1.ebuild:
+  Version bump, drop old (#525172)
 
   04 May 2014; Pacho Ramos <pacho@gentoo.org> gnucash-2.6.3.ebuild:
   x86 stable, bug 508862
diff --git a/app-office/gnucash/files/gnucash-2.6.4-guile1.patch b/app-office/gnucash/files/gnucash-2.6.4-guile1.patch
new file mode 100644
index 000000000000..4cd557df1a24
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.6.4-guile1.patch
@@ -0,0 +1,13 @@
+--- gnucash-2.6.4/configure.ac	2014-09-28 02:11:31.000000000 +0200
++++ gnucash-2.6.4.patche/configure.ac	2014-10-01 23:55:11.095602881 +0200
+@@ -463,7 +463,9 @@
+                   [guile-1.8 >= 1.8.5],
+                   [m4_ifdef([GUILE1_8_PROGS],
+                             [ GUILE1_8_PROGS ],
+-                            [ GUILE_PROGS ])
++                            [ m4_ifdef([GUILE1_PROGS],
++				       [ GUILE1_PROGS ],
++				       [ GUILE_PROGS ])])
+                   ], [
+   PKG_CHECK_MODULES(GUILE,
+                   [guile-2.0 >= 2.0.0],
diff --git a/app-office/gnucash/gnucash-2.6.1.ebuild b/app-office/gnucash/gnucash-2.6.4.ebuild
index f51b21c227b7..e61da79aba0e 100644
--- a/app-office/gnucash/gnucash-2.6.1.ebuild
+++ b/app-office/gnucash/gnucash-2.6.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.1.ebuild,v 1.8 2014/03/09 11:54:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.4.ebuild,v 1.1 2014/10/14 11:40:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit autotools gnome2 python-single-r1 eutils
+inherit autotools eutils gnome2 python-single-r1
 
 DESCRIPTION="A personal finance manager"
 HOMEPAGE="http://www.gnucash.org/"
@@ -14,12 +14,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
 # libdbi version requirement for sqlite taken from bug #455134
 RDEPEND="
+	>=app-crypt/libsecret-0.18
 	>=dev-libs/glib-2.32.0:2
 	>=dev-libs/popt-1.5
 	>=dev-libs/libxml2-2.5.10:2
@@ -28,7 +29,6 @@ RDEPEND="
 	dev-scheme/guile-www
 	>=dev-scheme/slib-3.1.4
 	gnome-base/libgnomecanvas
-	gnome-base/libgnome-keyring
 	>=net-libs/webkit-gtk-1.2:2
 	>=sys-libs/zlib-1.1.4
 	>=x11-libs/gtk+-2.24:2
@@ -63,6 +63,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix build with guile-1 (from 'master')
+	epatch "${FILESDIR}"/${PN}-2.6.4-guile1.patch
+
+	# Skip test that needs some locales to be present
+	sed -i -e '/test_suite_gnc_date/d' src/libqof/qof/test/test-qof.c || die
+
 	eautoreconf
 	gnome2_src_prepare
 }