gentoo (leap year) resync : 29.02.2020

3 files changed, 76 insertions, 7 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a073f73f0d40..86a004826d98 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,8 +1,10 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
+DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.8.1.tar.gz 397144 BLAKE2B 78e4903da05ab3e8961b6bb6047116941b4bbf59d08b8283582972590409f98b5dc1f468a988525d96c552000279fcd0a31dae3ac1e5226f609a8854c8f9ca0b SHA512 f4655f1a43c06f7651fbd5251d0538788a3a6a3ffb93d9a8c239711cf043082c43d34706b6d71a18679d957faa6590e7e0259ffb8f7cc5e3300749526417a987
 EBUILD jinja-2.10.1.ebuild 1616 BLAKE2B 6957dc33aebb826cf0465c4cd1ccc79e30ce28823056f934742146b703e29d03b319416703a5b0e7027bd1b0722262eba84652afacb4dea0fb420dfa6447da5d SHA512 7205bbdaf8494f09ab46a3a6e0855ad4a7d63e6135213cb7ca714dea1b2b0828119004fa3e1b607e8fda090e79660e05d8c223974b5a24329f2f6f54e797c24f
-EBUILD jinja-2.10.3-r1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
+EBUILD jinja-2.10.3-r1.ebuild 1892 BLAKE2B 5d93c1736cdc2fe8321e5b50a9e475e0194d7f8d2a4a1e6403d8316cd669706e3ad688e323e754fd6c2e173c351e5252f2fa2e584c457d143690f28d4ff88335 SHA512 13b2299e9c2370f531554f0d0f6a5ab83015bb7cdd79c1cf8dbee44a8ac2a38197fa1d4c66b7651a6be139639b411aca6313caca1fd05358b72e237067a99832
 EBUILD jinja-2.10.3.ebuild 1751 BLAKE2B ac3b07a4cb7036cdc59e610f0c91f9d54e90954d5109217c384ad472fe5dfbc8392cd448dc1b49f0b40d39e1b7cbf2fc32efbb59810d2b204672f8744ae216e2 SHA512 7a557463a07e567d9261a63f0d8305784825449ded2a6cf2553b4260c585a4bc24ca6be331306c4ba9300797de351a1b3bef2d1d0375fed919ebd2ea36e95ab9
+EBUILD jinja-2.11.1.ebuild 1606 BLAKE2B fe2195a56bc55a2b4d879cf44ccca8eae52be84060b964ba8d323e9fd0370ada2ae204d02c9856d6f3e1a0bae2899a41a1673e30db37e653e0ddc49d24e0e846 SHA512 59c37e0a69a94caacd40b545a0e58f34dca4585c76090f6ab8fa5f710eb388ee729bc7f933897d11a479147488dd48aa3736bfce928c94dc19ef08cdafb279f2
 EBUILD jinja-2.8.1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
index c23ba3eda257..74ef7313be3a 100644
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -10,21 +11,19 @@ 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 ~sh ~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 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
-RDEPEND="${CDEPEND}
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}"
+BDEPEND="${RDEPEND}"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-issues \
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
new file mode 100644
index 000000000000..5c684ec1237c
--- /dev/null
+++ b/dev-python/jinja/jinja-2.11.1.ebuild
@@ -0,0 +1,68 @@
+# 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 ~sh ~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
+}