diff --git a/dev-util/gftools/Manifest b/dev-util/gftools/Manifest
index 5f89122daf..6b0bb375b4 100644
--- a/dev-util/gftools/Manifest
+++ b/dev-util/gftools/Manifest
@@ -1,3 +1,3 @@
 DIST GlyphsInfo-e33ccf3515cc5b8005a3a50b4163663623649d20.tar.gz 576525 BLAKE2B 306146533d15e412e8e18f072a1fd55770310fd7a85e0a8cb956f1262622e40776b60c1bb729701b419c155970870a55a398cf01257e0b4f4a338c8714232c79 SHA512 7481f524273e73cbb7827ee6ddf9ae63852b44440e9ef5097c6fea643e99912195f0257e9140ca17738a208559c36d8dbec51ec9ec5f24cd9510d5989378be13
-DIST gftools-0.9.5.tar.gz 4649591 BLAKE2B 8bb31da074b973718c4354a2e7eafaedbe5a45927f108c16ebcf3b8f8764647800cc83b5c079d66bd54426896278bba80008e855d27a3c3c20f1aa76178f1aa5 SHA512 d996147df5be58cdb5cfd5399afd71c4f88e6199e023e749216351be8cbe1f43061b871d80961e8be13936da6d331bea19f9361e3ec5a50a66c104814117d87b
 DIST gftools-0.9.6.tar.gz 4648604 BLAKE2B b1d0a7b68e0df56810255b5bde514a9ba3ad803e8d722e4e2efb2e176bb5bd92dc631b53ff192be951107a0fdf00030f14ab98d1fa39a3951c7a11c38e3dadd9 SHA512 5483eaeb4bf8b46b7f80058b1294d0617522d16f0110b075fc72c9cf1740ce1ce23b7ccef933a524010e05f9742528f60dd2fabedd1981564d2d3edf9a088fb1
+DIST gftools-0.9.9.tar.gz 4868400 BLAKE2B 3407ef40fdd7781c4553f41ba87bd2d7ef2752161bc606f93d64b99e7a83b5ee57b668377b7e7e6e8c71f5e7cf8fe3e77b45572646afc66825b19d768d5572b4 SHA512 0d0658203758a4360e06214c5cb80b5c39a99caa9a3d866285fa16823eed9caea1f56ed698d0f4caa3f595afe25038cd6e5c8628dc039159d27a75df2150a502
diff --git a/dev-util/gftools/gftools-0.9.5.ebuild b/dev-util/gftools/gftools-0.9.9.ebuild
similarity index 87%
rename from dev-util/gftools/gftools-0.9.5.ebuild
rename to dev-util/gftools/gftools-0.9.9.ebuild
index e197ff1052..2889e1d327 100644
--- a/dev-util/gftools/gftools-0.9.5.ebuild
+++ b/dev-util/gftools/gftools-0.9.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-COMMIT="e33ccf3515cc5b8005a3a50b4163663623649d20"
+GLYPHSINFO_COMMIT="e33ccf3515cc5b8005a3a50b4163663623649d20"
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{8..9} )
@@ -14,11 +14,11 @@ DESCRIPTION="Miscellaneous tools for working with the Google Fonts collection"
 HOMEPAGE="https://github.com/googlefonts/gftools"
 SRC_URI="
 	https://github.com/googlefonts/gftools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/schriftgestalt/GlyphsInfo/archive/${COMMIT}.tar.gz -> GlyphsInfo-${COMMIT}.tar.gz
+	https://github.com/schriftgestalt/GlyphsInfo/archive/${GLYPHSINFO_COMMIT}.tar.gz -> GlyphsInfo-${GLYPHSINFO_COMMIT}.tar.gz
 "
 
 KEYWORDS="~amd64"
-LICENSE="Apache-2.0 MIT"
+LICENSE="Apache-2.0 MIT test? ( OFL )"
 SLOT="0"
 
 # ufolib2 is an indirect dependency
@@ -36,7 +36,7 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/babelfont[${PYTHON_USEDEP}]
 		dev-python/ttfautohint-py[${PYTHON_USEDEP}]
-		>=dev-util/fontmake-2.4.0[${PYTHON_USEDEP}]
+		>=dev-util/fontmake-3.3.0[${PYTHON_USEDEP}]
 		app-arch/brotli[python,${PYTHON_USEDEP}]
 		>=dev-python/browserstack-local-python-1.2.2[${PYTHON_USEDEP}]
 		>=dev-python/pybrowserstack-screenshots-0.1[${PYTHON_USEDEP}]
@@ -53,6 +53,7 @@ RDEPEND="
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/hyperglot[${PYTHON_USEDEP}]
 		>=dev-python/fontFeatures-1.6.2[${PYTHON_USEDEP}]
+		dev-python/vharfbuzz[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="