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, 4 insertions, 29 deletions

diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
deleted file mode 100644
index aa939b2a6604..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,26 +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="package to manage versions by scm tags via setuptools"
-HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v -v -x || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
index c791b4b24d76..d89cd17175c8 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0.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
 
@@ -17,9 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
 python_test() {
-	py.test || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x || die "tests failed under ${EPYTHON}"
 }