From 16f24f0dbd38fa6fe4e2e4f63a62de7ba8256bdf Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Sat, 24 Dec 2022 06:18:46 +0500
Subject: [PATCH] media-fonts/3270font: update EAPI 7 -> 8

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 media-fonts/3270font/3270font-2.3.1.ebuild | 33 +++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/media-fonts/3270font/3270font-2.3.1.ebuild b/media-fonts/3270font/3270font-2.3.1.ebuild
index ef8fcf2689..b933d54880 100644
--- a/media-fonts/3270font/3270font-2.3.1.ebuild
+++ b/media-fonts/3270font/3270font-2.3.1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..9} )
-
 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"
+SRC_URI="https://github.com/rbanffy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD CC-BY-SA-3.0 GPL-3 OFL"
 SLOT="0"
@@ -18,14 +17,8 @@ IUSE="test"
 
 RESTRICT="test"
 PROPERTIES="test_network"
-DOCS=( CHANGELOG.md README.md  )
-HTML_DOCS=( "DESCRIPTION.en_us.html" )
-PATCHES=(
-	"${FILESDIR}/remove-useless-tests.patch"
-	"${FILESDIR}/${PN}-2.3.0-correctly-pass-options.patch"
-)
 
-DEPEND="
+BDEPEND="
 	${PYTHON_DEPS}
 	media-gfx/fontforge
 	test? (
@@ -38,17 +31,23 @@ DEPEND="
 	)
 "
 
+DOCS=( CHANGELOG.md README.md  )
+HTML_DOCS=( "DESCRIPTION.en_us.html" )
+
+PATCHES=(
+	"${FILESDIR}/remove-useless-tests.patch"
+	"${FILESDIR}/${PN}-2.3.0-correctly-pass-options.patch"
+)
+
 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/pillow[${PYTHON_USEDEP}]" && \
-	has_version -d "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
+	use test || return 0
+	python_has_version -b "dev-python/ipdb[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/pillow[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-util/gftools[${PYTHON_SINGLE_USEDEP}]" &&
+	python_has_version -b "media-gfx/fontbakery[${PYTHON_USEDEP}]"
 }
 
 src_compile() {