From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4433358973 for ; Tue, 26 Jan 2016 20:10:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 650C321C01D; Tue, 26 Jan 2016 20:10:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E8B4721C01D for ; Tue, 26 Jan 2016 20:10:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19B3C340756 for ; Tue, 26 Jan 2016 20:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B24F5C0 for ; Tue, 26 Jan 2016 20:10:11 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1453839007.34a1ddd2aebdbd949c5caf22d7350a84b8267971.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/six/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/six/six-1.10.0.ebuild dev-python/six/six-1.9.0-r1.ebuild dev-python/six/six-9999.ebuild X-VCS-Directories: dev-python/six/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 34a1ddd2aebdbd949c5caf22d7350a84b8267971 X-VCS-Branch: master Date: Tue, 26 Jan 2016 20:10:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 171834e9-11a9-4904-a237-e01ec3ac4fb1 X-Archives-Hash: 5def512abeeb53c1ddcd24b0e95c24e6 commit: 34a1ddd2aebdbd949c5caf22d7350a84b8267971 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jan 26 20:07:48 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jan 26 20:10:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34a1ddd2 Revert "dev-python/six: Drop forced dependency on setuptools" This reverts commit a15786aa5f40452b1270fa04d4ffdbc8e034b29c. This change is bound to cause egg-info file/directory conflicts. Also, upstream requires setuptools unconditionally as of 2016-01-20. https://bitbucket.org/gutworth/six/commits/1c793cff Bug: https://bugs.gentoo.org/572792 dev-python/six/six-1.10.0.ebuild | 3 ++- dev-python/six/six-1.9.0-r1.ebuild | 3 ++- dev-python/six/six-9999.ebuild | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index c0986d6..cb6a767 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,6 +18,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc IUSE="doc test" DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx ) test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )" diff --git a/dev-python/six/six-1.9.0-r1.ebuild b/dev-python/six/six-1.9.0-r1.ebuild index 67dc3a8..6ab5558 100644 --- a/dev-python/six/six-1.9.0-r1.ebuild +++ b/dev-python/six/six-1.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,6 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh IUSE="doc test" DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild index 72c6783..1807e5e 100644 --- a/dev-python/six/six-9999.ebuild +++ b/dev-python/six/six-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) +PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 ) inherit distutils-r1 mercurial @@ -19,6 +19,7 @@ KEYWORDS="" IUSE="doc test" DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx ) test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"