diff --git a/www-apps/trac-mercurial/Manifest b/www-apps/trac-mercurial/Manifest
index bc03517..5aaf5ca 100644
--- a/www-apps/trac-mercurial/Manifest
+++ b/www-apps/trac-mercurial/Manifest
@@ -1,4 +1,3 @@
-EBUILD trac-mercurial-0.12.0.28.ebuild 749 SHA256 980b8516c77aa4733b39a9579bf9d218099be0c391c035d4c85824045b2c69e4 SHA512 89efde69bebe8b9b54faac1aae3080e7be59cdaa03aeb7b76a055c106f8ebdf112a9b0e2fefd1493af4f0a6f8860ff0db1da781f8bccf69f7328da3de09ca3e8 WHIRLPOOL 5596e03e84aba23b125023a1939df37ed8ca2b39741792bc67776555be4cfc4862ffedec788a011fe00e4bf38ff5e68a4aed454e76ba9184f339a3d035bcad8a
-EBUILD trac-mercurial-1.0.0.7.ebuild 609 SHA256 4d1dafd3c5bd2f4fea024e97866abdb54255f3141328f4c0d5a4a8bc8fae00d7 SHA512 a31923f184eb40ae7195c352a0bf427e8bdcfbffbae5638587ab71eb0d5be98df797cc81720497dffd598abe342fdeee73a13539bfb98cd3b2358a4469f54bd7 WHIRLPOOL 0b89c9c368f054f7505c49055e186860b487fe29f5c5557b6057a32f64902bc6a7ba29dfd9eae4661e0587e3973666db6369d1484c3eb227921d4693e9b3e344
+EBUILD trac-mercurial-1.0.0.7-r1.ebuild 645 SHA256 1755efa8d3a4ed853d85f77b977fa28bc6b0aeff238d269e4654986efbf3259d SHA512 dc20c67a84f071ddc5631df76b0c539811cbd8b52e95800a011eaf2a810fb904df62e6b4f993de96a3445a2633bee233addd4fbbea6f996c611a21cfee1c2ad2 WHIRLPOOL 2994d1e52814a4458a9c0ba6613e7f283db93ce63f8918cd5f49f7a3fa087617604066817e3a904cf194f3012cbb530fcf5ff8a080dbba26c81005babd963ec6
 MISC ChangeLog 397 SHA256 e2059c12c36a5251781938b5f912c4ac0e2046c9a0c4b2362148cb14a67dbacb SHA512 848b0131cb88a9d80a2c94d286277a8d2bc6a8d38f4202a570f64b3c87640a0420444bd00d46f70f01a5d5634edbe4ab1592426cd06d6a2c57534c99d99807eb WHIRLPOOL 8b9486f41669ac571fce66b1466fbda9961639e0e130dd94408a6e9eac2cbadd598f017a6a1be3ba72c1f5fad296a36bdaa2069814d0f0524657148886b4217e
 MISC metadata.xml 273 SHA256 3d3f08ce7408e697bd4cd26a7159b3678cf3747111488a38f9dcbef96689e707 SHA512 47621b053955c031e6cd8e1119efc97943a8c1aa2672e72af422b1d1ff247fe1255240f2d0a7043c7e89a3eda65b3fc10525975398ba3e43b92bc7711a0e2870 WHIRLPOOL 91f0b9228efbdc87df2823e87b2d24cfd6b7398d3f5d490d7f88c2140d64896b766bc48c8b746bd46bc017bc93a99dfc3fc04a80ef35866f29bcee865877f979
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.28.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.28.ebuild
deleted file mode 100644
index d3c609c..0000000
--- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.28.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac-mercurial/trac-mercurial-0.12.0.23.ebuild,v 1.1 2011/01/14 21:32:48 rafaelmartins Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils subversion
-
-MY_PN="TracMercurial"
-MY_P="${MY_PN}-${PV}"
-ESVN_REPO_URI="http://svn.edgewall.com/repos/trac/plugins/0.12/mercurial-plugin"
-ESVN_REVISION="10748"
-
-DESCRIPTION="A Mercurial plugin for Trac"
-HOMEPAGE="http://trac.edgewall.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=www-apps/trac-0.12
-	>=dev-vcs/mercurial-1.1"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.7-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.7-r1.ebuild
new file mode 100644
index 0000000..d7e3a0b
--- /dev/null
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.7-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 mercurial
+
+MY_PN="TracMercurial"
+MY_P="${MY_PN}-${PV/_pre/dev-r}"
+
+DESCRIPTION="A Mercurial plugin for Trac"
+HOMEPAGE="https://trac.edgewall.org/wiki/TracMercurial"
+EHG_REPO_URI="https://hg.edgewall.org/trac/mercurial-plugin"
+EHG_REVISION="d9139f9a3601"
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}]
+		>=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.7.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.7.ebuild
deleted file mode 100644
index f03da87..0000000
--- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils mercurial
-
-MY_PN="TracMercurial"
-MY_P="${MY_PN}-${PV}"
-EHG_REPO_URI="https://hg.edgewall.org/trac/mercurial-plugin"
-EHG_REVISION="ed4f0932196b"
-
-DESCRIPTION="A Mercurial plugin for Trac"
-HOMEPAGE="http://trac.edgewall.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND=">=www-apps/trac-1.0
-	>=dev-vcs/mercurial-2.0"
-
-S="${WORKDIR}/${MY_P}"