Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/six/
Date: Tue, 31 Jan 2017 04:44:22
Message-Id: 1485837839.4f025cf97aac69073960ff9adbfaa033c4c94320.floppym@gentoo
1 commit: 4f025cf97aac69073960ff9adbfaa033c4c94320
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 04:30:07 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 04:43:59 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f025cf9
7
8 dev-python/six: remove version bump landmine
9
10 setuptools depends on six once again!
11
12 Package-Manager: Portage-2.3.3_p42_p432702, Repoman-2.3.1_p35_p432702
13
14 dev-python/six/six-1.10.0.ebuild | 9 ---------
15 1 file changed, 9 deletions(-)
16
17 diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
18 index f9ecdab..49c1613 100644
19 --- a/dev-python/six/six-1.10.0.ebuild
20 +++ b/dev-python/six/six-1.10.0.ebuild
21 @@ -26,15 +26,6 @@ PATCHES=(
22 "${FILESDIR}"/1.9.0-mapping.patch
23 )
24
25 -if [[ ${PV} != 1.10.0 ]]; then
26 - # There is no longer a circular dep with setuptools, so please do the following
27 - # Drop 1.10.0-no-setuptools.patch
28 - # Add a dependency on dev-python/setuptools[${PYTHON_USEDEP}]
29 - # Remove pkg_preinst
30 - # Thanks! - Mike Gilbert (floppym)
31 - die "Please read the ebuild for notes on this version bump"
32 -fi
33 -
34 python_prepare_all() {
35 # https://bitbucket.org/gutworth/six/issues/139/
36 sed \