diff --git a/dev-python/gpxpy/Manifest b/dev-python/gpxpy/Manifest
index 4b6715b..c5485e5 100644
--- a/dev-python/gpxpy/Manifest
+++ b/dev-python/gpxpy/Manifest
@@ -1,4 +1,4 @@
-DIST gpxpy-1.5.0.tar.gz 113446 BLAKE2B 0ed256a3eb869a610027ffea1706c4a3465cc8c7f9ec67cbeebe93a643b03d2ff1cb24442122928624f37d11115f9bfb8f8e83d0e0f1d3a89d132b4f07b71456 SHA512 08705fa0f78e0539d4b6b84723b01fa6b62a13de0ec25d034da2c14e6cabea14debe92e2a9c4120476bd21f6ea502da8e68217043ad9a401c365895bb69698b0
-EBUILD gpxpy-1.5.0.ebuild 564 BLAKE2B 41259f04c70ab84f1d85521e25a307bef5c09084ff2916192a299b04945838fddb001ba42751ae6fffb274cdc73a773cd43e481f049bdb9fef40a1995da79d1e SHA512 d0b1e7274192e16c063c19fa5ade6d84f0612f8284ee1cde68d3168ffa555f8e24a1813f151cb1bcab45b0fed7fea159277c1870db0975587aa89b98573a8fda
-EBUILD gpxpy-9999.ebuild 564 BLAKE2B 41259f04c70ab84f1d85521e25a307bef5c09084ff2916192a299b04945838fddb001ba42751ae6fffb274cdc73a773cd43e481f049bdb9fef40a1995da79d1e SHA512 d0b1e7274192e16c063c19fa5ade6d84f0612f8284ee1cde68d3168ffa555f8e24a1813f151cb1bcab45b0fed7fea159277c1870db0975587aa89b98573a8fda
-MISC metadata.xml 236 BLAKE2B fdb34c66e3059efc0efb2328ffedb24c495be95dfeb68b7adcdf5ab1a88eee6788294d07ec032238de7d9127cffd50a1598b42aa8f99d3d11f54a761c79a9482 SHA512 43add4c2db3d06110521dea982cfcbddc98d63bb1e1b89952511654d54f09746e0d76ac1e0f0e70d2832357f44fe11fc4653500b856c7b29d05a55bb70535e80
+DIST gpxpy-1.5.0.gh.tar.gz 113446 BLAKE2B 0ed256a3eb869a610027ffea1706c4a3465cc8c7f9ec67cbeebe93a643b03d2ff1cb24442122928624f37d11115f9bfb8f8e83d0e0f1d3a89d132b4f07b71456 SHA512 08705fa0f78e0539d4b6b84723b01fa6b62a13de0ec25d034da2c14e6cabea14debe92e2a9c4120476bd21f6ea502da8e68217043ad9a401c365895bb69698b0
+EBUILD gpxpy-1.5.0.ebuild 598 BLAKE2B f62b98d500cb1e321d0e5f66393505c0125c8bf33a550f29a1b6345f4e5d6acc5360b296c0b7e27657065ca045544d809be2db10d3a599ec56d9427f79e37918 SHA512 7cd3c7c5176509a6117aa9e87b3d9f5f5ecce6a3057d10748f42a87c7652807ba9225cbd5f1c8638517c3ca049483c0913c3638d586484b46f236d0d57bcf20e
+EBUILD gpxpy-9999.ebuild 598 BLAKE2B f62b98d500cb1e321d0e5f66393505c0125c8bf33a550f29a1b6345f4e5d6acc5360b296c0b7e27657065ca045544d809be2db10d3a599ec56d9427f79e37918 SHA512 7cd3c7c5176509a6117aa9e87b3d9f5f5ecce6a3057d10748f42a87c7652807ba9225cbd5f1c8638517c3ca049483c0913c3638d586484b46f236d0d57bcf20e
+MISC metadata.xml 364 BLAKE2B 6e3f75fa162bcb67eb538b59b22fbe506b1815b89b229acd68f7b48aebbfb01d0645683400353686e8abbcf6186fdddf984b9aa148599b6ac84c0f3fdbd343ec SHA512 73352ab4c21e646a9f367c09a307a2ccc0f8917a086fa5e292e41801b77c1bef5a7d295361af0c555851de5a5f65acdb0d79bd5d8b9996339049ce37c0043169
diff --git a/dev-python/gpxpy/gpxpy-1.5.0.ebuild b/dev-python/gpxpy/gpxpy-1.5.0.ebuild
index 2ad97e9..cdc8f9b 100644
--- a/dev-python/gpxpy/gpxpy-1.5.0.ebuild
+++ b/dev-python/gpxpy/gpxpy-1.5.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tkrajina/gpxpy.git"
+else
+	SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="GPX file parser and GPS track manipulation library"
diff --git a/dev-python/gpxpy/gpxpy-9999.ebuild b/dev-python/gpxpy/gpxpy-9999.ebuild
index 2ad97e9..cdc8f9b 100644
--- a/dev-python/gpxpy/gpxpy-9999.ebuild
+++ b/dev-python/gpxpy/gpxpy-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tkrajina/gpxpy.git"
+else
+	SRC_URI="https://github.com/tkrajina/gpxpy/archive/v${PV}.tar.gz  -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="GPX file parser and GPS track manipulation library"
diff --git a/dev-python/gpxpy/metadata.xml b/dev-python/gpxpy/metadata.xml
index b27c0d9..f1d7ed2 100644
--- a/dev-python/gpxpy/metadata.xml
+++ b/dev-python/gpxpy/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">gpxpy</remote-id>
+		<remote-id type="github">tkrajina/gpxpy</remote-id>
+	</upstream>
 </pkgmetadata>