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, 3 insertions, 75 deletions

diff --git a/dev-python/jinja/jinja-2.8-r1.ebuild b/dev-python/jinja/jinja-2.8-r1.ebuild
deleted file mode 100644
index 06c864ce38e3..000000000000
--- a/dev-python/jinja/jinja-2.8-r1.ebuild
+++ /dev/null
@@ -1,73 +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 eutils distutils-r1
-
-MY_PN=Jinja2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-S=${WORKDIR}/${MY_P}
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-	if [[ ${EPYTHON} == python3.2 ]]; then
-		2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins ext/Vim/*
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-2.8.ebuild b/dev-python/jinja/jinja-2.8.ebuild
index 17453626be5f..0d44e5cacdc7 100644
--- a/dev-python/jinja/jinja-2.8.ebuild
+++ b/dev-python/jinja/jinja-2.8.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
 
 inherit eutils distutils-r1
 
@@ -20,7 +20,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
-RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
 DEPEND="${RDEPEND}