Version bump, drop old (#525172)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 38 insertions, 12 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/Manifest b/app-office/gnucash/Manifest
index 88247ce4d8f9..290dfa48934c 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnucash-2.6.1.tar.bz2 10944714 SHA256 c9e66f84c7706e3c8e7a1c88dcd58c5c3d102e285012b51f5af25052502cd8a4 SHA512 55dade97243ac9a10aaeca8950faf8732c44022d73ca8b0e6059830ea2b8a3033f2795da009133b55c0d652f9c0c4f6346791f849fd98e1083b6525973d119e6 WHIRLPOOL 8dce1abc93d7560b6121519abd97bad2ad2262f24214ced70ebb4f5cd9b1d223db873d803e15cf375d85d2d44261bcba9221e7c5230260b61b0e7d5473199f6a
+AUX gnucash-2.6.4-guile1.patch 554 SHA256 9dbacafb15e3ceb86dbed365102f98c425d36bc179c85cef9135494be45a7f52 SHA512 70121ec3e050d0f38abfa5481b187e9f94d8fa3f49155f79edbf3bef320fa0f586038b1f76fea9c56ac22c6d270baf4fb5ec354abb78e375ee55562deb093f5d WHIRLPOOL 8e882bb98344fc71570210acb32143ac631959e0bf2b37a2bdcd46160ac2225c8672bf0917e4c3230e3dc93f585429ad61aeeed56f1078b38e8005075a8fe423
 DIST gnucash-2.6.3.tar.bz2 10822437 SHA256 02104c1d6a563d1209e2116dcca7fa9e28445b0e3335bedbcae85c834b17d93f SHA512 8d3ab3a4af4e3810ea1782ad55a7e4d9ba4eaa41686f48df454b52aededdad43cd2b3edfd813ec6ad7c2bc59eb3c579781125456255f232aba86ad5d462509aa WHIRLPOOL 984d8e218e383b5329649cba01c9bf70d5895c343e3ff601e68c6c0194dab9d6ca6a82a11e48d5e36a5dc7549974ef90b913c922485bf33d496b6e942d0029b2
-EBUILD gnucash-2.6.1.ebuild 3157 SHA256 eadd60a5ac439fed076625e7fa67435fdcfec6d5b0c717b6c5681f3172c8e2d2 SHA512 558f34d1ad03a9bd91e0068d4bf6c041a72a0537804f0ebbb935cea0f62d5eabbf4a897bd8a084415912795dbf2362239fa57571e86f083505678cceccaa18f9 WHIRLPOOL 3cfb11eb4e3f249b47939d2978c40126bcab28e59a9418ee981413f605fe46bbe0814266ec571f624100637e36db2694bf1ccb3161a65702cf22c64fbe9642b8
+DIST gnucash-2.6.4.tar.bz2 12107953 SHA256 0320e4c62a741795648929fd211aca7e816d22b48bc7c54226c99b02c56e34bc SHA512 e1c5e293af9ee8841ad2678374b5550e3672551d660dae336088287fe6a814800f9019697f78d72ab5c29c83daa92247c1f50c71b668f5ca9d52125c7e0e88ce WHIRLPOOL 23df8663285957b2af96123eb2d45bf2119dd090ab980a233cc859e8631416d2212cb31ad4f7b8998e4869e503659f1410e35f2b1f7a96e5d70acb663a4e15f9
 EBUILD gnucash-2.6.3.ebuild 3252 SHA256 7afae6fd397fec17ef7fb60b6b2cf7036b5165252f53fa80295bbc375ab7169e SHA512 af29ba8cc3c6a2d3520fd704dc0d5ac302a45b72359121a383cdefc7a63571721fd59f1f184b3383f185f600bac63adbf41ffd7a84cb243086afa54e628119ae WHIRLPOOL 0d0e5a99aa67d63b5c0d8ca92c620c6bf07b63bc23952808896733b5549d3b5f18f5f4f32a29698e31cb13848f879e5687ee66699879a5e685fafe04248f0dd0
-MISC ChangeLog 40564 SHA256 d7698744cace64c004d188373ff031fca9fcde4d50e9ace46385c2a9125b8503 SHA512 c91674ee8454b5f098fba2f6a94bbd07d5f8614e677b9d672b81f35d703b03fdfab7958a8b55e223a998ebabec3bb506f98285d3c3868f69e388b9ad978c3b8b WHIRLPOOL ce8fe038b45f45439a85dad15815d09c728d7fb506cf9b89ca5b593f11e050bf06e5bca009c2a4ac29cc7fee6aaa271e5b828b09ff42f50214a6097c55ca5fea
+EBUILD gnucash-2.6.4.ebuild 3374 SHA256 56374d5b970e9b808870eb1c02c3cf6a5347554d373741945e9faa77f358b3fe SHA512 cc88b211aa5cf1df87d6908b61c0b0d5bc7b6373acbdd37c2d7483d949205768971f15695dbab4943d4e3d23b9a67cb124823e32ded36ee00cc943ed925b351f WHIRLPOOL 2bd2e95646a64c6d0390c0e54b8d18bbd5194207f46ac4986e91441b2394623e7700c6d484cca7395be41a02ce3b111c4d8964c61ea8a57b73ede67ad563e59f
+MISC ChangeLog 40759 SHA256 50935484bf8b55af0c4cd34f4305605b8a223fae19dcc9614d0d0c5c7aba71b3 SHA512 8d0534cf0f267267c98be0d8346e29baa9f372b580056344d0063fdb815ac190c320ab9d02dbffb28b238e2e3f92c641fb35b852a9440b288e6b80ed178ae5ae WHIRLPOOL 33de62652c79fde73fda89c4b17a207dd9cd6bfec8bad23da6d2eaecd13ae67938928ca5347714f5a744c29bd54b3ca79965aa1f5d9204ffe982b671ba099e9d
 MISC metadata.xml 413 SHA256 f22996163e813e8746be2856383a69d894ac774a060312684b87119a5b37d019 SHA512 f8a77b7f9105f63d3d33493467205e4ab676b6ad22dc709f9a7c8cee498b7f290f6abd2b3e5660ef58dbb07647bb0f1ccc6aa444285cef23ac695acb402aaaa9 WHIRLPOOL 31f3c40766b30d76e24514ba2c38800d6bf4a1c66be5fc7963f9b07d4a8e4c0eba3c1ade0805a11e6a899225932c9597776765e84d8cd05ccb69fb3299dd1c04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlNmLgEACgkQCaWpQKGI+9S/rgCgg531OOrMKxiAilSZOCOYkI5+
-yJMAn3zxMMSkfeJzRZn8++6he6c4zAaA
-=dEqi
+iEYEAREIAAYFAlQ9C58ACgkQCaWpQKGI+9T8aQCcDw9r/kVxFOe46ekma9zTWY03
+VaoAnRR7h8TuUzkdrYjE2vDLiglxbPis
+=eo6R
 -----END PGP SIGNATURE-----
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
 }