diff --git a/dev-python/python-oauth2/Manifest b/dev-python/python-oauth2/Manifest
index f82ee75e9..0b79ca55b 100644
--- a/dev-python/python-oauth2/Manifest
+++ b/dev-python/python-oauth2/Manifest
@@ -1,2 +1 @@
-DIST python-oauth2-1.1.0.tar.gz 42017 BLAKE2B c0a3896f17975f55acb09b625c8ff1a4d69830156db1e7e505cc69621893554b06fad9bdf7e9e7d58558765b895b59524b9a3950c66fd642349a5679d9ee996b SHA512 51f1697d292c8fd5087886ca8cfde810a19ad54e39894e3687afedd3b69aa988da657c283a9496e03ffc2b40bb206e1e26bc7bab704ea1fe8a80e300f17e8700
 DIST python-oauth2-1.1.1.tar.gz 45363 BLAKE2B 26d502ab0f577d1ec50462bec50ce43ae94f7fd54ccc9145c731b2c1c2795f84eb939bdaea6fea43b8866076f065700a04f329c84c52114e3455507da0058d10 SHA512 5dad5ebf38298379fb430426f57f705bcfe38137c418d7b5afa837ab2473e699e0bf63cbc2078c28ca87fcdb10303f5a94cc4028739217c352eecb280a8e7847
diff --git a/dev-python/python-oauth2/python-oauth2-1.1.0-r1.ebuild b/dev-python/python-oauth2/python-oauth2-1.1.0-r1.ebuild
deleted file mode 100644
index fe9652b18..000000000
--- a/dev-python/python-oauth2/python-oauth2-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OAuth 2.0 provider for python"
-HOMEPAGE="https://pypi.python.org/pypi/python-oauth2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]
-	dev-python/pymongo[${PYTHON_USEDEP}]
-	dev-python/python-memcached[${PYTHON_USEDEP}]
-	dev-python/redis-py[${PYTHON_USEDEP}]
-	!dev-python/tornado
-	www-servers/tornado[${PYTHON_USEDEP}]
-	dev-python/mysql-connector-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	!!dev-python/oauth2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
-#	test? ( dev-python/mock[${PYTHON_USEDEP}]
-#	)"
-
-#python_test() {
-#	# Skip tests which require network access
-#	py.test -k "not (test_access_token_post or test_access_token_get \
-#		or test_two_legged_post or test_two_legged_get)" || die \
-#		"tests failed with ${EPYTHON}"
-#}
diff --git a/www-apps/Tiredful-API/Tiredful-API-9999.ebuild b/www-apps/Tiredful-API/Tiredful-API-9999.ebuild
index 1ef10aabe..996bae12a 100644
--- a/www-apps/Tiredful-API/Tiredful-API-9999.ebuild
+++ b/www-apps/Tiredful-API/Tiredful-API-9999.ebuild
@@ -8,20 +8,23 @@ inherit python-single-r1 git-r3
 
 DESCRIPTION="An intentionally designed broken web application based on REST API"
 HOMEPAGE="https://github.com/payatu/Tiredful-API"
-EGIT_REPO_URI="https://github.com/payatu/Tiredful-API.git"
+#EGIT_REPO_URI="https://github.com/payatu/Tiredful-API.git"
+EGIT_REPO_URI="https://github.com/siddharthbezalwar/Tiredful-API-py3-beta.git"
 
 LICENSE="GPL-3"
 SLOT="0"
-#https://github.com/payatu/Tiredful-API/issues/9
-#KEYWORDS="~amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="dev-python/django[${PYTHON_SINGLE_USEDEP}]
-	dev-python/django-oauth-toolkit[${PYTHON_SINGLE_USEDEP}]
-	dev-python/djangorestframework[${PYTHON_SINGLE_USEDEP}]
-	dev-python/oauthlib[${PYTHON_SINGLE_USEDEP}]
-	dev-python/python-oauth2[${PYTHON_SINGLE_USEDEP}]"
-#	dev-python/oauth[${PYTHON_SINGLE_USEDEP}]
+RDEPEND="$(python_gen_cond_dep '
+	dev-python/django[${PYTHON_USEDEP}]
+	dev-python/django-oauth-toolkit[${PYTHON_USEDEP}]
+	dev-python/djangorestframework[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/python-oauth2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	')"
+#	dev-python/oauth[${PYTHON_MULTI_USEDEP}]
 
 src_install() {
 	dodir /opt/Tiredful-API