diff --git a/dev-python/anyascii/Manifest b/dev-python/anyascii/Manifest
index 2181622c8c..47730721fc 100644
--- a/dev-python/anyascii/Manifest
+++ b/dev-python/anyascii/Manifest
@@ -1 +1 @@
-DIST anyascii-0.3.1.tar.gz 8943636 BLAKE2B 0659ee933bb43e72f39106b799f03524f0a6e4d89b312aae497c62a43107984f6862a02603b82c08fbe2697a1f3835cad005979974df8d719215bd08d2ed0b6e SHA512 4f836dcb09bfec55b40068c962ebda535c7c7ab37ad0ce71021bedc0248f3a70ae46398df033704a3944cf9d645ac9aa03f4e8764791d5f576eacd449f426815
+DIST anyascii-0.3.1.tar.gz 212676 BLAKE2B fcb2c637a94308a8b144442012a29728a62738eff31e0c3f5db4adfea859868061215a5c045da0828e3783b44148b697ef73ab250780426b4428b2782d5f1168 SHA512 f6e6ef9bb48622bf5c6854551413ba97e90943e72c896e2dd4c43eed7e9aef731bd6fe76f2816f8a86bfa04de7a89c7188ead349499f055d8d243522e79ddde6
diff --git a/dev-python/anyascii/anyascii-0.3.1.ebuild b/dev-python/anyascii/anyascii-0.3.1.ebuild
index bb1baf0b1e..bf309d69b8 100644
--- a/dev-python/anyascii/anyascii-0.3.1.ebuild
+++ b/dev-python/anyascii/anyascii-0.3.1.ebuild
@@ -1,25 +1,46 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..11} ) # pypy3 )
-# DISTUTILS_USE_PEP517=setuptools
-# inherit distutils-r1
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=(python3_{8..11})
 inherit distutils-r1
 
 DESCRIPTION="Unicode to ASCII transliteration"
-HOMEPAGE="https://github.com/anyascii/anyascii/"
-SRC_URI="https://github.com/anyascii/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-KEYWORDS="~amd64"
-SLOT="0"
-
-DEPEND="
-	${PYTHON_DEPS}
+HOMEPAGE="
+	https://pypi.org/project/anyascii/
 "
 
-S=${WORKDIR}/${P}/impl/python
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anyascii/anyascii.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/a/anyascii/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
 
 distutils_enable_tests pytest
+
+src_compile() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_compile
+		popd || die
+	else
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_install
+		popd || die
+	else
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-python/anyascii/anyascii-9999.ebuild b/dev-python/anyascii/anyascii-9999.ebuild
new file mode 100644
index 0000000000..bf309d69b8
--- /dev/null
+++ b/dev-python/anyascii/anyascii-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=(python3_{8..11})
+inherit distutils-r1
+
+DESCRIPTION="Unicode to ASCII transliteration"
+HOMEPAGE="
+	https://pypi.org/project/anyascii/
+"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/anyascii/anyascii.git"
+else
+	SRC_URI="https://files.pythonhosted.org/packages/source/a/anyascii/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+distutils_enable_tests pytest
+
+src_compile() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_compile
+		popd || die
+	else
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	if [[ ${PV} == *9999 ]]; then
+		pushd "${S}/impl/python" || die
+		distutils-r1_src_install
+		popd || die
+	else
+		distutils-r1_src_install
+	fi
+}
diff --git a/dev-python/anyascii/metadata.xml b/dev-python/anyascii/metadata.xml
index 3771874aa0..a603561289 100644
--- a/dev-python/anyascii/metadata.xml
+++ b/dev-python/anyascii/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+    <maintainer type="person">
+        <email>ran.dall@icloud.com</email>
+        <name>Randall T. Vasquez</name>
+    </maintainer>
 	<maintainer type="person">
 		<email>pascal.jaeger@leimstift.de</email>
 		<name>Pascal Jaeger</name>
 	</maintainer>
+    <upstream>
+        <remote-id type="github">anyascii/anyascii"</remote-id>
+        <remote-id type="pypi">anyascii</remote-id>
+        <bugs-to> https://github.com/anyascii/anyascii/issues"</bugs-to>
+    </upstream>
 </pkgmetadata>