dev-python/*: Restore keywords and un-revbump for py3.5

Restore keywords that were removed unnecessarily, and collapse
unnecessary revbumps on packages with added python3.5 support.

2 files changed, 1 insertions, 55 deletions

diff --git a/dev-python/setuptools/setuptools-18.3.2-r1.ebuild b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
deleted file mode 100644
index a2d5b1b6f25e..000000000000
--- a/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://pypi.python.org/pypi/setuptools"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~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-r1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
-
-# Force in-source build because build system modifies sources.
-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
-
-	# don't run integration tests
-	rm setuptools/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-18.3.2.ebuild b/dev-python/setuptools/setuptools-18.3.2.ebuild
index 801757b4b91e..a2d5b1b6f25e 100644
--- a/dev-python/setuptools/setuptools-18.3.2.ebuild
+++ b/dev-python/setuptools/setuptools-18.3.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit distutils-r1