diff --git a/dev-python/genshi/ChangeLog b/dev-python/genshi/ChangeLog
index 61c29065..43abc21b 100644
--- a/dev-python/genshi/ChangeLog
+++ b/dev-python/genshi/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-python/genshi
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2017; Mario Fetka <mario@gentoo.org> -genshi-0.6.1.ebuild,
+  genshi-0.7.ebuild:
+  switch to distutils-r1
+
   22 Apr 2013; Mario Fetka <mario.fetka@gmail.com> genshi-0.7.ebuild:
   remove test
 
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index eb2beeb3..48c0c883 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,8 +1,6 @@
 AUX genshi-0.6-html_test.patch 2000 SHA256 76e1b2f5acc4c90c6f5c7a273b5510474ca0b1226246df382e2f3e6f52bbbb0f SHA512 009e9e2e727cec1dd895dfb36e6cd783f509648d6a8663c8db41258d12f93c5093a90f0d4d3c6671532f018623e505e8cee53cb3cc501cb25ee4d195e96b74fd WHIRLPOOL a8d10385617fae64b3e3d87826b43001ed1d39882cb2affdb336d91d44259e55c23b78f5c61b3d8da8ab348626b9bfa4c21f8b4b6949510aa9991ffe5ce9a0e4
 AUX genshi-0.6.1-html_test.patch 2000 SHA256 76e1b2f5acc4c90c6f5c7a273b5510474ca0b1226246df382e2f3e6f52bbbb0f SHA512 009e9e2e727cec1dd895dfb36e6cd783f509648d6a8663c8db41258d12f93c5093a90f0d4d3c6671532f018623e505e8cee53cb3cc501cb25ee4d195e96b74fd WHIRLPOOL a8d10385617fae64b3e3d87826b43001ed1d39882cb2affdb336d91d44259e55c23b78f5c61b3d8da8ab348626b9bfa4c21f8b4b6949510aa9991ffe5ce9a0e4
-DIST Genshi-0.6.1.tar.gz 486230 SHA256 fed947f11dbcb6792bb7161701ec3b9804055ad68c8af0ab4f0f9b25e9a18dbd SHA512 63d250d802ce4c87749348dc5b0a0a76713bd8ebb3db425aa5f77f5450a07e7342fc69b98399e3366d347f0b3fbe9b626cab142d8116e5069cca387f5371d0e2 WHIRLPOOL a620b291cd5423fd583300139c1db506156f93d1b8a126e9625856aa2b5a5377f355aa072e22ccaf9784e92d7c22e67f04dff3baf10ceb74f9e8672a8ec6c352
 DIST Genshi-0.7.tar.gz 491579 SHA256 1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf WHIRLPOOL 5e1a7af061d28a581c8a028ae7343a2b80697eb8bca01c8609345a3f2146db190a596d3488c0bde5aa132ac930d591ff1babd033ccb532c7cac7d2931751f906
-EBUILD genshi-0.6.1.ebuild 2067 SHA256 7cfbd3fbafe48c625563d8da2c50ff5d2399288cc69a2679375532657e147d1a SHA512 0166b46f239f3d7632086cb139c55869746eeef2801f96d0b6ed959c0fa20e293b3ed28b638f7c435db0f1121d6b227d9da2d2e7540f55ba13a4a90a2f21ba4b WHIRLPOOL 4b5ecd5757ac919e354deb4441e33a0fb49c3dcc48bf062fd3ff00a7073880a6dccb26857415f324af9b8f1c7defebfcb175a9917c9a1e8c312e6708bb556d6c
-EBUILD genshi-0.7.ebuild 1050 SHA256 c1c8ae307d6d1238b511875710d2edbabcff263825052debc31e293407aafaa2 SHA512 2998157014095fb3eb35164c6e5ac5b0b5a77ef3683a6e4d72a064bd94448ba1aa30b5b0e25c1faa94335f996d51f34390f2f1afe6d140abcb46da0864942ec1 WHIRLPOOL 947fafae0304015d4dd1ff8c20beb0cac54b95eb1f0544f025a896977f25d5505d824ca87d4556b689364631be697f3840c8f5ad40585ab452d465395e681c1b
-MISC ChangeLog 412 SHA256 276a0b075f97729fe72677272cfe2ad9e34d84b9cd28c4d7e450cece93b54765 SHA512 98998689eea0f3f539088c1853d1536d553d61f7f309fb3d43d5373d340279b06f7c17add683832db22012953da17893444ab3883494d1df699bc861fb150a0b WHIRLPOOL 4d6ecf74e01719a4da7773925b119a533a6564ee154204f6465dc895f83188e3701d4f393bfee2ae8cf915e3acec6db24e993e3c64a15711388a31acc92ef34d
+EBUILD genshi-0.7.ebuild 919 SHA256 1a6d040c2e2cf0f05370261ec3a6d2dd6c99524805f31cd4f47e016532895c3e SHA512 ea5d063a9aacd46c483ffd8b3bf7d30aafe4f9906aa20f4406273d4914ae670c6f8f4281f6ef1df2a09e757a3f36856b92605b4dbe3322cbd2d790adb42fe939 WHIRLPOOL 7b00f706b9e04fab7b3f8ef2a99f94460ff2071a18fe0208e51a4f91cb49f90bb2cae1e41985e105a6563277d3ec89cddd6d26d032a5f1901d9805ec2d4f9d90
+MISC ChangeLog 527 SHA256 d4e3c36d47f2a0fd2a5dec482c64efb1f51be404ede854c9f79f75c984589aa1 SHA512 f84f981c3a8ed871aa22af66af5e30d68a17ea45487223cc10bb931b951bd654e7b61012af3ce150666dfc67e60cb3d937709c73810c93d37a93d98271f1aedf WHIRLPOOL 1a61f72a29feb4667db7d5e7082da73c6b64696c4551d436565957f7c6b37a8b06b94c728638b2206838495d7986a2b90cf8bc2bb7dc2802e8dc36043d4cfe90
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
diff --git a/dev-python/genshi/genshi-0.6.1.ebuild b/dev-python/genshi/genshi-0.6.1.ebuild
deleted file mode 100644
index 20413726..00000000
--- a/dev-python/genshi/genshi-0.6.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.6.ebuild,v 1.9 2012/11/06 19:27:08 mr_bones_ Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-# Need call setup.py test manually making this for now redundant
-#DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-MY_P="Genshi-${PV}"
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web."
-HOMEPAGE="http://genshi.edgewall.org/ http://pypi.python.org/pypi/Genshi"
-SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	cp genshi/filters/tests/html.py orig_html.py || die
-	epatch "${FILESDIR}"/${P}-html_test.patch
-}
-
-src_test() {
-	# The html_test.patch is needed only for python2.7 for now, breaks all other versions. The html.py needs
-	# adjusting only to pass the tests for 2.7. Other ABIs still need the original filters/tests/html.py,
-	# hence this long winded juggling appears the only method to set a viable genshi/filters/tests/html.py
-	# for each python version. The test needed patching, instead they changed the genshi/filters/tests/html.py
-	setHtmlpy() {
-		for f in build-${PYTHON_ABI}; do
-			if [[ ${PYTHON_ABI:2:3} < '7' || ${PYTHON_ABI:4:4} == "pypy" ]]; then
-				mv genshi/filters/tests/html.py patched_html.py || die
-				mv orig_html.py genshi/filters/tests/html.py || die
-				"$(PYTHON)" setup.py test
-				mv genshi/filters/tests/html.py orig_html.py
-				mv patched_html.py genshi/filters/tests/html.py || die
-			else
-				"$(PYTHON)" setup.py test
-			fi
-		done
-	}
-	python_execute_function setHtmlpy
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dodoc doc/*.txt
-		dohtml -r doc/*
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild
index 4c7a6ece..3abdfb66 100644
--- a/dev-python/genshi/genshi-0.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.ebuild
@@ -1,15 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/genshi/genshi-0.6.ebuild,v 1.9 2012/11/06 19:27:08 mr_bones_ Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-# Need call setup.py test manually making this for now redundant
-#DISTUTILS_SRC_TEST="setup.py"
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit distutils eutils
+inherit distutils-r1 eutils
 
 MY_P="Genshi-${PV}"