summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-08-25 10:15:06 +0200
committerJustin Lecher <jlec@gentoo.org>2015-08-25 10:15:57 +0200
commit9313f9b5faba3b6930096de281101f8b71360810 (patch)
tree0dae7fb3ad4f7bb9f83e86dc681a7eacb707ffac
parentmedia-sound/clementine: Added subslot dependency for media-libs/glew (diff)
downloadgentoo-9313f9b5faba3b6930096de281101f8b71360810.tar.gz
gentoo-9313f9b5faba3b6930096de281101f8b71360810.tar.bz2
gentoo-9313f9b5faba3b6930096de281101f8b71360810.zip
dev-python/setuptools: Revered unbundling of dev-python/packaging
setuptools without packaging requires packaging which requires setuptools No way around this circular dependency as it is buildtime Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=534026 Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
-rw-r--r--dev-python/setuptools/setuptools-18.2-r2.ebuild (renamed from dev-python/setuptools/setuptools-18.2-r1.ebuild)6
1 files changed, 2 insertions, 4 deletions
diff --git a/dev-python/setuptools/setuptools-18.2-r1.ebuild b/dev-python/setuptools/setuptools-18.2-r2.ebuild
index 6de3213a1adb..e75cef0c66c1 100644
--- a/dev-python/setuptools/setuptools-18.2-r1.ebuild
+++ b/dev-python/setuptools/setuptools-18.2-r2.ebuild
@@ -14,11 +14,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
-RDEPEND=">=dev-python/packaging-15.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="
test? (
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
@@ -31,7 +30,6 @@ DISTUTILS_IN_SOURCE_BUILD=1
DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
python_prepare_all() {
- rm -r ./pkg_resources/_vendor || die
# disable tests requiring a network connection
rm setuptools/tests/test_packageindex.py || die