dev-util/fontmake: new version

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>

4 files changed, 57 insertions, 60 deletions

diff --git a/dev-util/fontmake/Manifest b/dev-util/fontmake/Manifest
index 2bd1ac5bb9..c67bf7ff6a 100644
--- a/dev-util/fontmake/Manifest
+++ b/dev-util/fontmake/Manifest
@@ -1,2 +1,2 @@
-DIST fontmake-2.4.0.tar.gz 116347 BLAKE2B d66eec918f60f5760616ce9fb3400da886c3d3448a98c77ae0bca3603b32e79ca1980c696f2eeb8910db7611514bfd1dbf9df3d63f8bb5c0aa4c8d45b4ed251a SHA512 752b9c7fe40383b7bf8ba04d6b8a5c25cad3dd45380a9874a90cf31c043013396512156042c4dff3e056fb1687503535aa3d8d7bb268570edd97c447748a8e58
 DIST fontmake-3.2.0.tar.gz 147581 BLAKE2B 1b8868b7e24581790999e1c7051c7ef0bd0e9bf07880b75bf966cca1856e81b6f1d85a408991d4fe254f05a5ca84dcaf2557073c53aa5be398877380f46aa0de SHA512 f228347f58052cc12cb491351e810dd2af35a0d0699a38fbb231aab7a8f12ce13370f9cf9688096b7c1658d3f904ada02c4908b1e1ce62880d3e34bb2bb69e8c
+DIST fontmake-3.3.0.tar.gz 148043 BLAKE2B a69d177fad5bab60b0fb305a2a6ff55bf95c32aee52ff55bc01d8d25b2c718ed52a4ea5042300430bab531e7d71d4899bbf096ed0844009dd5ca538f701a2eb2 SHA512 0b1544a86fce9096e4b81459268baf57df1d071b4e951b411f823e331867aaefaf08b4176cf79af3a9df28c410c5f81918e8b880c5c9769fe8637e307a67b0a3
diff --git a/dev-util/fontmake/files/instance_dir.diff b/dev-util/fontmake/files/instance_dir.diff
deleted file mode 100644
index fb6a0830fb..0000000000
--- a/dev-util/fontmake/files/instance_dir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Lib/fontmake/font_project.py
-+++ b/Lib/fontmake/font_project.py
-@@ -149,8 +149,7 @@ class FontProject:
-             os.mkdir(master_dir)
-         if instance_dir is None:
-             instance_dir = self._output_dir("ufo", is_instance=True)
-+            instance_dir = os.path.join("..",instance_dir)
--        if not os.path.isdir(instance_dir):
--            os.mkdir(instance_dir)
- 
-         try:
-             font = glyphsLib.GSFont(glyphs_path)
diff --git a/dev-util/fontmake/fontmake-2.4.0.ebuild b/dev-util/fontmake/fontmake-2.4.0.ebuild
deleted file mode 100644
index ee30177cb3..0000000000
--- a/dev-util/fontmake/fontmake-2.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit distutils-r1
-
-SRC_URI="https://github.com/googlefonts/fontmake/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-DESCRIPTION="A wrapper for several Python libraries to compile fonts from sources"
-HOMEPAGE="https://github.com/googlefonts/fontmake"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/attrs-20.2[${PYTHON_USEDEP}]
-	>=dev-python/booleanOperations-0.9[${PYTHON_USEDEP}]
-	>=dev-python/defcon-0.8.1[${PYTHON_USEDEP}]
-	>=dev-python/cu2qu-1.6.7[${PYTHON_USEDEP}]
-	>=dev-python/fontMath-0.6[${PYTHON_USEDEP}]
-	>=dev-python/fonttools-4.21.1[${PYTHON_USEDEP}]
-	>=dev-python/glyphsLib-5.3.2[${PYTHON_USEDEP}]
-	>=dev-python/MutatorMath-3.0.1[${PYTHON_USEDEP}]
-	dev-python/skia-pathops[${PYTHON_USEDEP}]
-	>=dev-python/ufo2ft-2.20[${PYTHON_USEDEP}]
-	>=dev-python/ufoLib2-0.8[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		media-gfx/fontdiff
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/defaults.diff"
-	"${FILESDIR}/instance_dir.diff"
-)
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
-}
diff --git a/dev-util/fontmake/fontmake-3.3.0.ebuild b/dev-util/fontmake/fontmake-3.3.0.ebuild
new file mode 100644
index 0000000000..fa80122fb9
--- /dev/null
+++ b/dev-util/fontmake/fontmake-3.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="A wrapper for several Python libraries to compile fonts from sources"
+HOMEPAGE="https://github.com/googlefonts/fontmake"
+SRC_URI="https://github.com/googlefonts/fontmake/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# lxml, compreffor and unicodedata2 are an indirect dependency
+RDEPEND="
+	>=dev-python/fonttools-4.32.0[${PYTHON_USEDEP}]
+	>=dev-python/glyphsLib-6.0.4[${PYTHON_USEDEP}]
+	>=dev-python/ufo2ft-2.27.0[${PYTHON_USEDEP}]
+	>=dev-python/fontMath-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/ufoLib2-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19[${PYTHON_USEDEP}]
+
+	>=dev-python/lxml-4.2.4[${PYTHON_USEDEP}]
+	dev-python/compreffor[${PYTHON_USEDEP}]
+	>=dev-python/unicodedata2-14[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		media-gfx/fontdiff
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/defaults.diff"
+)
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV%_*}"
+}
+
+pkg_postinst() {
+	optfeature "mutatormath support" >=dev-python/MutatorMath-3.0.1[${PYTHON_USEDEP}]
+	optfeature "pathops support" >=dev-python/skia-pathops-0.3.0[${PYTHON_USEDEP}]
+	optfeature "autohint support" >=dev-python/ttfautohint-0.5.0[${PYTHON_USEDEP}]
+}