| 1 |
commit: 34a1ddd2aebdbd949c5caf22d7350a84b8267971 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 26 20:07:48 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 26 20:10:07 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a1ddd2 |
| 7 |
|
| 8 |
Revert "dev-python/six: Drop forced dependency on setuptools" |
| 9 |
|
| 10 |
This reverts commit a15786aa5f40452b1270fa04d4ffdbc8e034b29c. |
| 11 |
|
| 12 |
This change is bound to cause egg-info file/directory conflicts. |
| 13 |
|
| 14 |
Also, upstream requires setuptools unconditionally as of 2016-01-20. |
| 15 |
|
| 16 |
https://bitbucket.org/gutworth/six/commits/1c793cff |
| 17 |
|
| 18 |
Bug: https://bugs.gentoo.org/572792 |
| 19 |
|
| 20 |
dev-python/six/six-1.10.0.ebuild | 3 ++- |
| 21 |
dev-python/six/six-1.9.0-r1.ebuild | 3 ++- |
| 22 |
dev-python/six/six-9999.ebuild | 7 ++++--- |
| 23 |
3 files changed, 8 insertions(+), 5 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild |
| 26 |
index c0986d6..cb6a767 100644 |
| 27 |
--- a/dev-python/six/six-1.10.0.ebuild |
| 28 |
+++ b/dev-python/six/six-1.10.0.ebuild |
| 29 |
@@ -1,4 +1,4 @@ |
| 30 |
-# Copyright 1999-2016 Gentoo Foundation |
| 31 |
+# Copyright 1999-2015 Gentoo Foundation |
| 32 |
# Distributed under the terms of the GNU General Public License v2 |
| 33 |
# $Id$ |
| 34 |
|
| 35 |
@@ -18,6 +18,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc |
| 36 |
IUSE="doc test" |
| 37 |
|
| 38 |
DEPEND=" |
| 39 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 40 |
doc? ( dev-python/sphinx ) |
| 41 |
test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" |
| 42 |
|
| 43 |
|
| 44 |
diff --git a/dev-python/six/six-1.9.0-r1.ebuild b/dev-python/six/six-1.9.0-r1.ebuild |
| 45 |
index 67dc3a8..6ab5558 100644 |
| 46 |
--- a/dev-python/six/six-1.9.0-r1.ebuild |
| 47 |
+++ b/dev-python/six/six-1.9.0-r1.ebuild |
| 48 |
@@ -1,4 +1,4 @@ |
| 49 |
-# Copyright 1999-2016 Gentoo Foundation |
| 50 |
+# Copyright 1999-2015 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Id$ |
| 53 |
|
| 54 |
@@ -18,6 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh |
| 55 |
IUSE="doc test" |
| 56 |
|
| 57 |
DEPEND=" |
| 58 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 59 |
doc? ( dev-python/sphinx ) |
| 60 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild |
| 64 |
index 72c6783..1807e5e 100644 |
| 65 |
--- a/dev-python/six/six-9999.ebuild |
| 66 |
+++ b/dev-python/six/six-9999.ebuild |
| 67 |
@@ -1,10 +1,10 @@ |
| 68 |
-# Copyright 1999-2016 Gentoo Foundation |
| 69 |
+# Copyright 1999-2015 Gentoo Foundation |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
# $Id$ |
| 72 |
|
| 73 |
-EAPI=6 |
| 74 |
+EAPI=5 |
| 75 |
|
| 76 |
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) |
| 77 |
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) |
| 78 |
|
| 79 |
inherit distutils-r1 mercurial |
| 80 |
|
| 81 |
@@ -19,6 +19,7 @@ KEYWORDS="" |
| 82 |
IUSE="doc test" |
| 83 |
|
| 84 |
DEPEND=" |
| 85 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 86 |
doc? ( dev-python/sphinx ) |
| 87 |
test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" |
Archives