diff --git a/net-proxy/mitmproxy/mitmproxy-1.0.2-r1.ebuild b/net-proxy/mitmproxy/mitmproxy-1.0.2-r1.ebuild
index b4c2936b0..9b1078456 100644
--- a/net-proxy/mitmproxy/mitmproxy-1.0.2-r1.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-1.0.2-r1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
+
 PYTHON_COMPAT=( python3_{3,4,5} )
-
 inherit distutils-r1 versionator
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
diff --git a/net-proxy/mitmproxy/mitmproxy-2.0.2.ebuild b/net-proxy/mitmproxy/mitmproxy-2.0.2.ebuild
index c4bb898b3..2ba800524 100644
--- a/net-proxy/mitmproxy/mitmproxy-2.0.2.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-2.0.2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
+
 PYTHON_COMPAT=( python3_{3,4,5} )
-
 inherit distutils-r1 versionator
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
@@ -40,13 +39,12 @@ RDEPEND="
 	>=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] <dev-python/watchdog-0.9
 	>=dev-python/brotlipy-0.5.1[${PYTHON_USEDEP}] <dev-python/brotlipy-0.7
 	>=dev-python/sortedcontainers-1.5.4[${PYTHON_USEDEP}] <dev-python/sortedcontainers-1.6
+	examples? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] <dev-python/beautifulsoup-4.6:4
+		>=dev-python/pytz-2015.07.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2[${PYTHON_USEDEP}] <dev-python/pillow-4.1
+	)
 "
 
-#	examples? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] <dev-python/beautifulsoup-4.6
-#		>=dev-python/pytz-2015.07.0[${PYTHON_USEDEP}]
-#		>=dev-python/pillow-3.2[${PYTHON_USEDEP}] <dev-python/pillow-4.1
-#	)
-
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-11.3[${PYTHON_USEDEP}]
 	test? (
diff --git a/net-proxy/mitmproxy/mitmproxy-9999.ebuild b/net-proxy/mitmproxy/mitmproxy-9999.ebuild
index df51d6127..2ed4b6896 100644
--- a/net-proxy/mitmproxy/mitmproxy-9999.ebuild
+++ b/net-proxy/mitmproxy/mitmproxy-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=6
+
 PYTHON_COMPAT=( python3_{4,5} )
-
 inherit distutils-r1 versionator git-r3
 
 DESCRIPTION="An interactive, SSL-capable, man-in-the-middle HTTP proxy"
@@ -41,7 +40,7 @@ RDEPEND="
 	>=dev-python/urwid-1.3.1[${PYTHON_USEDEP}] <dev-python/urwid-1.4
 
 	examples? ( >=dev-python/pillow-3.2[${PYTHON_USEDEP}] <dev-python/pillow-3.5
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}] <dev-python/beautifulsoup-4.7
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}] <dev-python/beautifulsoup-4.7:4
 	)
 "