3 files changed, 21 insertions, 23 deletions

diff --git a/print/py-fontbakery/Makefile b/print/py-fontbakery/Makefile
index ee3fa0e4c863..b68593d3a388 100644
--- a/print/py-fontbakery/Makefile
+++ b/print/py-fontbakery/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	fontbakery
-PORTVERSION=	0.10.8
+PORTVERSION=	0.11.1
 CATEGORIES=	print python
 MASTER_SITES=	PYPI \
 		https://github.com/fonttools/fontbakery/releases/download/v${PORTVERSION}/
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}babelfont>=3.0.1:x11-fonts/py-babelfont@${PY
 		${PYTHON_PKGNAMEPREFIX}cmarkgfm>=0.4:textproc/py-cmarkgfm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freetype-py>=0:print/py-freetype-py@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentype-sanitizer>=7.1.9:x11-fonts/py-opentype-sanitizer@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opentypespec>=0:x11-fonts/py-opentypespec@${PY_FLAVOR} \
@@ -28,21 +29,22 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}babelfont>=3.0.1:x11-fonts/py-babelfont@${PY
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0:print/py-uharfbuzz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	FONTVAL FONTWERK GOOGLEFONTS ISO15008 NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES
-OPTIONS_DEFAULT=FONTVAL FONTWERK GOOGLEFONTS ISO15008 NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES
+OPTIONS_DEFINE=	FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES
+OPTIONS_DEFAULT=FONTVAL FONTWERK GOOGLEFONTS NOTOFONTS SHAPING TYPENETWORK UFO_SOURCES
 FONTVAL_DESC=		Checks for Font Validator
 FONTWERK_DESC=		Checks for Fontwerk.com
 FONTWERK_IMPLIES=	GOOGLEFONTS
 GOOGLEFONTS_DESC=	Checks for Google Fonts
 GOOGLEFONTS_IMPLIES=	SHAPING UFO_SOURCES
-ISO15008_DESC=		Checks for suitability for in-car displays (ISO 15008)
 NOTOFONTS_DESC=		Checks for Noto fonts
 NOTOFONTS_IMPLIES=	GOOGLEFONTS
 SHAPING_DESC=		Checks for shaping
@@ -55,22 +57,18 @@ GOOGLEFONTS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}axisregistry>=0.4.5:x11-fonts/py-
 			${PYTHON_PKGNAMEPREFIX}dehinter>=3.1.0:print/py-dehinter@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}font-v>=0.6.0:print/py-font-v@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}gflanguages>=0.5.13:x11-fonts/py-gflanguages@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}gflanguages>=0.5.17:x11-fonts/py-gflanguages@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}gfsubsets>=2024.1.22.post2:x11-fonts/py-gfsubsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}glyphsets>=0.6.11:print/py-glyphsets@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.0,1:devel/py-protobuf@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.1:x11-fonts/py-shaperglot@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
-ISO15008_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0:print/py-uharfbuzz@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.1:x11-fonts/py-shaperglot@${PY_FLAVOR}
 SHAPING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}collidoscope>=0.5.2:print/py-collidoscope@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.1:x11-fonts/py-shaperglot@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}stringbrewer>=0:devel/py-stringbrewer@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR}
 TYPENETWORK_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7.1:www/py-beautifulsoup@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}shaperglot>=0.3.1:x11-fonts/py-shaperglot@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}uharfbuzz>=0:print/py-uharfbuzz@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}vharfbuzz>=0.2.0:print/py-vharfbuzz@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR}
 UFO_SOURCES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}defcon>=0:x11-fonts/py-defcon@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}fonttools>=4.39.0:print/py-fonttools@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.25.2:x11-fonts/py-ufo2ft@${PY_FLAVOR} \
diff --git a/print/py-fontbakery/distinfo b/print/py-fontbakery/distinfo
index abbd063fd0f8..a293f9ab1ad2 100644
--- a/print/py-fontbakery/distinfo
+++ b/print/py-fontbakery/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703227912
-SHA256 (fontbakery-0.10.8.tar.gz) = 5e3dc4d67a73fb24e52742d6f196043a8ecc2d530e52ed1f13a99df731fa6e36
-SIZE (fontbakery-0.10.8.tar.gz) = 48033417
+TIMESTAMP = 1708449430
+SHA256 (fontbakery-0.11.1.tar.gz) = a9b85365e041529419395b8849b210667b4cff26eef1c60c8f8c6a5c51016ea2
+SIZE (fontbakery-0.11.1.tar.gz) = 48260168
diff --git a/print/py-fontbakery/files/patch-setup.py b/print/py-fontbakery/files/patch-setup.py
index effccabef0bb..d06388a7cd5d 100644
--- a/print/py-fontbakery/files/patch-setup.py
+++ b/print/py-fontbakery/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2023-12-01 14:46:39 UTC
+--- setup.py.orig	2024-02-06 04:58:53 UTC
 +++ setup.py
-@@ -72,7 +72,7 @@ googlefonts_extras = (
+@@ -71,7 +71,7 @@ googlefonts_extras = (
          # FontVersion.get_name_id5_version_string which was added in version 0.6.0
          f"fontTools[lxml,unicode]{FONTTOOLS_VERSION}",
          # (see https://github.com/googlefonts/gflanguages/pull/7)
@@ -8,8 +8,8 @@
 +        "protobuf>=3.7.0",  # 3.7.0 fixed a bug on parsing some METADATA.pb files.
          # We cannot use v4 because our protobuf files have been compiled with v3.
          # (see https://github.com/fonttools/fontbakery/issues/2200)
-         f"vharfbuzz{VHARFBUZZ_VERSION}",
-@@ -122,7 +122,7 @@ all_extras = set(
+     ]
+@@ -116,7 +116,7 @@ setup(
  
  setup(
      name="fontbakery",
@@ -18,9 +18,9 @@
      url="https://github.com/fonttools/fontbakery/",
      description="A font quality assurance tool for everyone",
      long_description=readme,
-@@ -183,7 +183,7 @@ setup(
+@@ -179,7 +179,7 @@ setup(
+         # ---
          # core dependencies
-         "babelfont>=3.0.1",  # v3.0.1 needed by check/legacy_accents
          f"fontTools{FONTTOOLS_VERSION}",
 -        "freetype-py!=2.4.0",  # Avoiding 2.4.0 due to seg-fault described at
 +        "freetype-py",  # Avoiding 2.4.0 due to seg-fault described at