From dbe333673018c0c0dbdfa43e4529e9d406c133ea Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 27 Mar 2022 18:30:06 +0200
Subject: dev-python/jinja: Fix markupsafe-2.1.0+ compat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/836268
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-python/jinja/jinja-2.11.3-r1.ebuild | 57 +++++++++++++++++++++++++++++++
 dev-python/jinja/jinja-2.11.3.ebuild    | 59 ---------------------------------
 2 files changed, 57 insertions(+), 59 deletions(-)
 create mode 100644 dev-python/jinja/jinja-2.11.3-r1.ebuild
 delete mode 100644 dev-python/jinja/jinja-2.11.3.ebuild

diff --git a/dev-python/jinja/jinja-2.11.3-r1.ebuild b/dev-python/jinja/jinja-2.11.3-r1.ebuild
new file mode 100644
index 000000000000..8bed8a3c2310
--- /dev/null
+++ b/dev-python/jinja/jinja-2.11.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} 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/"
+# 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-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 -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_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.3.ebuild b/dev-python/jinja/jinja-2.11.3.ebuild
deleted file mode 100644
index 2daebbcea91d..000000000000
--- a/dev-python/jinja/jinja-2.11.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} 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/"
-# 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-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_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
-}
-- 
cgit v1.2.3-65-gdbad