diff --git a/dev-python/pyprotocols/files/SkipTests.patch b/dev-python/pyprotocols/files/SkipTests.patch
index 7e362678fe4f6..293f0a2a06261 100644
--- a/dev-python/pyprotocols/files/SkipTests.patch
+++ b/dev-python/pyprotocols/files/SkipTests.patch
@@ -1,6 +1,5 @@
-diff -ur PyProtocols.orig/src/protocols/tests/__init__.py PyProtocols/src/protocols/tests/__init__.py
---- src/protocols/tests/__init__.py	2007-04-25 12:15:46.000000000 +0800
-+++ src/protocols/tests/__init__.py	2013-04-10 19:22:28.720647271 +0800
+--- a/src/protocols/tests/__init__.py
++++ b/src/protocols/tests/__init__.py
 @@ -256,22 +256,6 @@
          makeSuite(GenerationTests,'check'),
      ]
diff --git a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
index 628f002ad00a3..8a8f9f0b4bdc8 100644
--- a/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-1.0_pre2306-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 flag-o-matic eutils
+inherit distutils-r1 flag-o-matic
 
 MY_PN="PyProtocols"
 MY_P="${MY_PN}-${PV/_pre/a0dev_r}"
@@ -26,12 +27,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}"
 
+PATCHES=( "${FILESDIR}"/SkipTests.patch )
 DOCS=( CHANGES.txt README.txt UPGRADING.txt )
 
 python_prepare_all() {
 	# Rm peripheral & rogue failing tests
 	rm -f src//protocols/tests/{test_twisted.py,test_zope.py} || die
-	epatch "${FILESDIR}"/SkipTests.patch
+
+	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
@@ -39,6 +42,5 @@ python_configure_all() {
 }
 
 python_test() {
-	esetup.py test && einfo "Tests passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
+	esetup.py test || die "Tests failed under ${EPYTHON}"
 }