[gentoo-commits] repo/proj/guru:dev commit in: dev-util/gftools/

[Alessandro Barbieri]

commit:     86a53ebfe4897efcac76d7960aadd3041cc5e3fa
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 00:08:51 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 00:09:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=86a53ebf

dev-util/gftools: add 0.9.4, drop 0.7.2

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

 dev-util/gftools/Manifest                          |  2 +-
 .../{gftools-0.7.2.ebuild => gftools-0.9.4.ebuild} | 68 +++++++++++-----------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/dev-util/gftools/Manifest b/dev-util/gftools/Manifest
index 44e6bca5f..210355f8e 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.7.2.tar.gz 5558945 BLAKE2B 4021f6a09b401b94e048c88f1a744153f830ad550edb14ba5c4c83f6deda9089e27c449a85d643ea167e31d1697c3eb404f49c9bd1a9f2322746aa06a2655c5d SHA512 34336e6fa69722f3e7a317f09c2be15f8f74505dea673dea68d6c51c0289f448d77849cc92f3b47bc6bdb2f86ad525a82a4c24e9a4e08fc215cfd6e2e401d818
 DIST gftools-0.9.2.tar.gz 4640316 BLAKE2B 9fad40044c6d66fb8f6fe69d8f67bae62828954136b14d44108098b60f77babc964508d229eda9018fc1fd3312f1f8ecc0a6ad5f067cea71a504b58ce8d2f691 SHA512 e60d358c4754b0177532ef5f84a50734ea4a203275f13e262852819522901ac16e0e502a883eafcf6e868faa07f17440a58f923927a826364212452d96944db8
+DIST gftools-0.9.4.tar.gz 4645902 BLAKE2B e74e94d195bb3c49f453dec09372dfa2d42fc8c2abba79a23106dc605f94992efd2c239b7ace8b96e4677629cbf230c4e08d379683aebd1a0a60b6fdc4aeff1e SHA512 ab26899b844f60cbe9a15f9ad01675a3e317c64590339efcc3efc1bfb67b5a05364dfefd7dc3433246c6b5c50bd89a42d438398b4535c04782ca67c192935a3b

diff --git a/dev-util/gftools/gftools-0.7.2.ebuild b/dev-util/gftools/gftools-0.9.4.ebuild
similarity index 67%
rename from dev-util/gftools/gftools-0.7.2.ebuild
rename to dev-util/gftools/gftools-0.9.4.ebuild
index 43d23fb3d..e197ff105 100644
--- a/dev-util/gftools/gftools-0.7.2.ebuild
+++ b/dev-util/gftools/gftools-0.9.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 COMMIT="e33ccf3515cc5b8005a3a50b4163663623649d20"
 DISTUTILS_SINGLE_IMPL=1
@@ -10,65 +10,63 @@ PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
+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
 "
+
 KEYWORDS="~amd64"
-DESCRIPTION="Miscellaneous tools for working with the Google Fonts collection"
-HOMEPAGE="https://github.com/googlefonts/gftools"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 
-RESTRICT="test"
-PROPERTIES="test_network"
-
+# ufolib2 is an indirect dependency
 RDEPEND="
 	dev-python/statmake[${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		app-arch/brotli[python,${PYTHON_USEDEP}]
+		dev-python/ufoLib2[${PYTHON_USEDEP}]
+
+		dev-python/fonttools[${PYTHON_USEDEP}]
+		>=dev-python/axisregistry-0.2.0[${PYTHON_USEDEP}]
 		dev-python/absl-py[${PYTHON_USEDEP}]
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-python/PyGithub[${PYTHON_USEDEP}]
+		dev-python/vttlib[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/babelfont[${PYTHON_USEDEP}]
-		dev-python/browserstack-local-python[${PYTHON_USEDEP}]
-		dev-python/fonttools[${PYTHON_USEDEP}]
+		dev-python/ttfautohint-py[${PYTHON_USEDEP}]
+		>=dev-util/fontmake-2.4.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}]
+		>=dev-python/gflanguages-0.4.0[${PYTHON_USEDEP}]
 		dev-python/glyphsLib[${PYTHON_USEDEP}]
+		>=dev-python/glyphsets-0.2.1[${PYTHON_USEDEP}]
 		dev-python/ots-python[${PYTHON_USEDEP}]
-		dev-python/protobuf-python[${PYTHON_USEDEP}]
-		dev-python/pybrowserstack-screenshots[${PYTHON_USEDEP}]
 		dev-python/pygit2[${PYTHON_USEDEP}]
-		dev-python/PyGithub[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/strictyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/strictyaml[${PYTHON_USEDEP}]
 		dev-python/tabulate[${PYTHON_USEDEP}]
-		dev-python/ttfautohint-py[${PYTHON_USEDEP}]
 		dev-python/unidecode[${PYTHON_USEDEP}]
-		dev-python/vttlib[${PYTHON_USEDEP}]
-		dev-util/fontmake[${PYTHON_USEDEP}]
+		dev-python/skia-pathops[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/hyperglot[${PYTHON_USEDEP}]
+		>=dev-python/fontFeatures-1.6.2[${PYTHON_USEDEP}]
 	')
 "
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tabulate[${PYTHON_USEDEP}]
-			media-gfx/fontforge[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
+DEPEND="
+	${RDEPEND}
+	$(python_gen_cond_dep '>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]')
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-setup.diff"
-	"${FILESDIR}/${PN}-tests.diff"
-)
+RESTRICT="test"
+PROPERTIES="test_network"
 
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	mv "${WORKDIR}/GlyphsInfo"/*.xml "Lib/${PN}/util/GlyphsInfo"
+	mv "${WORKDIR}/GlyphsInfo"/*.xml "Lib/gftools/util/GlyphsInfo" || die
 	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
 	distutils-r1_python_prepare_all
 }