diff --git a/dev-python/neteria/Manifest b/dev-python/neteria/Manifest
index 91e8d31..33e3e5c 100644
--- a/dev-python/neteria/Manifest
+++ b/dev-python/neteria/Manifest
@@ -1,3 +1,4 @@
-DIST neteria-1.0.2.tar.gz 17250 BLAKE2B 7d15465afc37b731fdec5e37931b35a185ffcbdc2baa97fb237afd1816a385c304b291a39ddd3c1a8de3571eb22d1436942f50b9d3bbba0b2124bcf2de0ebb73 SHA512 3ff4f75106e44b8995a0838050cba484c36a16d4bf6e1f01bd6beb9a3e43c17acefb4875f33f047cd5032e1c805c2bda9497ef83b34ca8fbb156db06ff4fea2f
-EBUILD neteria-1.0.2.ebuild 466 BLAKE2B b2d88230eae63b17e88511412ca3ca2c3a984aac240c3534187aace1f111ae6c215c98d80a0d6e32ea511aa91b7d91d9354d26311a321c073663fa3b1de23797 SHA512 559fe641259a64c29f2aa2704f224699622cc23c3096f60edbf31f205f916b750e3a0f6eecdc82b2120f1967c38bdefeb73b887f404597b52903d1671d988b2c
-MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
+DIST neteria-1.0.2.gh.tar.gz 38682 BLAKE2B 39f4519a15cb5714e9816680716ce8851d9085f275b07b7078fdf8953deab22f1a9cabf92aa3553f74d502ce5fe83d620c95802112fbe8fb859ac8eb118fd14b SHA512 25e82deb25fbdb698c46daf741fbdc6d14d564a42066648870939c65b3631ac54481b4e95769e8defc1674cf3ab36c78d222bb609c641506e4bbde239a149528
+EBUILD neteria-1.0.2.ebuild 760 BLAKE2B d801fe732e80e6818538bef6ef5590a093fe01e3851ab86b92737955f7d2e73bfb61da277c732322688f04e8cd50e169010dcfba1a3e6759d1f9d5c8ba88b3ff SHA512 c451575fd8030094ad4462d78f2f3a85b031074098ed7538d0d410df79b957a4bff0bf13fa3bda97514217ff339107625398f2c7f131ecd6859480c203d0eb36
+EBUILD neteria-9999.ebuild 760 BLAKE2B d801fe732e80e6818538bef6ef5590a093fe01e3851ab86b92737955f7d2e73bfb61da277c732322688f04e8cd50e169010dcfba1a3e6759d1f9d5c8ba88b3ff SHA512 c451575fd8030094ad4462d78f2f3a85b031074098ed7538d0d410df79b957a4bff0bf13fa3bda97514217ff339107625398f2c7f131ecd6859480c203d0eb36
+MISC metadata.xml 370 BLAKE2B 396c5ecff6368640bc175e91b4101d7994aea79eb1fd8d928d0e19cb382e679fd06c72955a4e58ea28e244b409b77ad28dcf51d9763fd92537f467a126098a80 SHA512 90dda9411ca0b60580de588fd902cc107089c8d7d3cdb5f12714090563fdd0495460f7212459124e075fd5a1d292da3184d2f2b6884840c5dc7c14a1fdc4c53f
diff --git a/dev-python/neteria/metadata.xml b/dev-python/neteria/metadata.xml
index b27c0d9..2bb61c6 100644
--- a/dev-python/neteria/metadata.xml
+++ b/dev-python/neteria/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>flewkey@2a03.party</email>
-<name>Ryan Fox</name>
-</maintainer>
+	<maintainer type="person">
+		<email>flewkey@2a03.party</email>
+		<name>Ryan Fox</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">neteria</remote-id>
+		<remote-id type="github">ShadowBlip/Neteria</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/neteria/neteria-1.0.2.ebuild b/dev-python/neteria/neteria-1.0.2.ebuild
index a1d2d00..be93c7f 100644
--- a/dev-python/neteria/neteria-1.0.2.ebuild
+++ b/dev-python/neteria/neteria-1.0.2.ebuild
@@ -1,24 +1,31 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{5..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ShadowBlip/Neteria.git"
+else
+	MY_PN="Neteria"
+	MY_PV="e1f36e7d66bb86e54a620314f7b7352d3aca621a"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/ShadowBlip/Neteria/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
 
 DESCRIPTION="Open source game networking framework for Python"
 HOMEPAGE="https://github.com/ShadowBlip/Neteria"
 LICENSE="GPL-2"
 SLOT="0"
+RESTRICT="test"
 
 DEPEND=""
-RDEPEND="
-	${DEPEND}
-	dev-python/rsa
-"
+RDEPEND="dev-python/rsa[${PYTHON_USEDEP}]"
 BDEPEND=""
diff --git a/dev-python/neteria/neteria-9999.ebuild b/dev-python/neteria/neteria-9999.ebuild
new file mode 100644
index 0000000..be93c7f
--- /dev/null
+++ b/dev-python/neteria/neteria-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ShadowBlip/Neteria.git"
+else
+	MY_PN="Neteria"
+	MY_PV="e1f36e7d66bb86e54a620314f7b7352d3aca621a"
+	MY_P="${MY_PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/ShadowBlip/Neteria/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Open source game networking framework for Python"
+HOMEPAGE="https://github.com/ShadowBlip/Neteria"
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="dev-python/rsa[${PYTHON_USEDEP}]"
+BDEPEND=""