public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/, media-fonts/3270font/files/
@ 2021-04-17  2:20 Alessandro Barbieri
  0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-04-17  2:20 UTC (permalink / raw
  To: gentoo-commits

commit:     21a729db6d86128c74f275894bd1bd5bbf61f786
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Apr 17 02:18:49 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Apr 17 02:20:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=21a729db

media-fonts/3270font: make the test work

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-fonts/3270font/3270font-2.2.1-r1.ebuild      | 41 ++++++++++++++++++++++
 .../3270font/files/remove-useless-tests.patch      | 20 +++++++++++
 2 files changed, 61 insertions(+)

diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
new file mode 100644
index 000000000..90792efaf
--- /dev/null
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit font python-any-r1
+
+DESCRIPTION="A IBM 3270 Terminal font in a modern format"
+HOMEPAGE="https://github.com/rbanffy/3270font"
+SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+DOCS=( CHANGELOG.md README.md  )
+HTML_DOCS=( "DESCRIPTION.en_us.html" )
+PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
+RDEPEND="
+	media-gfx/fontforge
+"
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}
+	test? (
+		dev-python/ipdb
+		dev-python/pillow
+	)
+"
+
+FONT_S="${S}/build"
+FONT_SUFFIX="otf ttf pfm woff"
+
+src_compile() {
+	emake font
+}
+
+src_test() {
+	emake test
+}

diff --git a/media-fonts/3270font/files/remove-useless-tests.patch b/media-fonts/3270font/files/remove-useless-tests.patch
new file mode 100644
index 000000000..56fed49f7
--- /dev/null
+++ b/media-fonts/3270font/files/remove-useless-tests.patch
@@ -0,0 +1,20 @@
+--- a/Makefile	2021-04-17 04:14:57.220030609 +0200
++++ b/Makefile	2021-04-17 04:15:23.615508374 +0200
+@@ -73,17 +73,11 @@
+ 	@./fontbakery_checks.sh
+ 
+ skimpytest: font ## Runs the minimal tests and verifies the ZIP file mentioned in the README is present.
+-	@flake8 *.py
+-	@isort --check-only *.py
+-	@black --check -l79 *.py
+ 	@fontlint ${BUILD_DIR}/3270-Regular.otf
+ 	@fontlint ${BUILD_DIR}/3270-Regular.ttf
+ 	@fontlint ${BUILD_DIR}/3270-Regular.woff
+ 	@fontlint ${BUILD_DIR}/3270SemiCondensed-Regular.ttf
+ 	@fontlint ${BUILD_DIR}/3270Condensed-Regular.ttf
+-	@wget --spider $(shell grep -Eo \
+-		'https://3270font.s3.amazonaws.com/3270_fonts_[^/"]+\.zip' \
+-		README.md)
+ 
+ test: skimpytest ## Generates and checks font files
+ # These are tests that fail on Travis (because their fontlint can't ignore


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/, media-fonts/3270font/files/
@ 2021-06-21  2:52 Alessandro Barbieri
  0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-06-21  2:52 UTC (permalink / raw
  To: gentoo-commits

commit:     c373af08d88b6489310560f57cde99465b7fbb04
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Jun 21 02:51:45 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Mon Jun 21 02:51:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c373af08

media-fonts/3270font: add 2.3.0, drop 2.2.1-r1

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

 .../{3270font-2.2.1-r1.ebuild => 3270font-2.3.0.ebuild}    | 14 +++++++-------
 media-fonts/3270font/Manifest                              |  2 +-
 media-fonts/3270font/files/remove-useless-tests.patch      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.3.0.ebuild
similarity index 86%
rename from media-fonts/3270font/3270font-2.2.1-r1.ebuild
rename to media-fonts/3270font/3270font-2.3.0.ebuild
index 1ed424368..c1ccd1dac 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.3.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
+
 inherit font python-any-r1
 
 DESCRIPTION="A IBM 3270 Terminal font in a modern format"
@@ -19,18 +20,17 @@ RESTRICT="!test? ( test )"
 
 DOCS=( CHANGELOG.md README.md  )
 HTML_DOCS=( "DESCRIPTION.en_us.html" )
-
 PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
-RDEPEND="
-	media-gfx/fontforge
-"
+
+RDEPEND=""
 DEPEND="
 	${PYTHON_DEPS}
-	${RDEPEND}
+	media-gfx/fontforge
 	test? (
 		$(python_gen_any_dep '
 			dev-python/ipdb[${PYTHON_USEDEP}]
 			dev-python/pillow[${PYTHON_USEDEP}]
+			dev-util/gftools[${PYTHON_SINGLE_USEDEP}]
 		')
 	)
 "
@@ -39,7 +39,7 @@ FONT_S="${S}/build"
 FONT_SUFFIX="otf ttf pfm woff"
 
 python_check_deps() {
-	has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" &&
+	has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" && \
 	has_version -d "dev-python/pillow[${PYTHON_USEDEP}]"
 }
 

diff --git a/media-fonts/3270font/Manifest b/media-fonts/3270font/Manifest
index d18511b7b..28b5cd17c 100644
--- a/media-fonts/3270font/Manifest
+++ b/media-fonts/3270font/Manifest
@@ -1 +1 @@
-DIST 3270font-2.2.1.tar.gz 518982 BLAKE2B 43cb01f569ff51ac250609fe0788025ed9cdb8dcbc09b090ed0ea74c3d77f07e2c42c123f9f7c82b0beadd6f8c486901727dad668893450916d2adabb7769012 SHA512 055e126eecdd190c425d84e0656170057a900a40475d357a52287ea87759d842808085be6fec14fdee6a5fccdf446422cc115d60aa5b2892e8e787f6fcc83c92
+DIST 3270font-2.3.0.tar.gz 520106 BLAKE2B e3ece6a0f476d20bf4135057739a73deee49050b6be9b4bd3731b228729f622d059c53a122a266332e02e71af08dc6b13f215358dc275edd91247e3119d249be SHA512 26d1a32990b0ea8395959ed37d7acc76f1f1d160488ff6e96bb39fc8ca952339c09ed06cb0783a69b6ef6545be72ed63665af3584f79852fe0a813301f77ea7d

diff --git a/media-fonts/3270font/files/remove-useless-tests.patch b/media-fonts/3270font/files/remove-useless-tests.patch
index 56fed49f7..c8a860d97 100644
--- a/media-fonts/3270font/files/remove-useless-tests.patch
+++ b/media-fonts/3270font/files/remove-useless-tests.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2021-04-17 04:14:57.220030609 +0200
-+++ b/Makefile	2021-04-17 04:15:23.615508374 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -73,17 +73,11 @@
  	@./fontbakery_checks.sh
  


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/, media-fonts/3270font/files/
@ 2021-07-11  0:29 Alessandro Barbieri
  0 siblings, 0 replies; 3+ messages in thread
From: Alessandro Barbieri @ 2021-07-11  0:29 UTC (permalink / raw
  To: gentoo-commits

commit:     68fb39a0c807e8b8e604ee7da9c767c4a1d4f585
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 00:23:29 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Jul 11 00:29:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=68fb39a0

media-fonts/3270font: add fontbakery tests

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

 media-fonts/3270font/3270font-2.3.0.ebuild                | 15 ++++++++++-----
 .../files/3270font-2.3.0-correctly-pass-options.patch     | 10 ++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/media-fonts/3270font/3270font-2.3.0.ebuild b/media-fonts/3270font/3270font-2.3.0.ebuild
index c1ccd1dac..16356a8d7 100644
--- a/media-fonts/3270font/3270font-2.3.0.ebuild
+++ b/media-fonts/3270font/3270font-2.3.0.ebuild
@@ -14,15 +14,17 @@ SRC_URI="https://github.com/rbanffy/3270font/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
 SLOT="0"
 KEYWORDS="~amd64"
-
 IUSE="test"
-RESTRICT="!test? ( test )"
 
+RESTRICT="test"
+PROPERTIES="test_network"
 DOCS=( CHANGELOG.md README.md  )
 HTML_DOCS=( "DESCRIPTION.en_us.html" )
-PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
+PATCHES=(
+	"${FILESDIR}/remove-useless-tests.patch"
+	"${FILESDIR}/${P}-correctly-pass-options.patch"
+)
 
-RDEPEND=""
 DEPEND="
 	${PYTHON_DEPS}
 	media-gfx/fontforge
@@ -31,6 +33,7 @@ DEPEND="
 			dev-python/ipdb[${PYTHON_USEDEP}]
 			dev-python/pillow[${PYTHON_USEDEP}]
 			dev-util/gftools[${PYTHON_SINGLE_USEDEP}]
+			media-gfx/fontbakery[${PYTHON_USEDEP}]
 		')
 	)
 "
@@ -40,7 +43,8 @@ FONT_SUFFIX="otf ttf pfm woff"
 
 python_check_deps() {
 	has_version -d "dev-python/ipdb[${PYTHON_USEDEP}]" && \
-	has_version -d "dev-python/pillow[${PYTHON_USEDEP}]"
+	has_version -d "dev-python/pillow[${PYTHON_USEDEP}]" && \
+	has_version -d "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]"
 }
 
 pkg_setup() {
@@ -53,4 +57,5 @@ src_compile() {
 
 src_test() {
 	emake test
+	emake fbchecks
 }

diff --git a/media-fonts/3270font/files/3270font-2.3.0-correctly-pass-options.patch b/media-fonts/3270font/files/3270font-2.3.0-correctly-pass-options.patch
new file mode 100644
index 000000000..7d8dc6224
--- /dev/null
+++ b/media-fonts/3270font/files/3270font-2.3.0-correctly-pass-options.patch
@@ -0,0 +1,10 @@
+--- a/fontbakery_checks.sh
++++ b/fontbakery_checks.sh
+@@ -36,6 +36,6 @@
+ for fontdir in "$OUTPUT_DIR"/*
+ do
+   if [ -d "$fontdir" ]; then
+-    fontbakery check-googlefonts "$OPTIONS" "$fontdir"/*.ttf
++    fontbakery check-googlefonts $OPTIONS "$fontdir"/*.ttf
+   fi
+ done


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-07-11  0:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-17  2:20 [gentoo-commits] repo/proj/guru:dev commit in: media-fonts/3270font/, media-fonts/3270font/files/ Alessandro Barbieri
  -- strict thread matches above, loose matches on Subject: below --
2021-06-21  2:52 Alessandro Barbieri
2021-07-11  0:29 Alessandro Barbieri

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox