gentoo Easter resync : 12.04.2020

7 files changed, 6 insertions, 238 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 86a004826d98..02bd13ad6fb5 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,10 +1,5 @@
-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 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
+EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
+EBUILD jinja-2.8.1.ebuild 1924 BLAKE2B 27d15f0effcde5781a43715495c2a1a13878758306a1a51cd9a7c139c3b8082ad3bea77504c7e1c7dea571bbe194e6ec109cb283b7c92b7a17507cf17f0c1a1d SHA512 a10ffa64725224accb6c32fa0849cd7bf7937ee0a814b6dcf78d1a19a231cc827464d2e944a38429de21ecc5bc0aa3aa7e178fe7aec112712cc8f7f0888b3555
+MISC metadata.xml 399 BLAKE2B 14bf47b823b00af4744a8aa5495f39206b4d423123bc23346b6dce4bdc6cc09b74a8b04dabda7864885717a8c056e8d8eafe81f0e29d6ef51dd88fc85713d7e6 SHA512 e42af23d426af69d7a51d033a498a1563ebb19d100ac1bd8bc8d1f9d8410abdc0ece7a1159ab3c7b22b53cfc79e3dd47a05ffc877cfa0d6d09b79dc587128f51
diff --git a/dev-python/jinja/jinja-2.10.1.ebuild b/dev-python/jinja/jinja-2.10.1.ebuild
deleted file mode 100644
index 14b1bfc2dfef..000000000000
--- a/dev-python/jinja/jinja-2.10.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils 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="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	py.test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	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.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
deleted file mode 100644
index 74ef7313be3a..000000000000
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ /dev/null
@@ -1,80 +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 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-	printf "############################# SED ###############################\n"
-
-	distutils-r1_src_prepare
-}
-
-python_prepare() {
-	# async is not supported on python2
-	if ! python_is_python3; then
-		rm -f jinja2/async*.py || die "Failed to remove async from python2"
-	fi
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-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.10.3.ebuild b/dev-python/jinja/jinja-2.10.3.ebuild
deleted file mode 100644
index aab4e4ac76c4..000000000000
--- a/dev-python/jinja/jinja-2.10.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} 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="doc examples test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-RDEPEND="${CDEPEND}
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-wrap_opts() {
-	local mydistutilsargs=()
-
-	if [[ ${EPYTHON} == python* ]]; then
-		mydistutilargs+=( --with-debugsupport )
-	fi
-
-	"${@}"
-}
-
-python_prepare() {
-	# async is not supported on python2
-	if ! python_is_python3; then
-		rm -f jinja2/async*.py || die "Failed to remove async from python2"
-	fi
-}
-
-python_compile() {
-	wrap_opts distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	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.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
index 5c684ec1237c..5d8902f5f11b 100644
--- a/dev-python/jinja/jinja-2.11.1.ebuild
+++ b/dev-python/jinja/jinja-2.11.1.ebuild
@@ -16,7 +16,7 @@ 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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jinja/jinja-2.8.1.ebuild b/dev-python/jinja/jinja-2.8.1.ebuild
index c23ba3eda257..cf1ca69bbed4 100644
--- a/dev-python/jinja/jinja-2.8.1.ebuild
+++ b/dev-python/jinja/jinja-2.8.1.ebuild
@@ -16,7 +16,7 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jinja/metadata.xml b/dev-python/jinja/metadata.xml
index 03be6412af96..2f5f702ac23b 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Jinja2</remote-id>
     <remote-id type="github">pallets/jinja</remote-id>