From 3130542ee6a805690df481dca7756fd3c2cafc92 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Fri, 17 Feb 2017 19:41:10 +0100
Subject: [PATCH] www-apps/trac-mercurial: distutils-r1, EAPI=6

---
 ... trac-mercurial-0.12.0.29_pre10899-r1.ebuild} | 16 +++++++---------
 ...trac-mercurial-1.0.0.3_pre20130206-r1.ebuild} | 16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)
 rename www-apps/trac-mercurial/{trac-mercurial-0.12.0.29_pre10899.ebuild => trac-mercurial-0.12.0.29_pre10899-r1.ebuild} (60%)
 rename www-apps/trac-mercurial/{trac-mercurial-1.0.0.3_pre20130206.ebuild => trac-mercurial-1.0.0.3_pre20130206-r1.ebuild} (60%)

diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
similarity index 60%
rename from www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899.ebuild
rename to www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
index 5919028edef3..0611467c4ad4 100644
--- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899.ebuild
+++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=3
+EAPI=6
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="TracMercurial"
 MY_P="${MY_PN}-${PV/_pre/dev-r}"
@@ -22,8 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools"
-RDEPEND=">=www-apps/trac-0.12
-	>=dev-vcs/mercurial-1.1"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=www-apps/trac-0.12[${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.3_pre20130206.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
similarity index 60%
rename from www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206.ebuild
rename to www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
index 4158f02d78ac..6989df50ac58 100644
--- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206.ebuild
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils mercurial
+inherit distutils-r1 mercurial
 
 MY_PN="TracMercurial"
 MY_P="${MY_PN}-${PV/_pre/dev-r}"
@@ -23,8 +21,8 @@ SLOT="0"
 # KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-python/setuptools"
-RDEPEND=">=www-apps/trac-1.0
-		>=dev-vcs/mercurial-1.1"
+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}"
-- 
2.26.2