textproc/translate-toolkit: Update to 3.5.0

Changes:	https://github.com/translate/translate/releases
		https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/

4 files changed, 131 insertions, 14 deletions

diff --git a/textproc/translate-toolkit/Makefile b/textproc/translate-toolkit/Makefile
index f6b3dbec7292..0d8d7bbdec7e 100644
--- a/textproc/translate-toolkit/Makefile
+++ b/textproc/translate-toolkit/Makefile
@@ -1,8 +1,7 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 
 PORTNAME=	translate-toolkit
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.5.0
 CATEGORIES=	textproc
 MASTER_SITES=	CHEESESHOP
 
@@ -56,8 +55,8 @@ PHP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phply>=1.2.5:devel/py-phply@${PY_FLAVOR}
 PHP_VARS=		MANPAGES+="php2po po2php"
 RC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.4.7:devel/py-pyparsing@${PY_FLAVOR}
 RC_VARS=		MANPAGES+="po2rc rc2po"
-SPELLCHECK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=3.2.0:textproc/py-enchant@${PY_FLAVOR}
-SUBTITLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aeidon>=1.9:textproc/py-aeidon@${PY_FLAVOR}
+SPELLCHECK_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}enchant>=3.2.2:textproc/py-enchant@${PY_FLAVOR}
+SUBTITLES_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aeidon>=1.10.1:textproc/py-aeidon@${PY_FLAVOR}
 TMSERVER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheroot>=8.5.2:www/py-cheroot@${PY_FLAVOR}
 TRADOS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3:www/py-beautifulsoup@${PY_FLAVOR}
 YAML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.16.12:devel/py-ruamel.yaml@${PY_FLAVOR}
diff --git a/textproc/translate-toolkit/distinfo b/textproc/translate-toolkit/distinfo
index e6694019ada3..af14fff4d417 100644
--- a/textproc/translate-toolkit/distinfo
+++ b/textproc/translate-toolkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632036918
-SHA256 (translate-toolkit-3.4.1.tar.gz) = 2edc72794513e33ece2a2ee5ee25709fe4fbeac4686ecf80366d4999dd98cfd0
-SIZE (translate-toolkit-3.4.1.tar.gz) = 6108185
+TIMESTAMP = 1635730901
+SHA256 (translate-toolkit-3.5.0.tar.gz) = 6feba6d7e2f4dd2bcffa21c5b9cdb917e5a835afdec526f63d526a2f260fa2fc
+SIZE (translate-toolkit-3.5.0.tar.gz) = 5981828
diff --git a/textproc/translate-toolkit/files/patch-requirements-optional.txt b/textproc/translate-toolkit/files/patch-requirements-optional.txt
index 47715cef5b37..9f5e6e8402e2 100644
--- a/textproc/translate-toolkit/files/patch-requirements-optional.txt
+++ b/textproc/translate-toolkit/files/patch-requirements-optional.txt
@@ -1,11 +1,11 @@
---- requirements/optional.txt.orig	2021-09-10 07:19:36 UTC
+--- requirements/optional.txt.orig	2021-10-27 09:01:25 UTC
 +++ requirements/optional.txt
 @@ -1,27 +1,27 @@
  -r required.txt
  
  # Format support
--aeidon==1.9        # Subtitles
-+aeidon>=1.9        # Subtitles
+-aeidon==1.10.1        # Subtitles
++aeidon>=1.10.1        # Subtitles
  # Format support
  BeautifulSoup4>=4.3  # Trados
  # Encoding detection
@@ -25,17 +25,17 @@
 +phply>=1.2.5         # PHP
  # To provide translations for language names without need for OS package.
 -pycountry==20.7.3          # Languages
--pyenchant==3.2.1     # spellcheck
+-pyenchant==3.2.2     # spellcheck
 +pycountry>=20.7.3          # Languages
-+pyenchant>=3.2.1     # spellcheck
++pyenchant>=3.2.2     # spellcheck
  # Windows Resources (rc2po and po2rc)
--pyparsing==2.4.7     # RC
+-pyparsing==3.0.1     # RC
 +pyparsing>=2.4.7     # RC
  # Faster matching in e.g. pot2po
  python-Levenshtein>=0.12    # Levenshtein
  # Format support
 -ruamel.yaml==0.17.16 # YAML
-+ruamel.yaml>=0.16.12 # YAML
++ruamel.yaml>=0.17.16 # YAML
  # Format support
 -vobject==0.9.6.1     # iCal
 +vobject>=0.9.6.1     # iCal
diff --git a/textproc/translate-toolkit/files/patch-revrt-rc b/textproc/translate-toolkit/files/patch-revrt-rc
new file mode 100644
index 000000000000..45cbd54df315
--- /dev/null
+++ b/textproc/translate-toolkit/files/patch-revrt-rc
@@ -0,0 +1,118 @@
+Obtained from:	https://github.com/translate/translate/commit/888091da38619af885c2350848f546a20f95ba39
+
+Revert the change from pyparsing 2 to 3
+
+--- translate/storage/rc.py.orig	2021-10-27 09:01:25 UTC
++++ translate/storage/rc.py
+@@ -39,13 +39,13 @@ from pyparsing import (
+     ZeroOrMore,
+     alphanums,
+     alphas,
+-    c_style_comment,
+-    delimited_list,
++    commaSeparatedList,
++    cStyleComment,
++    delimitedList,
+     nums,
+-    quoted_string,
+-    rest_of_line,
++    quotedString,
++    restOfLine,
+ )
+-from pyparsing.common import pyparsing_common
+ 
+ from translate.storage import base
+ 
+@@ -149,24 +149,24 @@ def rc_statement():
+     :rtype: pyparsing.ParserElement
+     """
+ 
+-    one_line_comment = "//" + rest_of_line
++    one_line_comment = "//" + restOfLine
+ 
+-    comments = c_style_comment ^ one_line_comment
++    comments = cStyleComment ^ one_line_comment
+ 
+-    precompiler = Word("#", alphanums) + rest_of_line
++    precompiler = Word("#", alphanums) + restOfLine
+ 
+     language_definition = (
+         "LANGUAGE"
+-        + Word(alphas + "_").set_results_name("language")
+-        + Optional("," + Word(alphas + "_").set_results_name("sublanguage"))
++        + Word(alphas + "_").setResultsName("language")
++        + Optional("," + Word(alphas + "_").setResultsName("sublanguage"))
+     )
+ 
+-    block_start = (Keyword("{") | Keyword("BEGIN")).set_name("block_start")
+-    block_end = (Keyword("}") | Keyword("END")).set_name("block_end")
++    block_start = (Keyword("{") | Keyword("BEGIN")).setName("block_start")
++    block_end = (Keyword("}") | Keyword("END")).setName("block_end")
+ 
+     reserved_words = block_start | block_end
+ 
+-    name_id = ~reserved_words + Word(alphas, alphanums + "_").set_name("name_id")
++    name_id = ~reserved_words + Word(alphas, alphanums + "_").setName("name_id")
+ 
+     numbers = Word(nums)
+ 
+@@ -175,25 +175,25 @@ def rc_statement():
+     constant = Combine(
+         Optional(Keyword("NOT")) + (name_id | integerconstant),
+         adjacent=False,
+-        join_string=" ",
++        joinString=" ",
+     )
+ 
+-    combined_constants = delimited_list(constant, "|")
++    combined_constants = delimitedList(constant, "|")
+ 
+-    concatenated_string = OneOrMore(quoted_string)
++    concatenated_string = OneOrMore(quotedString)
+ 
+     block_options = Optional(
+-        SkipTo(Keyword("CAPTION"), fail_on=block_start)("pre_caption")
++        SkipTo(Keyword("CAPTION"), failOn=block_start)("pre_caption")
+         + Keyword("CAPTION")
+-        + quoted_string("caption")
++        + quotedString("caption")
+     ) + SkipTo(block_start)("post_caption")
+ 
+     undefined_control = (
+         Group(
+-            name_id.set_results_name("id_control")
+-            + delimited_list(
++            name_id.setResultsName("id_control")
++            + delimitedList(
+                 concatenated_string ^ constant ^ numbers ^ Group(combined_constants)
+-            ).set_results_name("values_")
++            ).setResultsName("values_")
+         )
+         | comments
+     )
+@@ -210,14 +210,14 @@ def rc_statement():
+     string_table = Keyword("STRINGTABLE")("block_type") + block_options + block
+ 
+     menu_item = Keyword("MENUITEM")("block_type") + (
+-        pyparsing_common.comma_separated_list("values_") | Keyword("SEPARATOR")
++        commaSeparatedList("values_") | Keyword("SEPARATOR")
+     )
+ 
+     popup_block = Forward()
+ 
+     popup_block <<= Group(
+         Keyword("POPUP")("block_type")
+-        + Optional(quoted_string("caption"))
++        + Optional(quotedString("caption"))
+         + block_start
+         + ZeroOrMore(Group(menu_item | popup_block))("elements")
+         + block_end
+@@ -350,7 +350,7 @@ class rcfile(base.TranslationStore):
+         decoded = decoded.replace("\r", "")
+ 
+         # Parse the strings into a structure.
+-        results = rc_statement().search_string(decoded)
++        results = rc_statement().searchString(decoded)
+ 
+         processblocks = True
+