gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-29 22:28:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/six: Force usage of distutils over setuptools

Browse Source 
Avoids circular dependency.

Bug: https://bugs.gentoo.org/572792

Package-Manager: portage-2.2.27_p49
This commit is contained in:
Mike Gilbert
2016-01-26 23:16:18 -05:00
parent 5bee96bf42
commit f520d401bb
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-python/six/files/1.10.0-no-setuptools.patch Normal file
View File

@@ -0,0 +1,22 @@
Force distutils to avoid depending on setuptools
distutils and setuptools have differing behavior in regard to egg-info
directories versus files, so we need to ensure that no automagic behavior
occurs here.
We cannot hard-depend on setuptools due to a circular dependency.
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,6 @@
from __future__ import with_statement
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+from distutils.core import setup
import six

6
dev-python/six/six-1.10.0.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,13 +18,13 @@ 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}] )"
PATCHES=(
"${FILESDIR}"/1.10.0-no-setuptools.patch
"${FILESDIR}"/1.9.0-mapping.patch
)
)
python_prepare_all() {
# https://bitbucket.org/gutworth/six/issues/139/

6
dev-python/six/six-1.9.0-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,14 +18,14 @@ 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}] )"
PATCHES=(
"${FILESDIR}"/1.10.0-no-setuptools.patch
"${FILESDIR}"/${PV}-mapping.patch
"${FILESDIR}"/${P}-winreg.patch
)
)
python_compile_all() {
use doc && emake -C documentation html