--- gnucash-3.8b-r1.ebuild	2020-07-03 16:21:22.027804493 +0200
+++ gnucash-4.0.ebuild	2020-07-03 16:21:23.666804411 +0200
@@ -5,6 +5,9 @@
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
+# The generated .go files from guile can't be stripped.
+RESTRICT="strip"
+
 inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="A personal finance manager"
@@ -27,13 +30,12 @@
 # libdbi version requirement for sqlite taken from bug #455134
 #
 # dev-libs/boost must always be built with nls enabled.
-# guile[deprecated] because of SCM_LIST*() use.
 # net-libs/aqbanking dropped gtk with v6, so to simplify the dependency,
 # we just rely on that.
 RDEPEND="
 	>=dev-libs/glib-2.46.0:2
 	>=dev-libs/libxml2-2.7.0:2
-	>=dev-scheme/guile-2.2.0:12=[deprecated,regex]
+	>=dev-scheme/guile-2.2.0:12=[regex]
 	>=sys-libs/zlib-1.1.4
 	dev-libs/boost:=[icu,nls]
 	dev-libs/icu:=
@@ -103,15 +105,21 @@
 
 	# Fix tests writing to /tmp
 	local fixtestfiles=(
-		"${S}"/gnucash/report/report-system/test/test-commodity-utils.scm
-		"${S}"/gnucash/report/report-system/test/test-extras.scm
-		"${S}"/gnucash/report/report-system/test/test-report-html.scm
-		"${S}"/gnucash/report/report-system/test/test-report-system.scm
-		"${S}"/libgnucash/backend/xml/test/test-xml-pricedb.cpp
-		"${S}"/libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		gnucash/report/test/test-report-html.scm
+		gnucash/report/reports/standard/test/test-invoice.scm
+		gnucash/report/reports/standard/test/test-new-owner-report.scm
+		gnucash/report/reports/standard/test/test-owner-report.scm
+		gnucash/report/reports/standard/test/test-transaction.scm
+		gnucash/report/reports/standard/test/test-portfolios.scm
+		gnucash/report/reports/standard/test/test-charts.scm
+		gnucash/report/test/test-report.scm
+		gnucash/report/test/test-commodity-utils.scm
+		gnucash/report/test/test-report-extras.scm
+		libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+		libgnucash/backend/xml/test/test-xml-pricedb.cpp
 	)
 	for x in "${fixtestfiles[@]}"; do
-		sed -i -e "s|\"/tmp/|\"${T}/|g" "${x}" || die "sed of "${x}" failed"
+		sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
 	done
 }
 
@@ -170,17 +178,12 @@
 src_install() {
 	cmake-utils_src_install
 
-	rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt
-
 	if use examples ; then
 		docompress -x /usr/share/doc/${PF}/examples
 	else
 		rm -r "${ED}"/usr/share/doc/${PF}/examples
 	fi
 
-	use aqbanking && dodoc doc/README.HBCI
-	use ofx && dodoc doc/README.OFX
-
 	if use python ; then
 		python_optimize
 		python_optimize "${ED}"/usr/share/gnucash/python