diff --git a/app-portage/gpyutils/gpyutils-0.3.ebuild b/app-portage/gpyutils/gpyutils-0.3.ebuild
index 7eef1417fd806..728e83dbc335e 100644
--- a/app-portage/gpyutils/gpyutils-0.3.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.3.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1
diff --git a/app-portage/gpyutils/gpyutils-9999.ebuild b/app-portage/gpyutils/gpyutils-9999.ebuild
index 42df3c3086a11..68bbe846daaee 100644
--- a/app-portage/gpyutils/gpyutils-9999.ebuild
+++ b/app-portage/gpyutils/gpyutils-9999.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
 
 EGIT_REPO_URI="https://github.com/mgorny/gpyutils.git"
@@ -16,7 +18,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
+RDEPEND=">=app-portage/gentoopm-0.3.1[${PYTHON_USEDEP}]"
 
 python_test() {
 	esetup.py test