| 1 |
commit: b37173851bce8c0b8d6edd3ba7c881add7245d82 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 12:38:54 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 15:54:22 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3717385 |
| 7 |
|
| 8 |
www-apps/trac-mercurial: Switch to python-single-r1, due to trac dep |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
...9-r1.ebuild => trac-mercurial-0.12.0.29_pre10899-r2.ebuild} | 10 ++++++---- |
| 13 |
.../trac-mercurial-1.0.0.3_pre20130206-r1.ebuild | 10 ++++++---- |
| 14 |
2 files changed, 12 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild |
| 17 |
similarity index 68% |
| 18 |
rename from www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild |
| 19 |
rename to www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild |
| 20 |
index e661cc957b6..705c196994e 100644 |
| 21 |
--- a/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r1.ebuild |
| 22 |
+++ b/www-apps/trac-mercurial/trac-mercurial-0.12.0.29_pre10899-r2.ebuild |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
-# Copyright 1999-2017 Gentoo Foundation |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
|
| 30 |
+DISTUTILS_SINGLE_IMPL=1 |
| 31 |
PYTHON_COMPAT=( python2_7 ) |
| 32 |
|
| 33 |
inherit distutils-r1 |
| 34 |
@@ -19,8 +20,9 @@ SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
IUSE="" |
| 37 |
|
| 38 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 39 |
-RDEPEND=">=www-apps/trac-0.12[${PYTHON_USEDEP}] |
| 40 |
- >=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]" |
| 41 |
+RDEPEND=">=www-apps/trac-0.12[${PYTHON_SINGLE_USEDEP}] |
| 42 |
+ $(python_gen_cond_dep ' |
| 43 |
+ >=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}] |
| 44 |
+ ')" |
| 45 |
|
| 46 |
S="${WORKDIR}/${MY_P}" |
| 47 |
|
| 48 |
diff --git a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild |
| 49 |
index 9b4f678dd53..6aa50c5b940 100644 |
| 50 |
--- a/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild |
| 51 |
+++ b/www-apps/trac-mercurial/trac-mercurial-1.0.0.3_pre20130206-r1.ebuild |
| 52 |
@@ -1,8 +1,9 @@ |
| 53 |
-# Copyright 1999-2017 Gentoo Foundation |
| 54 |
+# Copyright 1999-2020 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
EAPI=6 |
| 58 |
|
| 59 |
+DISTUTILS_SINGLE_IMPL=1 |
| 60 |
PYTHON_COMPAT=( python2_7 ) |
| 61 |
|
| 62 |
inherit distutils-r1 mercurial |
| 63 |
@@ -20,8 +21,9 @@ SLOT="0" |
| 64 |
# KEYWORDS="~amd64 ~x86" |
| 65 |
IUSE="" |
| 66 |
|
| 67 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
| 68 |
-RDEPEND=">=www-apps/trac-1.0[${PYTHON_USEDEP}] |
| 69 |
- >=dev-vcs/mercurial-1.1[${PYTHON_USEDEP}]" |
| 70 |
+RDEPEND=">=www-apps/trac-1.0[${PYTHON_SINGLE_USEDEP}] |
| 71 |
+ $(python_gen_cond_dep ' |
| 72 |
+ >=dev-vcs/mercurial-1.1[${PYTHON_MULTI_USEDEP}] |
| 73 |
+ ')" |
| 74 |
|
| 75 |
S="${WORKDIR}/${MY_P}" |
Archives