finance/gnucash: Update to 5.0

5 files changed, 26 insertions, 261 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index f13d9fc41f50..430b7ad14334 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	gnucash
-PORTVERSION=	4.13
-PORTREVISION=	2
+PORTVERSION=	5.0
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -25,7 +24,7 @@ LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring \
 		libicudata.so:devel/icu\
 		libharfbuzz.so:print/harfbuzz
 RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww \
-		p5-Date-Manip>=0:devel/p5-Date-Manip \
+		p5-JSON-Parse>=0:devel/p5-JSON-Parse \
 		p5-Finance-Quote>=0:finance/p5-Finance-Quote \
 		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https
 
@@ -87,7 +86,7 @@ OFX_CMAKE_BOOL=		WITH_OFX
 OFX_LIB_DEPENDS=	libofx.so:finance/libofx
 OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.GnuCash.dialogs.import.ofx.gschema.xml
 PYTHON_CMAKE_BOOL=	WITH_PYTHON
-PYTHON_USES=		python:3.3+
+PYTHON_USES=		python:3.6+
 
 post-install-PYTHON-on:
 	@(cd ${STAGEDIR}${PREFIX} \
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 04c97f9881c4..a37808806425 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1671374630
-SHA256 (gnucash-4.13.tar.bz2) = 401a158086635ea17fbb145325558537289aa1d24d022f7c3317e12f3dabd8e7
-SIZE (gnucash-4.13.tar.bz2) = 14658572
+TIMESTAMP = 1679903331
+SHA256 (gnucash-5.0.tar.bz2) = cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824
+SIZE (gnucash-5.0.tar.bz2) = 14762814
diff --git a/finance/gnucash/files/patch-CMakeLists.txt b/finance/gnucash/files/patch-CMakeLists.txt
deleted file mode 100644
index a1c4ea51cbd0..000000000000
--- a/finance/gnucash/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig	2020-06-27 22:33:56 UTC
-+++ CMakeLists.txt
-@@ -562,9 +563,9 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
- set(CMAKE_C_EXTENSIONS ON)
- 
- if (UNIX)
--  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
-+  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
-   set( CMAKE_C_FLAGS "-Wno-error=deprecated-declarations -Wno-error=parentheses ${CMAKE_C_FLAGS}")
--  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
-+  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
-   set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
-   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
- endif()
diff --git a/finance/gnucash/files/patch-bindings_guile_gnc-engine-guile.c b/finance/gnucash/files/patch-bindings_guile_gnc-engine-guile.c
deleted file mode 100644
index 4fa32c1e1b31..000000000000
--- a/finance/gnucash/files/patch-bindings_guile_gnc-engine-guile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/guile/gnc-engine-guile.c.orig	2020-06-27 22:33:56 UTC
-+++ bindings/guile/gnc-engine-guile.c
-@@ -1900,6 +1900,8 @@ gnc_parse_time_to_time64 (const gchar *s, const gchar 
- 
-     g_return_val_if_fail(s && format, -1);
- 
-+    bzero(&tm, sizeof(tm));
-+
-     if (!strptime(s, format, &tm))
-         return -1;
- 
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 8d2cd779cb11..a38db7f21560 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -1,6 +1,4 @@
-bin/gnc-fq-check
-bin/gnc-fq-dump
-bin/gnc-fq-helper
+bin/finance-quote-wrapper
 bin/gnc-fq-update
 bin/gnucash
 bin/gnucash-cli
@@ -17,6 +15,7 @@ include/gnucash/SchedXaction.h
 include/gnucash/Scrub.h
 include/gnucash/Scrub2.h
 include/gnucash/Scrub3.h
+include/gnucash/ScrubBudget.h
 include/gnucash/ScrubBusiness.h
 include/gnucash/Split.h
 include/gnucash/TransLog.h
@@ -24,7 +23,6 @@ include/gnucash/Transaction.h
 include/gnucash/account-quickfill.h
 include/gnucash/assistant-xml-encoding.h
 include/gnucash/basiccell.h
-include/gnucash/business-options.h
 include/gnucash/cap-gains.h
 include/gnucash/cashobjects.h
 include/gnucash/cell-factory.h
@@ -39,7 +37,6 @@ include/gnucash/dialog-doclink-utils.h
 include/gnucash/dialog-dup-trans.h
 include/gnucash/dialog-file-access.h
 include/gnucash/dialog-object-references.h
-include/gnucash/dialog-options.h
 include/gnucash/dialog-preferences.h
 include/gnucash/dialog-query-view.h
 include/gnucash/dialog-reset-warnings.h
@@ -69,6 +66,7 @@ include/gnucash/gnc-cell-renderer-text-view.h
 include/gnucash/gnc-cell-view.h
 include/gnucash/gnc-commodity-edit.h
 include/gnucash/gnc-commodity.h
+include/gnucash/gnc-commodity.hpp
 include/gnucash/gnc-component-manager.h
 include/gnucash/gnc-currency-edit.h
 include/gnucash/gnc-date-delta.h
@@ -94,7 +92,6 @@ include/gnucash/gnc-gnome-utils.h
 include/gnucash/gnc-gsettings.h
 include/gnucash/gnc-gui-query.h
 include/gnucash/gnc-help-utils.h
-include/gnucash/gnc-helpers.h
 include/gnucash/gnc-hooks.h
 include/gnucash/gnc-html-extras.h
 include/gnucash/gnc-html-factory.h
@@ -112,6 +109,9 @@ include/gnucash/gnc-module-api.h
 include/gnucash/gnc-module.h
 include/gnucash/gnc-numeric.h
 include/gnucash/gnc-numeric.hpp
+include/gnucash/gnc-option.hpp
+include/gnucash/gnc-optiondb.h
+include/gnucash/gnc-optiondb.hpp
 include/gnucash/gnc-period-select.h
 include/gnucash/gnc-plugin-file-history.h
 include/gnucash/gnc-plugin-manager.h
@@ -121,9 +121,11 @@ include/gnucash/gnc-plugin.h
 include/gnucash/gnc-prefs-utils.h
 include/gnucash/gnc-pricedb.h
 include/gnucash/gnc-query-view.h
+include/gnucash/gnc-quotes.hpp
 include/gnucash/gnc-rational-rounding.hpp
 include/gnucash/gnc-rational.hpp
 include/gnucash/gnc-recurrence.h
+include/gnucash/gnc-report-combo.h
 include/gnucash/gnc-report.h
 include/gnucash/gnc-session.h
 include/gnucash/gnc-splash.h
@@ -132,21 +134,17 @@ include/gnucash/gnc-sx-instance-dense-cal-adapter.h
 include/gnucash/gnc-sx-instance-model.h
 include/gnucash/gnc-sx-list-tree-model-adapter.h
 include/gnucash/gnc-timezone.hpp
-include/gnucash/gnc-tree-control-split-reg.h
 include/gnucash/gnc-tree-model-account-types.h
 include/gnucash/gnc-tree-model-account.h
 include/gnucash/gnc-tree-model-budget.h
 include/gnucash/gnc-tree-model-commodity.h
 include/gnucash/gnc-tree-model-owner.h
 include/gnucash/gnc-tree-model-price.h
-include/gnucash/gnc-tree-model-split-reg.h
 include/gnucash/gnc-tree-model.h
-include/gnucash/gnc-tree-util-split-reg.h
 include/gnucash/gnc-tree-view-account.h
 include/gnucash/gnc-tree-view-commodity.h
 include/gnucash/gnc-tree-view-owner.h
 include/gnucash/gnc-tree-view-price.h
-include/gnucash/gnc-tree-view-split-reg.h
 include/gnucash/gnc-tree-view-sx-list.h
 include/gnucash/gnc-tree-view.h
 include/gnucash/gnc-ui-balances.h
@@ -186,7 +184,6 @@ include/gnucash/kvp-frame.hpp
 include/gnucash/kvp-value.hpp
 include/gnucash/misc-gnome-utils.h
 include/gnucash/numcell.h
-include/gnucash/option-util.h
 include/gnucash/policy.h
 include/gnucash/pricecell.h
 include/gnucash/print-session.h
@@ -240,96 +237,18 @@ lib/gnucash/libgncmod-backend-xml.so
 %%OFX%%lib/gnucash/libgncmod-ofx.so
 %%PYTHON%%lib/gnucash/libgncmod-python.so
 lib/guile/2.2/site-ccache/gnucash/app-utils.go
-lib/guile/2.2/site-ccache/gnucash/app-utils/business-options.go
-lib/guile/2.2/site-ccache/gnucash/app-utils/business-prefs.go
 lib/guile/2.2/site-ccache/gnucash/app-utils/c-interface.go
 lib/guile/2.2/site-ccache/gnucash/app-utils/date-utilities.go
 lib/guile/2.2/site-ccache/gnucash/app-utils/fin.go
-lib/guile/2.2/site-ccache/gnucash/app-utils/options.go
 lib/guile/2.2/site-ccache/gnucash/core-utils.go
 lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/deprecated-module.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/engine/test/srfi64-extras.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/engine/test/test-extras.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/gettext.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/import-export/qif-import.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/import-export/string.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/aging.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/balsheet-eg.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/business-reports.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/customer-summary.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/eguile-gnc.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/eguile-html-utilities.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/eguile-utilities.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/hello-world.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/invoice.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/job-report.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/locale-specific/de_DE.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/locale-specific/us.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/owner-report.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/payables.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/receipt.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/receivables.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/report-gnome.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/report-system.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/report-system/collectors.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/report-system/report-collectors.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/account-piecharts.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/account-summary.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/advanced-portfolio.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/average-balance.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/balance-forecast.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/balance-sheet.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/balsheet-pnl.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/budget-balance-sheet.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/budget-barchart.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/budget-flow.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/budget-income-statement.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/budget.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/cash-flow.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/cashflow-barchart.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/category-barchart.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/daily-reports.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/equity-statement.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/general-journal.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/general-ledger.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/income-gst-statement.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/income-statement.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/net-charts.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/portfolio.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/price-scatter.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/reconcile-report.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/register.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/sx-summary.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/transaction.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/standard-reports/trial-balance.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheet-easy.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheet-fancy.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheet-footer.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheet-head-or-tail.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheet-plain.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/stylesheets.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/taxinvoice.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/taxtxf-de_DE.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/taxtxf.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/test-graphing.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/utility-reports.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/view-column.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/report/welcome-to-gnucash.go
 lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/superseded-module.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/tax/de_DE.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/tax/us.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/gnucash/unittest-support.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/migrate-prefs-user.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/migrate-prefs.go
-lib/guile/2.2/site-ccache/gnucash/deprecated/tests/test-report-system-extras.go
 lib/guile/2.2/site-ccache/gnucash/eguile.go
 lib/guile/2.2/site-ccache/gnucash/eguile/eguile-html-utilities.go
 lib/guile/2.2/site-ccache/gnucash/eguile/eguile-utilities.go
 lib/guile/2.2/site-ccache/gnucash/engine.go
 lib/guile/2.2/site-ccache/gnucash/engine/business-core.go
 lib/guile/2.2/site-ccache/gnucash/engine/gnc-numeric.go
-lib/guile/2.2/site-ccache/gnucash/gnc-module.go
 lib/guile/2.2/site-ccache/gnucash/gnome-utils.go
 lib/guile/2.2/site-ccache/gnucash/gnome-utils/gnc-menu-extensions.go
 lib/guile/2.2/site-ccache/gnucash/html.go
@@ -343,7 +262,7 @@ lib/guile/2.2/site-ccache/gnucash/locale/de_DE/tax/txf.go
 lib/guile/2.2/site-ccache/gnucash/locale/us/tax.go
 lib/guile/2.2/site-ccache/gnucash/locale/us/tax/txf-help.go
 lib/guile/2.2/site-ccache/gnucash/locale/us/tax/txf.go
-lib/guile/2.2/site-ccache/gnucash/price-quotes.go
+lib/guile/2.2/site-ccache/gnucash/options.go
 lib/guile/2.2/site-ccache/gnucash/qif-import.go
 lib/guile/2.2/site-ccache/gnucash/qif-import/qif-dialog-utils.go
 lib/guile/2.2/site-ccache/gnucash/qif-import/qif-file.go
@@ -358,13 +277,9 @@ lib/guile/2.2/site-ccache/gnucash/report.go
 lib/guile/2.2/site-ccache/gnucash/report/commodity-utilities.go
 lib/guile/2.2/site-ccache/gnucash/report/html-acct-table.go
 lib/guile/2.2/site-ccache/gnucash/report/html-anytag.go
-lib/guile/2.2/site-ccache/gnucash/report/html-barchart.go
 lib/guile/2.2/site-ccache/gnucash/report/html-chart.go
 lib/guile/2.2/site-ccache/gnucash/report/html-document.go
 lib/guile/2.2/site-ccache/gnucash/report/html-fonts.go
-lib/guile/2.2/site-ccache/gnucash/report/html-linechart.go
-lib/guile/2.2/site-ccache/gnucash/report/html-piechart.go
-lib/guile/2.2/site-ccache/gnucash/report/html-scatter.go
 lib/guile/2.2/site-ccache/gnucash/report/html-style-info.go
 lib/guile/2.2/site-ccache/gnucash/report/html-style-sheet.go
 lib/guile/2.2/site-ccache/gnucash/report/html-table.go
@@ -380,13 +295,11 @@ lib/guile/2.2/site-ccache/gnucash/report/stylesheets/head-or-tail.go
 lib/guile/2.2/site-ccache/gnucash/report/stylesheets/plain.go
 lib/guile/2.2/site-ccache/gnucash/report/trep-engine.go
 lib/guile/2.2/site-ccache/gnucash/reports.go
-lib/guile/2.2/site-ccache/gnucash/reports/aging.go
 lib/guile/2.2/site-ccache/gnucash/reports/cash-flow-calc.go
 lib/guile/2.2/site-ccache/gnucash/reports/example/average-balance.go
 lib/guile/2.2/site-ccache/gnucash/reports/example/daily-reports.go
-lib/guile/2.2/site-ccache/gnucash/reports/example/hello-world.go
 lib/guile/2.2/site-ccache/gnucash/reports/example/sample-graphs.go
-lib/guile/2.2/site-ccache/gnucash/reports/example/welcome-to-gnucash.go
+lib/guile/2.2/site-ccache/gnucash/reports/example/sample-report.go
 lib/guile/2.2/site-ccache/gnucash/reports/locale-specific/de_DE/taxtxf.go
 lib/guile/2.2/site-ccache/gnucash/reports/locale-specific/us/taxtxf.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/account-piecharts.go
@@ -412,18 +325,15 @@ lib/guile/2.2/site-ccache/gnucash/reports/standard/general-ledger.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/ifrs-cost-basis.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/income-gst-statement.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/income-statement.go
+lib/guile/2.2/site-ccache/gnucash/reports/standard/investment-lots.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/invoice.go
-lib/guile/2.2/site-ccache/gnucash/reports/standard/job-report.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/lot-viewer.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/net-charts.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/new-aging.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/new-owner-report.go
-lib/guile/2.2/site-ccache/gnucash/reports/standard/owner-report.go
-lib/guile/2.2/site-ccache/gnucash/reports/standard/payables.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/portfolio.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/price-scatter.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/receipt.go
-lib/guile/2.2/site-ccache/gnucash/reports/standard/receivables.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/reconcile-report.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/register.go
 lib/guile/2.2/site-ccache/gnucash/reports/standard/taxinvoice.go
@@ -437,6 +347,8 @@ lib/libgnc-app-utils.so
 lib/libgnc-backend-xml-utils.so
 lib/libgnc-core-utils.so
 lib/libgnc-engine.so
+lib/libgnc-expressions-guile.so
+lib/libgnc-expressions.so
 lib/libgnc-generic-import.so
 lib/libgnc-gnome.so
 lib/libgnc-locale-tax.so
@@ -466,8 +378,7 @@ lib/libgnucash-guile.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_business.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/gnucash_core_c.py
-share/man/man1/gnc-fq-dump.1.gz
-share/man/man1/gnc-fq-helper.1.gz
+share/man/man1/finance-quote-wrapper.1.gz
 share/man/man1/gnucash-cli.1.gz
 share/man/man1/gnucash.1.gz
 share/applications/gnucash.desktop
@@ -497,6 +408,7 @@ share/metainfo/gnucash.appdata.xml
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2019
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2020
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2021
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2022
 %%PORTDOCS%%%%DOCSDIR%%/DOCUMENTERS
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
@@ -1046,7 +958,6 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/gtkbuilder/gnc-frequency.glade
 %%DATADIR%%/gtkbuilder/gnc-plugin-page-budget.glade
 %%DATADIR%%/gtkbuilder/gnc-plugin-page-register.glade
-%%DATADIR%%/gtkbuilder/gnc-plugin-page-register2.glade
 %%DATADIR%%/gtkbuilder/gnc-recurrence.glade
 %%DATADIR%%/gtkbuilder/gnc-tree-view-owner.glade
 %%DATADIR%%/gtkbuilder/window-autoclear.glade
@@ -1100,133 +1011,22 @@ share/metainfo/gnucash.appdata.xml
 %%PYTHON%%%%DATADIR%%/python/pycons/simple_plot.py
 %%DATADIR%%/pref_transformations.xml
 %%DATADIR%%/tip_of_the_day.list
-%%DATADIR%%/ui/gnc-main-window-ui.xml
-%%DATADIR%%/ui/gnc-plugin-bi-import-ui.xml
-%%DATADIR%%/ui/gnc-plugin-csv-export-ui.xml
-%%DATADIR%%/ui/gnc-plugin-csv-import-ui.xml
-%%DATADIR%%/ui/gnc-plugin-account-tree-ui.xml
-%%AQBANKING%%%%DATADIR%%/ui/gnc-plugin-aqbanking-ui.xml
-%%DATADIR%%/ui/gnc-plugin-basic-commands-ui.xml
-%%DATADIR%%/ui/gnc-plugin-budget-ui.xml
-%%DATADIR%%/ui/gnc-plugin-business-ui.xml
-%%DATADIR%%/ui/gnc-plugin-customer-import-ui.xml
-%%DATADIR%%/ui/gnc-plugin-file-history-ui.xml
-%%DATADIR%%/ui/gnc-plugin-log-replay-ui.xml
-%%OFX%%%%DATADIR%%/ui/gnc-plugin-ofx-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-account-tree2-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-owner-tree-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-register2-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-sx-list2-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-account-tree-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-budget-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-invoice-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-register-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-report-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-sx-list-ui.xml
-%%DATADIR%%/ui/gnc-plugin-page-sxregister-ui.xml
-%%DATADIR%%/ui/gnc-plugin-qif-import-ui.xml
-%%DATADIR%%/ui/gnc-plugin-register-ui.xml
-%%DATADIR%%/ui/gnc-plugin-register2-ui.xml
-%%DATADIR%%/ui/gnc-plugin-register22-ui.xml
-%%DATADIR%%/ui/gnc-plugin-report-system-ui.xml
-%%DATADIR%%/ui/gnc-reconcile-window-ui.xml
-%%DATADIR%%/ui/gnc-sxed-to-create-window-ui.xml
-%%DATADIR%%/ui/gnc-sxed-window-ui-full.xml
-%%DATADIR%%/ui/gnc-sxed-window-ui.xml
-%%DATADIR%%/ui/gnc-windows-menu-ui-quartz.xml
-%%DATADIR%%/ui/gnc-windows-menu-ui.xml
+%%DATADIR%%/ui/accelerator-map
+%%DATADIR%%/ui/accelerator-map-osx
 %%DATADIR%%/ui/osx_accel_map
 share/guile/site/2.2/gnucash/app-utils.scm
-share/guile/site/2.2/gnucash/app-utils/business-options.scm
-share/guile/site/2.2/gnucash/app-utils/business-prefs.scm
 share/guile/site/2.2/gnucash/app-utils/c-interface.scm
 share/guile/site/2.2/gnucash/app-utils/date-utilities.scm
 share/guile/site/2.2/gnucash/app-utils/fin.scm
-share/guile/site/2.2/gnucash/app-utils/options.scm
 share/guile/site/2.2/gnucash/core-utils.scm
 share/guile/site/2.2/gnucash/deprecated/gnucash/deprecated-module.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/engine/test/srfi64-extras.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/engine/test/test-extras.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/gettext.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/import-export/qif-import.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/import-export/string.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/aging.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/balsheet-eg.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/business-reports.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/customer-summary.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/eguile-gnc.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/eguile-html-utilities.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/eguile-utilities.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/hello-world.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/invoice.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/job-report.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/locale-specific/de_DE.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/locale-specific/us.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/owner-report.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/payables.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/receipt.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/receivables.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/report-gnome.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/report-system.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/report-system/collectors.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/report-system/report-collectors.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/account-piecharts.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/account-summary.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/advanced-portfolio.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/average-balance.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/balance-forecast.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/balance-sheet.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/balsheet-pnl.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/budget-balance-sheet.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/budget-barchart.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/budget-flow.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/budget-income-statement.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/budget.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/cash-flow.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/cashflow-barchart.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/category-barchart.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/daily-reports.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/equity-statement.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/general-journal.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/general-ledger.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/income-gst-statement.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/income-statement.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/net-charts.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/portfolio.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/price-scatter.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/reconcile-report.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/register.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/sx-summary.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/transaction.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/standard-reports/trial-balance.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheet-easy.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheet-fancy.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheet-footer.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheet-head-or-tail.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheet-plain.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/stylesheets.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/taxinvoice.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/taxtxf-de_DE.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/taxtxf.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/test-graphing.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/utility-reports.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/view-column.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/report/welcome-to-gnucash.scm
 share/guile/site/2.2/gnucash/deprecated/gnucash/superseded-module.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/tax/de_DE.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/tax/us.scm
-share/guile/site/2.2/gnucash/deprecated/gnucash/unittest-support.scm
-share/guile/site/2.2/gnucash/deprecated/migrate-prefs-user.scm
-share/guile/site/2.2/gnucash/deprecated/migrate-prefs.scm
-share/guile/site/2.2/gnucash/deprecated/tests/test-report-system-extras.scm
 share/guile/site/2.2/gnucash/eguile.scm
 share/guile/site/2.2/gnucash/eguile/eguile-html-utilities.scm
 share/guile/site/2.2/gnucash/eguile/eguile-utilities.scm
 share/guile/site/2.2/gnucash/engine.scm
 share/guile/site/2.2/gnucash/engine/business-core.scm
 share/guile/site/2.2/gnucash/engine/gnc-numeric.scm
-share/guile/site/2.2/gnucash/gnc-module.scm
 share/guile/site/2.2/gnucash/gnome-utils.scm
 share/guile/site/2.2/gnucash/gnome-utils/gnc-menu-extensions.scm
 share/guile/site/2.2/gnucash/html.scm
@@ -1240,7 +1040,7 @@ share/guile/site/2.2/gnucash/locale/de_DE/tax/txf.scm
 share/guile/site/2.2/gnucash/locale/us/tax.scm
 share/guile/site/2.2/gnucash/locale/us/tax/txf-help.scm
 share/guile/site/2.2/gnucash/locale/us/tax/txf.scm
-share/guile/site/2.2/gnucash/price-quotes.scm
+share/guile/site/2.2/gnucash/options.scm
 share/guile/site/2.2/gnucash/qif-import.scm
 share/guile/site/2.2/gnucash/qif-import/qif-dialog-utils.scm
 share/guile/site/2.2/gnucash/qif-import/qif-file.scm
@@ -1255,13 +1055,9 @@ share/guile/site/2.2/gnucash/report.scm
 share/guile/site/2.2/gnucash/report/commodity-utilities.scm
 share/guile/site/2.2/gnucash/report/html-acct-table.scm
 share/guile/site/2.2/gnucash/report/html-anytag.scm
-share/guile/site/2.2/gnucash/report/html-barchart.scm
 share/guile/site/2.2/gnucash/report/html-chart.scm
 share/guile/site/2.2/gnucash/report/html-document.scm
 share/guile/site/2.2/gnucash/report/html-fonts.scm
-share/guile/site/2.2/gnucash/report/html-linechart.scm
-share/guile/site/2.2/gnucash/report/html-piechart.scm
-share/guile/site/2.2/gnucash/report/html-scatter.scm
 share/guile/site/2.2/gnucash/report/html-style-info.scm
 share/guile/site/2.2/gnucash/report/html-style-sheet.scm
 share/guile/site/2.2/gnucash/report/html-table.scm
@@ -1277,13 +1073,11 @@ share/guile/site/2.2/gnucash/report/stylesheets/head-or-tail.scm
 share/guile/site/2.2/gnucash/report/stylesheets/plain.scm
 share/guile/site/2.2/gnucash/report/trep-engine.scm
 share/guile/site/2.2/gnucash/reports.scm
-share/guile/site/2.2/gnucash/reports/aging.scm
 share/guile/site/2.2/gnucash/reports/cash-flow-calc.scm
 share/guile/site/2.2/gnucash/reports/example/average-balance.scm
 share/guile/site/2.2/gnucash/reports/example/daily-reports.scm
-share/guile/site/2.2/gnucash/reports/example/hello-world.scm
 share/guile/site/2.2/gnucash/reports/example/sample-graphs.scm
-share/guile/site/2.2/gnucash/reports/example/welcome-to-gnucash.scm
+share/guile/site/2.2/gnucash/reports/example/sample-report.scm
 share/guile/site/2.2/gnucash/reports/locale-specific/de_DE/taxtxf.scm
 share/guile/site/2.2/gnucash/reports/locale-specific/us/taxtxf.scm
 share/guile/site/2.2/gnucash/reports/standard/account-piecharts.scm
@@ -1309,18 +1103,15 @@ share/guile/site/2.2/gnucash/reports/standard/general-ledger.scm
 share/guile/site/2.2/gnucash/reports/standard/ifrs-cost-basis.scm
 share/guile/site/2.2/gnucash/reports/standard/income-gst-statement.scm
 share/guile/site/2.2/gnucash/reports/standard/income-statement.scm
+share/guile/site/2.2/gnucash/reports/standard/investment-lots.scm
 share/guile/site/2.2/gnucash/reports/standard/invoice.scm
-share/guile/site/2.2/gnucash/reports/standard/job-report.scm
 share/guile/site/2.2/gnucash/reports/standard/lot-viewer.scm
 share/guile/site/2.2/gnucash/reports/standard/net-charts.scm
 share/guile/site/2.2/gnucash/reports/standard/new-aging.scm
 share/guile/site/2.2/gnucash/reports/standard/new-owner-report.scm
-share/guile/site/2.2/gnucash/reports/standard/owner-report.scm
-share/guile/site/2.2/gnucash/reports/standard/payables.scm
 share/guile/site/2.2/gnucash/reports/standard/portfolio.scm
 share/guile/site/2.2/gnucash/reports/standard/price-scatter.scm
 share/guile/site/2.2/gnucash/reports/standard/receipt.scm
-share/guile/site/2.2/gnucash/reports/standard/receivables.scm
 share/guile/site/2.2/gnucash/reports/standard/reconcile-report.scm
 share/guile/site/2.2/gnucash/reports/standard/register.scm
 share/guile/site/2.2/gnucash/reports/standard/taxinvoice.scm