ledger2beancount: Update to 2.5

2.5 (2020-11-03)

    Don't create negative cost for lot without cost
    Support complex implicit conversions
    Handle typed metadata with value 0 correctly
    Set per-unit instead of total cost when cost is missing from lot
    Support commodity-less amounts
    Convert transactions with no amounts or only 0 amounts to notes
    Fix parsing of transaction notes
    Keep tags in transaction notes on same line as transaction header
    Add beancount config options for non-standard root names automatically
    Fix conversion of fixated prices to costs
    Fix removal of price when price==cost but when they use different number formats
    Fix removal of price when price==cost but per-unit and total notation mixed
    Fix detection of tags and metadata after posting/aux date
    Use D directive to set default commodity for hledger
    Improve support for postings with commodity-less amounts
    Allow empty comments
    Preserve leading whitespace in comments in postings and transaction headers
    Preserve indentation for tags and metadata
    Preserve whitespace between amount and comment
    Refactor code to use more data structures
    Remove dependency on Config::Onion module

2.4 (2020-07-27)

    Fix regressions introduced in version 2.3
        Handle price directives with comments
        Don't assume implicit conversion when price is on second posting
    Improve support for hledger
        Fix parsing of hledger tags
        Support commas as decimal markers
        Support digit group marks through commodity and D directives
        Support end aliases directive
        Support regex aliases
        Recognise total balance assertions
        Recognise sub-account balance assertions
    Add support for define directive
    Convert all uppercase metadata tags to all lowercase
    Improve handling of ledger lots without cost
    Allow transactions without postings
    Fix parsing issue in commodity declarations
    Support commodities that contain quotation marks
    Add --version option to show version
    Document problem of mixing apply and include

2.3 (2020-06-26)

    Improve speed of ledger2beancount significantly
    Improve parsing of postings for accuracy and speed
    Improve support for inline maths
    Handle lots without cost
    Fix parsing of lot notes followed by a virtual price
    Add support for lot value expressions
    Make parsing of numbers more strict
    Fix behaviour of dates without year
    Accept default ledger date formats without configuration
    Fix implicit conversions with negative prices
    Convert implicit conversions in a more idiomatic way
    Avoid introducing trailing whitespace with hledger input
    Fix loading of config file
    Skip ledger directive import
    Convert documentation to mkdocs

2.2 (2020-05-30)

    Show warning for unknown apply directive
    Recognise apply rate directive (an alias of apply fixed)
    Don't convert metadata on ignored virtual postings but keep as comments
    Update location of beancount repository

2.1 (2020-04-06)

    Handle postings with posting dates and comments but no amount
    Show transactions with only one posting (without bucket)
    Adding spacing between automatic declarations
    Preserve preliminary info at the top

3 files changed, 21 insertions, 36 deletions

diff --git a/finance/ledger2beancount/Makefile b/finance/ledger2beancount/Makefile
index c099a0ec218..32b998b7678 100644
--- a/finance/ledger2beancount/Makefile
+++ b/finance/ledger2beancount/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2020/08/31 18:09:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2020/11/18 22:39:15 riastradh Exp $
 
-DISTNAME=	ledger2beancount-2.0
-PKGREVISION=	2
+DISTNAME=	ledger2beancount-2.5
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=beancount/}
 GITHUB_PROJECT=	ledger2beancount
@@ -16,12 +15,15 @@ USE_TOOLS+=	perl:run
 
 TOOL_DEPENDS+=	scdoc>=0:../../textproc/scdoc
 
-DEPENDS+=	p5-Config-Onion>=0:../../devel/p5-Config-Onion
 DEPENDS+=	p5-Date-Calc>=0:../../devel/p5-Date-Calc
 DEPENDS+=	p5-DateTime-Format-Strptime>=1.58:../../time/p5-DateTime-Format-Strptime
 DEPENDS+=	p5-File-BaseDir>=0:../../devel/p5-File-BaseDir
 DEPENDS+=	p5-Getopt-Long-Descriptive>=0:../../devel/p5-Getopt-Long-Descriptive
+DEPENDS+=	p5-List-MoreUtils>=0:../../devel/p5-List-MoreUtils
+DEPENDS+=	p5-Regexp-Common>=0:../../textproc/p5-Regexp-Common
 DEPENDS+=	p5-String-Interpolate>=0:../../textproc/p5-String-Interpolate
+DEPENDS+=	p5-YAML-XS>=0:../../textproc/p5-YAML-XS
+DEPENDS+=	p5-enum>=0:../../devel/p5-enum
 
 REPLACE_PERL+=	bin/ledger2beancount
 
@@ -41,15 +43,21 @@ TEST_DEPENDS+=	ledger>=3.0.0:../../finance/ledger
 TEST_DEPENDS+=	${PYPKGPREFIX}-beancount>=0:../../finance/py-beancount
 TEST_DEPENDS+=	p5-YAML-Syck>=0:../../textproc/p5-YAML-Syck
 
-# This should be gsed:test, but that triggers a bug in the mk/
-# infrastructure -- the checksum logic thinks TOOL_SED is gsed, but the
-# depends logic hasn't actually brought gsed in because it's only
-# needed for test.
+# runtests.sh relies on `\s', a GNUism meaning `[[:space:]]', in sed,
+# so use gsed.  This should be gsed:test, but that triggers a bug in
+# the mk/ infrastructure -- the checksum logic thinks TOOL_SED is gsed,
+# but the depends logic hasn't actually brought gsed in because it's
+# only needed for test.
 USE_TOOLS+=	gsed
 
+# runtests.sh relies on GNU sort's `sort -V' for sorting versions.
 TEST_ENV+=	SORT=gsort
 
 TEST_TARGET=	test
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# XXX Need to override default pkgsrc settings of these environment
+# variables for tests, which require a UTF-8 locale.
+TEST_ENV+=	LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=
diff --git a/finance/ledger2beancount/distinfo b/finance/ledger2beancount/distinfo
index 158d05376cb..867d62d462a 100644
--- a/finance/ledger2beancount/distinfo
+++ b/finance/ledger2beancount/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2020/07/16 18:09:30 riastradh Exp $
+$NetBSD: distinfo,v 1.4 2020/11/18 22:39:15 riastradh Exp $
 
-SHA1 (ledger2beancount-2.0.tar.gz) = f323279e3e1e467b9f40ebc3d26b31d11799b4c0
-RMD160 (ledger2beancount-2.0.tar.gz) = f81bba80803c3b7235aff03ae6c7c05b6397d96e
-SHA512 (ledger2beancount-2.0.tar.gz) = a5a741b8af1bb26d0c01673c70e0aee49926d3acfe36b5f160e01d0038f459902beaed89c69bd6179ade09798a0c6103c960796d8bf9a23897791bdefc51e360
-Size (ledger2beancount-2.0.tar.gz) = 67729 bytes
-SHA1 (patch-tests_runtests) = fd199caeb1bff1559af5f823e9a0efd0f975588a
+SHA1 (ledger2beancount-2.5.tar.gz) = 909d1f86e2cf79e2343e51953ed27d49cb6bee55
+RMD160 (ledger2beancount-2.5.tar.gz) = 65bafe12a0f5b5eb1a95a09485fe5f0637ae797d
+SHA512 (ledger2beancount-2.5.tar.gz) = a456c5c6f0259bf633b257a7496e05d8530a73cc3ae5a5e42c8d2e0b4ae66adec090936aa1a0c5e3ef330a3569a07fa40be3295799b0477246b8f6eb5fc9697b
+Size (ledger2beancount-2.5.tar.gz) = 93260 bytes
diff --git a/finance/ledger2beancount/patches/patch-tests_runtests b/finance/ledger2beancount/patches/patch-tests_runtests
deleted file mode 100644
index ca90fd3a905..00000000000
--- a/finance/ledger2beancount/patches/patch-tests_runtests
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-tests_runtests,v 1.3 2020/07/16 18:09:30 riastradh Exp $
-
-Let the environment specify SORT so we can set it from the makefile.
-
-https://github.com/beancount/ledger2beancount/pull/200
-
---- tests/runtests.orig	2020-02-22 07:25:00.000000000 +0000
-+++ tests/runtests
-@@ -3,11 +3,13 @@
- status=0
- 
- # We need sort from coreutils for -V
-+if [ -z "${SORT-}" ]; then
- case `uname -s` in
- 	Linux*) SORT=sort ;;
- 	Darwin*) SORT=gsort ;;
- 	*) SORT=sort ;;
- esac
-+fi
- 
- test_conversion () {
- 	test=$1