diff --git a/dev-python/python-oauth2/python-oauth2-1.0.1.ebuild b/dev-python/python-oauth2/python-oauth2-1.0.1.ebuild
index 0c1651f43..25b41c21c 100644
--- a/dev-python/python-oauth2/python-oauth2-1.0.1.ebuild
+++ b/dev-python/python-oauth2/python-oauth2-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ RDEPEND="dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
 	dev-python/python-memcached[${PYTHON_USEDEP}]
 	dev-python/redis-py[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 	dev-python/mysql-connector-python[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
diff --git a/dev-python/python-oauth2/python-oauth2-1.1.0.ebuild b/dev-python/python-oauth2/python-oauth2-1.1.0.ebuild
index 0c1651f43..53d7ea8aa 100644
--- a/dev-python/python-oauth2/python-oauth2-1.1.0.ebuild
+++ b/dev-python/python-oauth2/python-oauth2-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ RDEPEND="dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/pymongo[${PYTHON_USEDEP}]
 	dev-python/python-memcached[${PYTHON_USEDEP}]
 	dev-python/redis-py[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
 	dev-python/mysql-connector-python[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index 7a57a7516..7edeff7ca 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -227,7 +227,7 @@ dev-python/pyDes
 ~dev-python/django-guardian-1.4.3
 ~dev-python/django-oauth-plus-2.2.8
 ~dev-python/python-oauth2-1.0.1
-~dev-python/mysql-connector-python-2.1.4
+=dev-python/mysql-connector-python-2.1*
 ~dev-python/django-oauth-toolkit-1.0.0
 ~dev-python/oauthlib-2.0.3
 ~dev-python/django-1.11.2