permanent buildfix for gnucash with guile-2

3 files changed, 177 insertions, 9 deletions

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 122d9011..a04c65d6 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1 +1 @@
-DIST gnucash-2.6.12.tar.bz2 13549926 SHA256 371fe9af3ec4b5d6839722b07c9064a51cfe247511edaa6286fc82710f700475 SHA512 3abf6f27413e087b2d4242772cdae87c9f13c1c952ccc0b79cb262baa0c076ee4fe227458346ece3967d1e1158aa38db3ec5dfb20db27050e4580e7762854993 WHIRLPOOL fd6a0c66e394e1e80fe95630dae930c86d05e18aa89b298d862089802438080ac1997d9edb1d159868efd664f839158edc4eeb99e6484cbb142ca97b6ac94a9d
+DIST gnucash-2.6.13.tar.bz2 13564015 SHA256 0fe3c12c849cddee502da07edc8e3db286d32333f4e7cb327bed735f480ee735 SHA512 daad6d55485de6ce3ca6affe232c51252d853c803734f4737ab2477e7724c42fa2ea764f5fdeea00d956bcbaad338a30fe21c62a578a818d5e8b4f5878f060b5 WHIRLPOOL 6f1ed3e9eaf9e80e8131fc48ff5480790a15093f1d2ab9b2c074644feb3c4d5db60315ba9e480f9697c21f0be7908f922ceff51a284632d65eb4fa7bda551e3b
diff --git a/app-office/gnucash/files/guile2.patch b/app-office/gnucash/files/guile2.patch
new file mode 100644
index 00000000..638a4b36
--- /dev/null
+++ b/app-office/gnucash/files/guile2.patch
@@ -0,0 +1,172 @@
+--- a/src/report/report-system/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/report-system/Makefile.am	2016-08-08 16:33:28.500840868 +0200
+@@ -119,6 +119,7 @@
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/scm \
++  --guile-load-dir ${top_builddir}/src/report/report-system \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+   --library-dir    ${top_builddir}/src/engine \
+   --library-dir    ${top_builddir}/src/app-utils \
+--- a/src/report/standard-reports/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/standard-reports/Makefile.am	2016-08-08 16:41:14.693405600 +0200
+@@ -81,12 +81,14 @@
+   --gnc-module-dir ${top_builddir}/src/gnome-utils \
+   --gnc-module-dir ${top_builddir}/src/html \
+   --gnc-module-dir ${top_builddir}/src/report/report-system \
++  --gnc-module-dir ${top_builddir}/src/report/standard-reports \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+   --guile-load-dir ${top_builddir}/src/engine \
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/report/report-system \
++  --guile-load-dir ${top_builddir}/src/report/standard-reports \
+   --guile-load-dir ${top_builddir}/src/scm \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+   --library-dir    ${top_builddir}/src/engine \
+@@ -97,7 +99,8 @@
+   --library-dir    ${top_builddir}/src/backend/xml \
+   --library-dir    ${top_builddir}/src/backend/sql \
+   --library-dir    ${top_builddir}/src/html \
+-  --library-dir    ${top_builddir}/src/report/report-system
++  --library-dir    ${top_builddir}/src/report/report-system \
++  --library-dir    ${top_builddir}/src/report/standard-reports
+ 
+ %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ 	GNC_UNINSTALLED=yes \
+--- a/src/report/business-reports/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/business-reports/Makefile.am	2016-08-08 18:45:04.778463532 +0200
+@@ -51,6 +51,7 @@
+   --gnc-module-dir ${top_builddir}/src/html \
+   --gnc-module-dir ${top_builddir}/src/report/report-system \
+   --gnc-module-dir ${top_builddir}/src/report/standard-reports \
++  --gnc-module-dir ${top_builddir}/src/report/business-reports \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+   --guile-load-dir ${top_builddir}/src/engine \
+@@ -58,6 +59,7 @@
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/report/report-system \
+   --guile-load-dir ${top_builddir}/src/report/standard-reports \
++  --guile-load-dir ${top_builddir}/src/report/business-reports \
+   --guile-load-dir ${top_builddir}/src/scm \
+   --library-dir    ${top_builddir}/src/engine \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+@@ -68,7 +70,8 @@
+   --library-dir    ${top_builddir}/src/backend/sql \
+   --library-dir    ${top_builddir}/src/html \
+   --library-dir    ${top_builddir}/src/gnc-module \
+-  --library-dir    ${top_builddir}/src/report/report-system
++  --library-dir    ${top_builddir}/src/report/report-system \
++  --library-dir    ${top_builddir}/src/report/business-reports
+ 
+ 
+ %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+--- a/src/report/utility-reports/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/utility-reports/Makefile.am	2016-08-08 18:42:29.714930181 +0200
+@@ -53,12 +53,14 @@
+   --gnc-module-dir ${top_builddir}/src/gnome-utils \
+   --gnc-module-dir ${top_builddir}/src/html \
+   --gnc-module-dir ${top_builddir}/src/report/report-system \
++  --gnc-module-dir ${top_builddir}/src/report/utility-reports \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+   --guile-load-dir ${top_builddir}/src/engine \
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/report/report-system \
++  --guile-load-dir ${top_builddir}/src/report/utility-reports \
+   --guile-load-dir ${top_builddir}/src/scm \
+   --library-dir    ${top_builddir}/src/engine \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+@@ -69,7 +71,8 @@
+   --library-dir    ${top_builddir}/src/backend/xml \
+   --library-dir    ${top_builddir}/src/backend/sql \
+   --library-dir    ${top_builddir}/src/html \
+-  --library-dir    ${top_builddir}/src/report/report-system
++  --library-dir    ${top_builddir}/src/report/report-system \
++  --library-dir    ${top_builddir}/src/report/utility-reports
+ 
+ %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ 	GNC_UNINSTALLED=yes \
+--- a/src/report/locale-specific/us/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/locale-specific/us/Makefile.am	2016-08-08 18:54:37.061288131 +0200
+@@ -58,6 +58,7 @@
+   --gnc-module-dir ${top_builddir}/src/gnome-utils \
+   --gnc-module-dir ${top_builddir}/src/html \
+   --gnc-module-dir ${top_builddir}/src/report/report-system \
++  --gnc-module-dir ${top_builddir}/src/report/locale-specific/us \
+   --gnc-module-dir ${top_builddir}/src/tax/us \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+@@ -65,6 +66,7 @@
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/report/report-system \
++  --guile-load-dir ${top_builddir}/src/report/locale-specific/us \
+   --guile-load-dir ${top_builddir}/src/scm \
+   --guile-load-dir ${top_builddir}/src/tax/us \
+   --library-dir    ${top_builddir}/src/engine \
+@@ -76,7 +78,8 @@
+   --library-dir    ${top_builddir}/src/backend/xml \
+   --library-dir    ${top_builddir}/src/backend/sql \
+   --library-dir    ${top_builddir}/src/html \
+-  --library-dir    ${top_builddir}/src/report/report-system
++  --library-dir    ${top_builddir}/src/report/report-system \
++  --library-dir    ${top_builddir}/src/report/locale-specific/us
+ 
+ %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ 	GNC_UNINSTALLED=yes \
+--- a/src/report/stylesheets/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/report/stylesheets/Makefile.am	2016-08-08 19:18:06.940583895 +0200
+@@ -68,12 +68,14 @@
+   --gnc-module-dir ${top_builddir}/src/html \
+   --gnc-module-dir ${top_builddir}/src/gnome-utils \
+   --gnc-module-dir ${top_builddir}/src/report/report-system \
++  --gnc-module-dir ${top_builddir}/src/report/stylesheets \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+   --guile-load-dir ${top_builddir}/src/engine \
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/gnome-utils \
+   --guile-load-dir ${top_builddir}/src/report/report-system \
++  --guile-load-dir ${top_builddir}/src/report/stylesheets \
+   --guile-load-dir ${top_builddir}/src/scm \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+   --library-dir    ${top_builddir}/src/engine \
+@@ -84,7 +86,8 @@
+   --library-dir    ${top_builddir}/src/backend/xml \
+   --library-dir    ${top_builddir}/src/backend/sql \
+   --library-dir    ${top_builddir}/src/html \
+-  --library-dir    ${top_builddir}/src/report/report-system
++  --library-dir    ${top_builddir}/src/report/report-system \
++  --library-dir    ${top_builddir}/src/report/stylesheets
+ 
+ %.go : %.scm .scm-links $(pkglib_LTLIBRARIES)
+ 	GNC_UNINSTALLED=yes \
+--- a/src/engine/test/Makefile.am	2016-05-29 18:25:33.000000000 +0200
++++ b/src/engine/test/Makefile.am	2016-08-08 19:42:14.220035162 +0200
+@@ -64,18 +64,21 @@
+   --gnc-module-dir ${top_builddir}/src/engine \
+   --gnc-module-dir ${top_builddir}/src/engine/test \
+   --gnc-module-dir ${top_builddir}/src/app-utils \
++  --gnc-module-dir ${top_builddir}/src/engine/test \
+   --guile-load-dir ${top_builddir}/src/gnc-module \
+   --guile-load-dir ${top_builddir}/src/engine \
+   --guile-load-dir ${top_builddir}/src/app-utils \
+   --guile-load-dir ${top_builddir}/src/core-utils \
+   --guile-load-dir ${top_builddir}/src/scm \
++  --guile-load-dir ${top_builddir}/src/engine/test \
+   --library-dir    ${top_builddir}/src/libqof/qof \
+   --library-dir    ${top_builddir}/src/core-utils \
+   --library-dir    ${top_builddir}/src/gnc-module \
+   --library-dir    ${top_builddir}/src/engine \
+   --library-dir    ${top_builddir}/src/app-utils \
+   --library-dir    ${top_builddir}/src/backend/xml \
+-  --library-dir    ${top_builddir}/src/backend/sql
++  --library-dir    ${top_builddir}/src/backend/sql \
++  --library-dir    ${top_builddir}/src/engine/test
+ 
+ $(SCM_TESTS): %: $(srcdir)/%.scm Makefile .scm-links
+ 	echo '${GUILE} --debug -l $(srcdir)/$*.scm -c "(exit (run-test))"' > $@
diff --git a/app-office/gnucash/gnucash-2.6.12.ebuild b/app-office/gnucash/gnucash-2.6.13-r1.ebuild
index b5eca4aa..91611653 100644
--- a/app-office/gnucash/gnucash-2.6.12.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 ~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[deprecated,regex]
+	>=dev-scheme/guile-2[deprecated,regex]
 	dev-scheme/guile-www
 	gnome-base/libgnomecanvas
 	>=net-libs/webkit-gtk-1.2:2
@@ -62,6 +62,7 @@ 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
+	epatch "${FILESDIR}/guile2.patch"
 	gnome2_src_prepare
 }
 
@@ -83,7 +84,7 @@ src_configure() {
 		$(use_enable ofx) \
 		$(use_enable hbci aqbanking) \
 		$(use_enable python) \
-		--with-guile=auto \
+		--with-guile=2.0 \
 		--disable-doxygen \
 		--disable-gtkmm \
 		--enable-locale-specific-tax \
@@ -104,9 +105,4 @@ src_install() {
 	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/*
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=766960
-	sed -i 's/exec gnucash-env [^[:space:]]*/exec gnucash-env guile/g' \
-		"${ED}/usr/libexec/gnucash/overrides/gnucash-make-guids" || die
-	rm -f "${ED}/usr/libexec/gnucash/overrides/guile" || die
 }