3 files changed, 36 insertions, 40 deletions
diff --git a/media-fonts/siji/metadata.xml b/media-fonts/siji/metadata.xml
index 4abb855..8f5ed50 100644
--- a/media-fonts/siji/metadata.xml
+++ b/media-fonts/siji/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">stark/siji</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-fonts/siji/siji-9999-r1.ebuild b/media-fonts/siji/siji-9999-r1.ebuild
new file mode 100644
index 0000000..db5ddf9
--- /dev/null
+++ b/media-fonts/siji/siji-9999-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/stark/siji.git"
+fi
+
+inherit font font-ebdftopcf ${SCM}
+
+DESCRIPTION="An iconic bitmap font based on Stlarch with additional glyphs"
+HOMEPAGE="https://github.com/stark/siji"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/stark/siji/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DOCS=( Readme.md )
+FONT_S=( ${S}/bdf )
diff --git a/media-fonts/siji/siji-9999.ebuild b/media-fonts/siji/siji-9999.ebuild
deleted file mode 100644
index 5a50658..0000000
--- a/media-fonts/siji/siji-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3 font
-
-DESCRIPTION="An iconic bitmap font based on Stlarch with additional glyphs"
-HOMEPAGE="https://github.com/stark/siji"
-EGIT_REPO_URI="https://github.com/stark/siji.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+pcf"
-
-DEPEND="x11-apps/bdftopcf"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_compile() {
-	if use pcf; then
-		bdftopcf bdf/${PN}.bdf -o pcf/${PN}.pcf
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/fonts/${PN}"
-
-	if use pcf; then
-		doins pcf/*
-	else
-		doins bdf/*
-	fi
-}