From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 31 Jan 2017 04:30:07 +0000 (-0500)
Subject: dev-python/six: remove version bump landmine
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4f025cf97aac69073960ff9adbfaa033c4c94320;p=gentoo.git

dev-python/six: remove version bump landmine

setuptools depends on six once again!

Package-Manager: Portage-2.3.3_p42_p432702, Repoman-2.3.1_p35_p432702
---

diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
index f9ecdabbcf96..49c16138f820 100644
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -26,15 +26,6 @@ PATCHES=(
 	"${FILESDIR}"/1.9.0-mapping.patch
 )
 
-if [[ ${PV} != 1.10.0 ]]; then
-	# There is no longer a circular dep with setuptools, so please do the following
-	# Drop 1.10.0-no-setuptools.patch
-	# Add a dependency on dev-python/setuptools[${PYTHON_USEDEP}]
-	# Remove pkg_preinst
-	# Thanks! - Mike Gilbert (floppym)
-	die "Please read the ebuild for notes on this version bump"
-fi
-
 python_prepare_all() {
 	# https://bitbucket.org/gutworth/six/issues/139/
 	sed \