diff --git a/games-rpg/tuxemon/Manifest b/games-rpg/tuxemon/Manifest
index f6e4cea..7d0c8f4 100644
--- a/games-rpg/tuxemon/Manifest
+++ b/games-rpg/tuxemon/Manifest
@@ -1,6 +1,8 @@
 DIST tuxemon-0.4.32.tar.gz 172063147 BLAKE2B 32d1654da9795af9aef850f8727443f3c5222aacb6d8dab6fb7bba3dfbc1a0a167f57676d0b676b1522abc870ba4bc58d8016fcb3a4744daa586f889ed0cc51d SHA512 0ada6183a9ea91e6dd4b21218186d58b9b0eb307931eb4c95225ba71379eab799fb969d65acdc9f7c39b1f3a76ffe4a5c5dc75da25dc314feaeef4c9109a76ec
 DIST tuxemon-0.4.33.tar.gz 172067965 BLAKE2B cb36bb33a2c56e973c15ca13cccad046953bfdab5039d38c3220228a1fefe14a05b6b4667812e39dcb78e3079a0300c871610865aead15a9a30ffc5bf7b3cd1f SHA512 53f1a806cf10504b071b0280ff054d9a0236516553c23e21028d10fbb04a97cae01272ab501193295f3820e0101cf0b1ba6c23c417f877aa54c38145a3d0f59d
+DIST tuxemon-0.4.34.gh.tar.gz 173335263 BLAKE2B ac98ec6486fd65690118f034948acded8426340894abaf049720af7f577ec99ea716a5d6688c9e21d0a5c58f100f56239ce42b0d6b66103b8a4776f063f0a00e SHA512 795ee8100589d93837d22c7e18a212e6091c354d8ec3698d205cd67f18054248e12a0c5800c2b6df03ddf79a1022355a82c9c3f43c801b4ac6bd0fd299ebc687
 EBUILD tuxemon-0.4.32.ebuild 1115 BLAKE2B bb30f89a10f3306d0de2acf4987c41e77947c9da9854881a4e1820b3b92e5c2c4a11a4f6c28915558a074e39319e2b7f3c3257f1b978631038cee267a4e1cf90 SHA512 85144ee1a5d24a34b492d4954e07a2f6a389ed563ad50630c908ca1e82478cca5ee9ea68ee680c413a95ef2518676445f2152dd5d5e214fa992dc232d9c97bcc
 EBUILD tuxemon-0.4.33.ebuild 1142 BLAKE2B 8b1dc08680c05c85e752687bc9df2464e9972c9f3dbd7d3adcffee11de13f3d92a10006e88bebbd8e355d86afd41959a17365a542a2be4807f8ae9b555c6dab5 SHA512 56faa3b593386b00eb91eba0daf6026610bfcb3fa2853e5015dfbe3dc718633be01a65f5bf34d8ada89df961cce6a15ee936fc4aa3c6ae159930344b0ff33cb3
-EBUILD tuxemon-9999.ebuild 1142 BLAKE2B 8b1dc08680c05c85e752687bc9df2464e9972c9f3dbd7d3adcffee11de13f3d92a10006e88bebbd8e355d86afd41959a17365a542a2be4807f8ae9b555c6dab5 SHA512 56faa3b593386b00eb91eba0daf6026610bfcb3fa2853e5015dfbe3dc718633be01a65f5bf34d8ada89df961cce6a15ee936fc4aa3c6ae159930344b0ff33cb3
+EBUILD tuxemon-0.4.34.ebuild 1481 BLAKE2B 1c0b850f632c033b869dc9683f71cd157fb0a1cea9f424037ad5b9e831b189430f8b80f0dc70468db2fc1ecda458be47d1b5492357b43aa61e5acc2baba99cc3 SHA512 cf7ab295576ff297d3de82006bcb20f0d317f5795c0f31431660b25a4f8b195a91fe2a34728f4b29cf2367f21753310102c425c41de801adad181eb034cae4b8
+EBUILD tuxemon-9999.ebuild 1481 BLAKE2B 1c0b850f632c033b869dc9683f71cd157fb0a1cea9f424037ad5b9e831b189430f8b80f0dc70468db2fc1ecda458be47d1b5492357b43aa61e5acc2baba99cc3 SHA512 cf7ab295576ff297d3de82006bcb20f0d317f5795c0f31431660b25a4f8b195a91fe2a34728f4b29cf2367f21753310102c425c41de801adad181eb034cae4b8
 MISC metadata.xml 298 BLAKE2B 80b4d3ad84ca1d1275d4961a2eeffafed2ebaabe0b5823d469743c529907d8249d1db2de625b52cf89de122c527359cf81f51294ff1a12af2975184ac652b5d6 SHA512 8baeda0a500c08319fce01d0fd023808d029cb437f1832961a039951c5188e4bd76943eeab23c7bc47b2285f03dce79b6a14305a8da6d614ca51c5b7c92c177f
diff --git a/games-rpg/tuxemon/tuxemon-0.4.34.ebuild b/games-rpg/tuxemon/tuxemon-0.4.34.ebuild
new file mode 100644
index 0000000..9546104
--- /dev/null
+++ b/games-rpg/tuxemon/tuxemon-0.4.34.ebuild
@@ -0,0 +1,59 @@
+# 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..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Tuxemon/Tuxemon.git"
+else
+	MY_PN="Tuxemon"
+	MY_P="${MY_PN}-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Tuxemon/Tuxemon/archive/v${PV}.tar.gz  -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Open source monster-fighting RPG"
+HOMEPAGE="https://www.tuxemon.org/"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+rumble"
+RESTRICT="test"
+
+DEPEND="dev-python/Babel"
+RDEPEND="
+	${DEPEND}
+	dev-python/cbor[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pygame-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pygame-menu-4.2.8[${PYTHON_USEDEP}]
+	>=dev-python/pytmx-3.31[${PYTHON_USEDEP}]
+	>=dev-python/pyscroll-2.30[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/neteria[${PYTHON_USEDEP}]
+	rumble? ( dev-libs/libshake )
+"
+BDEPEND=""
+
+src_prepare() {
+	sed -i "s/\/user\/share/\/usr\/share/" "${S}/tuxemon/constants/paths.py"
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodir /usr/share/tuxemon
+	cp -r "${S}/mods" "${D}/usr/share/tuxemon"
+}
+
+#distutils_enable_tests unittest
diff --git a/games-rpg/tuxemon/tuxemon-9999.ebuild b/games-rpg/tuxemon/tuxemon-9999.ebuild
index 64acb01..9546104 100644
--- a/games-rpg/tuxemon/tuxemon-9999.ebuild
+++ b/games-rpg/tuxemon/tuxemon-9999.ebuild
@@ -1,22 +1,22 @@
-# 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_SETUPTOOLS=bdepend
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-if [[ ${PV} != *9999* ]]; then
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Tuxemon/Tuxemon.git"
+else
 	MY_PN="Tuxemon"
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/Tuxemon/Tuxemon/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Tuxemon/Tuxemon/archive/v${PV}.tar.gz  -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Tuxemon/Tuxemon.git"
 fi
 
 DESCRIPTION="Open source monster-fighting RPG"
@@ -24,22 +24,23 @@ HOMEPAGE="https://www.tuxemon.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="+rumble"
+RESTRICT="test"
 
-DEPEND="
-	dev-python/Babel
-"
+DEPEND="dev-python/Babel"
 RDEPEND="
 	${DEPEND}
-	dev-python/cbor
-	dev-python/natsort
-	dev-python/pillow
-	dev-python/requests
-	dev-python/prompt_toolkit
-	>=dev-python/pygame-2.1.0
-	dev-python/pytmx
-	dev-python/pyscroll
-	dev-python/pyyaml
-	dev-python/neteria
+	dev-python/cbor[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pygame-2.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pygame-menu-4.2.8[${PYTHON_USEDEP}]
+	>=dev-python/pytmx-3.31[${PYTHON_USEDEP}]
+	>=dev-python/pyscroll-2.30[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/neteria[${PYTHON_USEDEP}]
 	rumble? ( dev-libs/libshake )
 "
 BDEPEND=""
@@ -54,3 +55,5 @@ src_install() {
 	dodir /usr/share/tuxemon
 	cp -r "${S}/mods" "${D}/usr/share/tuxemon"
 }
+
+#distutils_enable_tests unittest