gentoo resync : 25.08.2020

3 files changed, 3 insertions, 73 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a22fdbf86e9e..d91eb59460e2 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,3 @@
-DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.11.2.tar.gz 258055 BLAKE2B 5cf12d6c79e7e659b16318cb3dc483a276511192903469629ec497c10ba6cd023f5a834961ac74cbda556177aaac46f5045c5aaca3068dcef87017760895851c SHA512 453e0c94c57065ab78f997726256bd2a31bb79124a2ee17b632cb124a3ccefded33d81b35cac73497f095b1cd5d8cd4420d6932a637fd7c4cdb786f1753e49ac
-EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
-EBUILD jinja-2.11.2.ebuild 1604 BLAKE2B d9a4baf03d89da438dd84856e12ffbfb67d9464fec304c3c81e881d22a2602894a138af62997f8b97de7c898485401ad228a0bce44865b04fd67505bd958d9a1 SHA512 055b10439711e9b8b34689b678915ede71f0467c3a3c806f9861480ef2999d05bf0c0995d970a62dc8a2f4c10a1626400a5707abd02353dd5ac8ffb8d49e918e
+EBUILD jinja-2.11.2.ebuild 1613 BLAKE2B e8eb16f10a1708153e0583e60d5d346ec8d1e8665808a6f8f092b92b0ec7a006ce3ddd3dc9ecd3abd95aafd078bef502b0cb3925801179ece4c8a71257b36bb9 SHA512 d26bf525e36e7264af821422403b13e90b73a2fe05b3fb0b2a7aed651d94236ceaab8fc8c8870882e1b622e6bc5d23114545f538187a839dcdd3f86eb0d2921c
 MISC metadata.xml 466 BLAKE2B 89bbd7d238c94528f0ad8cca2fb358456f88403f06f517e71ca36ae63b01e8309a7ddda5c9063a01b90e8321445013ab5bc93ab33a1219e48b36a02f5ca23d60 SHA512 81af66b462fed2f8e9bfc8c3120e2e70dec933d0300a3d32264c73ce7606b6b3b375c4d4ed0c9f92ccb91c046c20ccfef17f1ed50a95844eccc3ee5baa0b56d0
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
deleted file mode 100644
index 5d8902f5f11b..000000000000
--- a/dev-python/jinja/jinja-2.11.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	if ! python_is_python3; then
-		rm "${BUILD_DIR}"/lib/jinja2/async*.py || die
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	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.11.2.ebuild b/dev-python/jinja/jinja-2.11.2.ebuild
index b8c328818df0..4bf0c01a6ecd 100644
--- a/dev-python/jinja/jinja-2.11.2.ebuild
+++ b/dev-python/jinja/jinja-2.11.2.ebuild
@@ -10,13 +10,13 @@ PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 
 DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="