From b15c2f379321d89e3b19760344008f9831ffcd5b Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Sun, 18 Apr 2021 02:07:45 +0200
Subject: [PATCH] media-fonts/3270font: move to python-single-r1

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 media-fonts/3270font/3270font-2.2.1-r1.ebuild | 10 +++--
 media-fonts/3270font/3270font-2.2.1.ebuild    | 43 -------------------
 2 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 media-fonts/3270font/3270font-2.2.1.ebuild

diff --git a/media-fonts/3270font/3270font-2.2.1-r1.ebuild b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
index 540fd1c48b..da7ce9a467 100644
--- a/media-fonts/3270font/3270font-2.2.1-r1.ebuild
+++ b/media-fonts/3270font/3270font-2.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{7,8} )
-inherit font python-any-r1
+inherit font python-single-r1
 
 DESCRIPTION="A IBM 3270 Terminal font in a modern format"
 HOMEPAGE="https://github.com/rbanffy/3270font"
@@ -22,16 +22,20 @@ HTML_DOCS=( "DESCRIPTION.en_us.html" )
 
 PATCHES=( "${FILESDIR}/remove-useless-tests.patch" )
 RDEPEND="
+	${PYTHON_DEPS}
 	media-gfx/fontforge
 "
 DEPEND="
 	${PYTHON_DEPS}
 	${RDEPEND}
 	test? (
-		dev-python/ipdb
-		dev-python/pillow
+		$(python_gen_cond_dep '
+			dev-python/ipdb[${PYTHON_USEDEP}]
+			dev-python/pillow[${PYTHON_USEDEP}]
+		')
 	)
 "
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 FONT_S="${S}/build"
 FONT_SUFFIX="otf ttf pfm woff"
diff --git a/media-fonts/3270font/3270font-2.2.1.ebuild b/media-fonts/3270font/3270font-2.2.1.ebuild
deleted file mode 100644
index eaa42e814c..0000000000
--- a/media-fonts/3270font/3270font-2.2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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" )
-#test need network
-RESTRICT="test"
-RDEPEND="
-	media-gfx/fontforge
-"
-DEPEND="
-	${PYTHON_DEPS}
-	${RDEPEND}
-	test? (
-		dev-python/black
-		dev-python/ipdb
-		dev-python/pillow
-	)
-"
-
-FONT_S="${S}/build"
-FONT_SUFFIX="otf ttf pfm woff"
-
-src_compile() {
-	emake font
-}
-
-src_test() {
-	emake test
-}