media-fonts/tewi-font: Update ebuilds, metadata

We ditch Python and upstream scripts/Makefile completey and rely solely
on font-ebdftopcf.eclass

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Azat Bahawi <azahi@teknik.io>

3 files changed, 18 insertions, 56 deletions

diff --git a/media-fonts/tewi-font/metadata.xml b/media-fonts/tewi-font/metadata.xml
index 4abb855..f24b7d7 100644
--- a/media-fonts/tewi-font/metadata.xml
+++ b/media-fonts/tewi-font/metadata.xml
@@ -5,9 +5,7 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
-	<use>
-		<flag name="pcf">
-			Install pcf files instead of bdf
-		</flag>
-	</use>
+	<upstream>
+		<remote-id type="github">lucy/tewi-font</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/tewi-font/tewi-font-2.0.2.ebuild b/media-fonts/tewi-font/tewi-font-2.0.2-r1.ebuild
index b2fd871..aa5790c 100644
--- a/media-fonts/tewi-font/tewi-font-2.0.2.ebuild
+++ b/media-fonts/tewi-font/tewi-font-2.0.2-r1.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-
 if [[ ${PV} == *9999 ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/lucy/tewi-font.git"
 fi
 
-inherit font python-any-r1 ${SCM}
+inherit font font-ebdftopcf ${SCM}
 
 DESCRIPTION="A small bitmap font"
 HOMEPAGE="https://github.com/lucy/tewi-font"
@@ -25,30 +23,15 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+pcf"
+IUSE=""
 
-DEPEND="x11-libs/libX11
-	pcf? ( x11-apps/bdftopcf )
-"
-RDEPEND="x11-libs/libX11"
+DEPEND=""
+RDEPEND="${DEPEND}"
 BDEPEND=""
 
-src_compile() {
-	if use pcf; then
-		emake
-	else
-		emake var
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/fonts/${PN}"
-
-	if use pcf; then
-		doins out/*
-	else
-		doins *.bdf
-	fi
+DOCS=( README.md )
+FONT_S=( ${S} ${S}/variant )
 
-	font_src_install
+src_compile() {
+	font-ebdftopcf_src_compile
 }
diff --git a/media-fonts/tewi-font/tewi-font-9999.ebuild b/media-fonts/tewi-font/tewi-font-9999-r1.ebuild
index d8aefb5..aa5790c 100644
--- a/media-fonts/tewi-font/tewi-font-9999.ebuild
+++ b/media-fonts/tewi-font/tewi-font-9999-r1.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-
 if [[ ${PV} == *9999 ]]; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/lucy/tewi-font.git"
 fi
 
-inherit font python-any-r1 ${SCM}
+inherit font font-ebdftopcf ${SCM}
 
 DESCRIPTION="A small bitmap font"
 HOMEPAGE="https://github.com/lucy/tewi-font"
@@ -25,32 +23,15 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+pcf"
+IUSE=""
 
-DEPEND="x11-libs/libX11
-	pcf? ( x11-apps/bdftopcf )
-"
-RDEPEND="x11-libs/libX11"
+DEPEND=""
+RDEPEND="${DEPEND}"
 BDEPEND=""
 
-S="${WORKDIR}/${P}"
+DOCS=( README.md )
+FONT_S=( ${S} ${S}/variant )
 
 src_compile() {
-	if use pcf; then
-		emake
-	else
-		emake var
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/fonts/${PN}"
-
-	if use pcf; then
-		doins out/*
-	else
-		doins *.bdf
-	fi
-
-	font_src_install
+	font-ebdftopcf_src_compile
 }