media-fonts/tewi-font: EAPI, remove deprecated PYTHON_COMPAT, versioning

3 files changed, 74 insertions, 5 deletions

diff --git a/media-fonts/tewi-font/Manifest b/media-fonts/tewi-font/Manifest
new file mode 100644
index 0000000..1f3f61c
--- /dev/null
+++ b/media-fonts/tewi-font/Manifest
@@ -0,0 +1 @@
+DIST tewi-font-2.0.2.tar.gz 65345 BLAKE2B 66b507aae47e8cef6eb23ea5f6ea9403a8387ff1ae2349641357ba53fe97bf1503f038b3cb9a4580befc632a999fbc60657a7c36ac989958b318a4b85c13d036 SHA512 823b4c399a64ff66280323ae09f7f3c1dc51a7e2506acfcc9e8f509d600e7bc193e523755f0921921ceb09763e16babc5258467485d3a5260b37055bcfad9123
diff --git a/media-fonts/tewi-font/tewi-font-2.0.2.ebuild b/media-fonts/tewi-font/tewi-font-2.0.2.ebuild
new file mode 100644
index 0000000..b2fd871
--- /dev/null
+++ b/media-fonts/tewi-font/tewi-font-2.0.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+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}
+
+DESCRIPTION="A small bitmap font"
+HOMEPAGE="https://github.com/lucy/tewi-font"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/lucy/tewi-font/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+pcf"
+
+DEPEND="x11-libs/libX11
+	pcf? ( x11-apps/bdftopcf )
+"
+RDEPEND="x11-libs/libX11"
+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
+
+	font_src_install
+}
diff --git a/media-fonts/tewi-font/tewi-font-9999.ebuild b/media-fonts/tewi-font/tewi-font-9999.ebuild
index 60cb553..d8aefb5 100644
--- a/media-fonts/tewi-font/tewi-font-9999.ebuild
+++ b/media-fonts/tewi-font/tewi-font-9999.ebuild
@@ -1,25 +1,39 @@
 # Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit git-r3 font python-any-r1
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/lucy/tewi-font.git"
+fi
+
+inherit font python-any-r1 ${SCM}
 
 DESCRIPTION="A small bitmap font"
 HOMEPAGE="https://github.com/lucy/tewi-font"
-EGIT_REPO_URI="https://github.com/lucy/tewi-font.git"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/lucy/tewi-font/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="+pcf"
 
 DEPEND="x11-libs/libX11
 	pcf? ( x11-apps/bdftopcf )
 "
 RDEPEND="x11-libs/libX11"
+BDEPEND=""
+
+S="${WORKDIR}/${P}"
 
 src_compile() {
 	if use pcf; then