4 files changed, 9 insertions, 263 deletions
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index e660c4ae5c12..86230ffbf069 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.290 2015/04/08 07:30:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.291 2015/05/17 09:12:55 pacho Exp $
+
+  17 May 2015; Pacho Ramos <pacho@gentoo.org> -gnucash-2.6.3.ebuild,
+  -gnucash-2.6.4.ebuild:
+  drop old
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> gnucash-2.6.3.ebuild,
   gnucash-2.6.4.ebuild, gnucash-2.6.5.ebuild:
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index bd303a6e83a3..fe10500db49b 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -2,30 +2,14 @@
 Hash: SHA256
 
 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
-DIST gnucash-2.6.4.tar.bz2 12107953 SHA256 0320e4c62a741795648929fd211aca7e816d22b48bc7c54226c99b02c56e34bc SHA512 e1c5e293af9ee8841ad2678374b5550e3672551d660dae336088287fe6a814800f9019697f78d72ab5c29c83daa92247c1f50c71b668f5ca9d52125c7e0e88ce WHIRLPOOL 23df8663285957b2af96123eb2d45bf2119dd090ab980a233cc859e8631416d2212cb31ad4f7b8998e4869e503659f1410e35f2b1f7a96e5d70acb663a4e15f9
 DIST gnucash-2.6.5.tar.bz2 12997511 SHA256 b1b1a943a322e7bf7afb0c2202f491560d4734a2036438bf9820378c34203d65 SHA512 f45daa5a894f8cbe9ea552ccb354b08a4967f0a0f14595b871169a2a48495664a06e0f3dd81b6148b261418b67b76ae4e0ee3e72ec52ff3016c7f15523862538 WHIRLPOOL 38bdd5afec3337f929e4694dea072675baab86a68b730c0fc96c07c7287b0765140514ffd2c241784d857e7eba3d7bdbbf2b3c17f99d881d58095d68282b5d47
-EBUILD gnucash-2.6.3.ebuild 3247 SHA256 7fe307238dcd65a8e4035ba8c84db4fbfdeb896af0f010f0300b07664c51cb4f SHA512 fb22cfac782788a9b9a681e805a9fc81ca51ae512b6accf3f6cfb417d3b240cb0ffffb729663a4fd5c1cd6a8aa69ec0e6d84686aee26ec77a965495cb8e67694 WHIRLPOOL ccd8be63e2f21686dda460102bab7a349d12897341e272652c70ad1a983eb25bfaceffbb235a8e43996a367417baa70b91426a7aaefc6c9f957165b30f0b38d7
-EBUILD gnucash-2.6.4.ebuild 3342 SHA256 68d61af6142dd570eeaaf176db72d99dc88fb359c33f384eee128d3d2f21188e SHA512 0515bbff2dc986903ffd95e9e62d33bf4e239485f6a12049218e2293ef506a6d70c174dc4cd4f7c9afba007b0c935a4d29fae802d748b05e57a1f22ce11d7e33 WHIRLPOOL b3287792d03adb0b01ca149cabe2b14372780de5cae69ca832af57ab9dea9f0f5f8da7528dc3e69abe53eecbc19e6d7a05378e5c723effe49bd274d3439caa9d
 EBUILD gnucash-2.6.5.ebuild 3252 SHA256 93f2b5f4ee7c071236593bb387a62bcc31274042ae6376963782968879a29b02 SHA512 c6c34e8b5d626f8e33ea558af9a68dae508164b0962b04e2da2b97cee415a1a2ab1a219731c90686f6bed6bc54434b8a14e010c94d3cb8c2f5492dab2b8b3d9e WHIRLPOOL 1f4c88b4b06b2b5c2a79828bffcfc026445ee5ce5345bf8b0d8c69d4d34f0a12b35acf9304db61ca6955d8db24eae9a9a99c51dc5464d4f29049e0b53065e9f1
-MISC ChangeLog 41604 SHA256 9ce68df0795b419673a959fbeb0be30d74214b45bb5c15acd8ecf70a3f0006af SHA512 8fecd853fe3be1f43b684ee339b83e36a038ae832f7245229a71a10f68cb0ed3b49dd5bf056410c7970942856f6c5ad3475519765d6f6ad56940a67b45e4e411 WHIRLPOOL ed7608a871f57d01f222387790b8e72f513d69d4489d83156ac134431dcc7b76326491568f9a0756e4513ac6f98cfd4591931ce4b227a7a573bebfd782bf20a0
+MISC ChangeLog 41709 SHA256 7c65fb19cfd7285b1932cccaa6dc664219379f80e99c6842892b8a9c381f4d10 SHA512 62ab158c9b309b6c202a3d487f70d229b5219c8a1dfd21de2ad23ab6b70c07c6dfcad7c8d6f86019ee5a98ce2dfb305c6583e594fc93089ea76c5a21e8e3d091 WHIRLPOOL 7bd50d544aa5f3a27ffe8c1dda4720e39bf208ceaa9447b88c9b2e7e005d4e6ab15af03261d117eeb29a51dc28318e4d639d60f7fd174e69a462c9b436aac9c6
 MISC metadata.xml 413 SHA256 f22996163e813e8746be2856383a69d894ac774a060312684b87119a5b37d019 SHA512 f8a77b7f9105f63d3d33493467205e4ab676b6ad22dc709f9a7c8cee498b7f290f6abd2b3e5660ef58dbb07647bb0f1ccc6aa444285cef23ac695acb402aaaa9 WHIRLPOOL 31f3c40766b30d76e24514ba2c38800d6bf4a1c66be5fc7963f9b07d4a8e4c0eba3c1ade0805a11e6a899225932c9597776765e84d8cd05ccb69fb3299dd1c04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJNl8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8YUQAKFExxTbfqMhOY5EEUgIFXjc
-0g/E+ddkvINBxfQAeK8Lhdebi1Jabw5vyM32JEr7cvGDgI4BVqVqL3YFk4It754/
-iisW9WTU4OIgHz1Xh3O4rpk9vGGyb8pkR98RjWi3q+ch8nY9ezbkaKQVgLtOvftV
-Z/gJG0z2kueDckAEimBwUnEa8y0d14d/wqMiVy9WYmlIxaT7wQhgquaS0UMZuZSO
-UZdf4AMJ/Y7769HvUvLOCb4tKPZLSjr3BYlccd0eF+T/q2Vj/a2Cc0Ql7/H6XwDX
-glG6ZPfs57CRHCKk+yrIPIUkpAHcpoVDBmaBwkgfTq9GHkyuo5oyjDuLkiAYAQtk
-rBeIv3sfYc7JxsxiHILWJdJhCMXx2GGekjZbUFelMo0FyPrn3XzoglOl8NoKREVb
-Uyq7KEfvrGtA15iaD9W20DE33C9bQS4GFQN66XUm4atIdyMrRO/mkOI2zRpvHf3f
-tn1ctlmYs5wEPVacHqA9dKjGNImOZ7jtcJArZpI9fyFBZr4/7Jz9FK2VitKZnTci
-W/9UwsUAVeH6tQJhdqvjyKlgXwgRLCJqoEEgpb7AVB2rfA+AyCwSvEvazdN7BiJe
-3fIdv2bVkVbsY2NEGO94fBLCP879VRGtxzP71YzC+LXpH/7wIFC3b3/t9ksl5KxC
-lIDhtUtRCh49q9pwHeSb
-=PMvz
+iEYEAREIAAYFAlVYW5gACgkQCaWpQKGI+9T8IACfaPcgZ1TmToSu/QtSddpq2eJh
+3nwAn35spMIQNqk7RhrSTfCrkhNRuAQk
+=d5Tn
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/gnucash-2.6.3.ebuild b/app-office/gnucash/gnucash-2.6.3.ebuild
deleted file mode 100644
index 29ad7bd4d4b8..000000000000
--- a/app-office/gnucash/gnucash-2.6.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.3.ebuild,v 1.4 2015/04/08 07:30:32 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-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 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="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libxml2-2.5.10:2
-	dev-libs/libxslt
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	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
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	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
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# 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
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# 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
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-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/*
-}
diff --git a/app-office/gnucash/gnucash-2.6.4.ebuild b/app-office/gnucash/gnucash-2.6.4.ebuild
deleted file mode 100644
index 8733362441fb..000000000000
--- a/app-office/gnucash/gnucash-2.6.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.6.4.ebuild,v 1.5 2015/04/08 07:30:32 mgorny Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-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 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
-	dev-libs/libxslt
-	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
-	dev-scheme/guile-www
-	gnome-base/libgnomecanvas
-	>=net-libs/webkit-gtk-1.2:2
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/goffice-0.7.0:0.8[gnome]
-	x11-libs/pango
-	ofx? ( >=dev-libs/libofx-0.9.1 )
-	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
-		sys-libs/gwenhywfar[gtk]
-		chipcard? ( sys-libs/libchipcard )
-	)
-	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
-		>=dev-perl/Finance-Quote-1.11
-		dev-perl/HTML-TableExtract )
-	sqlite? ( >=dev-db/libdbi-0.9.0
-		>=dev-db/libdbi-drivers-0.9.0[sqlite] )
-	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
-	virtual/pkgconfig
-	dev-util/intltool
-	gnome-base/gnome-common
-	sys-devel/libtool
-"
-
-PDEPEND="doc? ( >=app-doc/gnucash-docs-2.2.0 )"
-
-pkg_setup() {
-	use python && python-single-r1_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
-}
-
-src_configure() {
-	local myconf
-
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use sqlite || use mysql || use postgres ; then
-		myconf+=" --enable-dbi"
-	else
-		myconf+=" --disable-dbi"
-	fi
-
-	# 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
-
-	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable ofx) \
-		$(use_enable hbci aqbanking) \
-		$(use_enable python) \
-		--disable-doxygen \
-		--disable-gtkmm \
-		--enable-locale-specific-tax \
-		--disable-error-on-warning \
-		 GUILE_LIBS="${GUILE_LIBS}" ${myconf}
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	GUILE_WARN_DEPRECATED=no \
-	GNC_DOT_DIR="${T}"/.gnucash \
-	emake check
-}
-
-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/*
-}