gentoo resync : 06.04.2022

4 files changed, 113 insertions, 7 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 096b0c2bf780..9adaafcf1d54 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,5 +1,9 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
 DIST jinja-3.0.3.tar.gz 273634 BLAKE2B 3f72840f3f895471896b918b0d3173aa7b40a077fe78a014064e66ac74c3d1ef1ae811723a84ea56d32edde23ee26ab6091bd5ce7ee4e46a9693f34d2538b491 SHA512 8a364620a4660add0593f4b252a2f20423aa3017193dffe6e8aa80710444da0cae5e6c4b77247d39f33e90185f475714fb892f6b5f01d3055a88b0f669a748be
-EBUILD jinja-2.11.3.ebuild 1424 BLAKE2B 7bcbae35bbe865ed8af3601e3f22b8d70eb48952e1553240c24578ada0067ce91a9e82dcd334e40c6d1f015d8b21cf8d1ebfba6bb9db6a0d9fc11bcaa107862c SHA512 2e0165b30306a15270bec7163f23497324c76c3cb921616c3c14b60514c5c0e522b85b32b2191b9908322c156253f01154a26285e450688d151ef6d4d5438ffb
+DIST jinja-3.1.0.tar.gz 271851 BLAKE2B de55a518aa63e3c6ca88bd107709172f73fcb9419c75254b2c23c531b598af7860a303e7da6e61f03cf18edf6935c92f5c12c8b91a7f4eb955c64f472a506b02 SHA512 1bd75c752f8e1c45f05f881598c257a6a357658892307e1352dd4752f45ede9b23f0ce3c16909e1885243199c2b845357c3ea33af8d6848fe346c29eeaf22b60
+DIST jinja-3.1.1.tar.gz 272001 BLAKE2B 4787ee89d7e10cea24d3bf2810e391d5c17c00ffee8fd2f9244a9e24b219bc126e4111cc6b788107cbc07dd96732a2d1fc51dd87506545dc8beb7fdce5cd89b1 SHA512 285b3a2e09fbf891ce1d18e2692e400a9fe9d8968a36be50229972d9bdbb590bbea099cd26443de0fbe5ed7a2c6419eb211bfdac15c27a61b8db903e88855478
+EBUILD jinja-2.11.3-r1.ebuild 1460 BLAKE2B b2d08f495cec01d2d02143638b19e8848a80b822c3fca915771c3762580d779df413bb7f9b1160fdbeec0fb62dd4ae172e4c90e69245a848cb7f4bf66e35a2e6 SHA512 5a8ea50157dbacf032b3e7c13cc654a425bd12d38d662c0d040adc38e2fa61e4cdbc0bec7e01c9da4006230c17bc35a96dce158853026de5aec22b9799822a58
 EBUILD jinja-3.0.3.ebuild 1316 BLAKE2B 622e3f7fd3b54d2e960d69af59c62f0fbfd6756941383267b6a716e271612c6f857c1ddbc2870f68f19f2f318b89b3e4d2df3a547c91c26f1e345415e782f48c SHA512 fdf83e7f59fe8d5890650f698a11868a048c0d9c9ec4272d09de839c800085ed4681d920a2609094c4ae9992529a04cdea5898603e1853ab4fecbe6241256d99
+EBUILD jinja-3.1.0.ebuild 1299 BLAKE2B a62b5f7f4749e0d81264df1a21853884b6182f4ecbb2fc927c9de1773807fff4b634e0f2b9ffabe5f193ad8ef2b1af04c53d211afb2afb02b2e9a54d0bca1efb SHA512 bb9fdca49feddd19b6e3977718bf38403a122bb96d1f785a20b69a23c93d97164a73b99ad069ab06a2353ef42e108dd97e550e80823505091273eafb43f78456
+EBUILD jinja-3.1.1.ebuild 1299 BLAKE2B a62b5f7f4749e0d81264df1a21853884b6182f4ecbb2fc927c9de1773807fff4b634e0f2b9ffabe5f193ad8ef2b1af04c53d211afb2afb02b2e9a54d0bca1efb SHA512 bb9fdca49feddd19b6e3977718bf38403a122bb96d1f785a20b69a23c93d97164a73b99ad069ab06a2353ef42e108dd97e550e80823505091273eafb43f78456
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja/jinja-2.11.3.ebuild b/dev-python/jinja/jinja-2.11.3-r1.ebuild
index 2daebbcea91d..8bed8a3c2310 100644
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ b/dev-python/jinja/jinja-2.11.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -31,15 +31,13 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+	sed -i -e '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+	# fix compat with markupsafe-2.1.0+
+	sed -i -e 's:soft_unicode:soft_str:g' src/jinja2/*.py || die
 
 	distutils-r1_src_prepare
 }
 
-python_install() {
-	distutils-r1_python_install --skip-build
-}
-
 python_install_all() {
 	if use examples ; then
 		docinto examples
diff --git a/dev-python/jinja/jinja-3.1.0.ebuild b/dev-python/jinja/jinja-3.1.0.ebuild
new file mode 100644
index 000000000000..008e162474da
--- /dev/null
+++ b/dev-python/jinja/jinja-3.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+"
+
+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_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+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-3.1.1.ebuild b/dev-python/jinja/jinja-3.1.1.ebuild
new file mode 100644
index 000000000000..008e162474da
--- /dev/null
+++ b/dev-python/jinja/jinja-3.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+"
+
+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_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}