[gentoo-commits] repo/gentoo:master commit in: app-office/gnucash/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     39829b64674ad9a7344a6c6f780a9ff2a479ae8a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 20:40:46 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 20:43:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39829b64

app-office/gnucash: version bump to guile-2 support

Gentoo-bug: 590536

Package-Manager: portage-2.3.1

 .../{gnucash-2.6.13.ebuild => gnucash-2.6.13-r1.ebuild}    | 14 ++++----------
 app-office/gnucash/gnucash-2.6.13.ebuild                   |  3 ++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app-office/gnucash/gnucash-2.6.13.ebuild b/app-office/gnucash/gnucash-2.6.13-r1.ebuild
similarity index 90%
copy from app-office/gnucash/gnucash-2.6.13.ebuild
copy to app-office/gnucash/gnucash-2.6.13-r1.ebuild
index c18747d..1742f5d 100644
--- a/app-office/gnucash/gnucash-2.6.13.ebuild
+++ b/app-office/gnucash/gnucash-2.6.13-r1.ebuild
@@ -14,7 +14,7 @@ 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 gnome-keyring hbci mysql ofx postgres python quotes sqlite"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
@@ -24,7 +24,7 @@ RDEPEND="
 	>=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-2.0.0:12[deprecated,regex]
 	dev-scheme/guile-www
 	gnome-base/libgnomecanvas
 	>=net-libs/webkit-gtk-1.2:2
@@ -83,23 +83,17 @@ src_configure() {
 		$(use_enable ofx) \
 		$(use_enable hbci aqbanking) \
 		$(use_enable python) \
-		--with-guile=1.8 \
 		--disable-doxygen \
 		--disable-gtkmm \
 		--enable-locale-specific-tax \
 		--disable-error-on-warning \
+		--with-guile=2.0 \
 		${myconf}
 }
 
-src_test() {
-	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}
+	gnome2_src_install -j1 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

diff --git a/app-office/gnucash/gnucash-2.6.13.ebuild b/app-office/gnucash/gnucash-2.6.13.ebuild
index c18747d..2fe1efc 100644
--- a/app-office/gnucash/gnucash-2.6.13.ebuild
+++ b/app-office/gnucash/gnucash-2.6.13.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	>=dev-libs/libxml2-2.5.10:2
 	dev-libs/libxslt
 	>=dev-scheme/guile-1.8.3:12[deprecated,regex]
+	<dev-scheme/guile-2:12
 	dev-scheme/guile-www
 	gnome-base/libgnomecanvas
 	>=net-libs/webkit-gtk-1.2:2
@@ -83,11 +84,11 @@ src_configure() {
 		$(use_enable ofx) \
 		$(use_enable hbci aqbanking) \
 		$(use_enable python) \
-		--with-guile=1.8 \
 		--disable-doxygen \
 		--disable-gtkmm \
 		--enable-locale-specific-tax \
 		--disable-error-on-warning \
+		--with-guile=1.8 \
 		${myconf}
 }