gentoo resync : 22.12.2021

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 91c6853607d0..f9f7acfa625c 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,5 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.0.2.tar.gz 273251 BLAKE2B 69ef01fdce0be5d1df8eec01606c4fde72232aac2e089aed9a3a7e549a3ed283881c7c864aadb50d53eb5f1324781e3a89c2398e8c30e27dbed14d5917154513 SHA512 e6cf8b8e9fb3efc57806c9a17e71444f6e01f4d039c4894ee31aa4a042e63c31c9a68c85ce9400a7a840dc01ac8c46d88cdcc6ed15a28f662565b8ca9c1145b1
 DIST jinja-3.0.3.tar.gz 273634 BLAKE2B 3f72840f3f895471896b918b0d3173aa7b40a077fe78a014064e66ac74c3d1ef1ae811723a84ea56d32edde23ee26ab6091bd5ce7ee4e46a9693f34d2538b491 SHA512 8a364620a4660add0593f4b252a2f20423aa3017193dffe6e8aa80710444da0cae5e6c4b77247d39f33e90185f475714fb892f6b5f01d3055a88b0f669a748be
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
-EBUILD jinja-3.0.2.ebuild 1316 BLAKE2B 622e3f7fd3b54d2e960d69af59c62f0fbfd6756941383267b6a716e271612c6f857c1ddbc2870f68f19f2f318b89b3e4d2df3a547c91c26f1e345415e782f48c SHA512 fdf83e7f59fe8d5890650f698a11868a048c0d9c9ec4272d09de839c800085ed4681d920a2609094c4ae9992529a04cdea5898603e1853ab4fecbe6241256d99
-EBUILD jinja-3.0.3.ebuild 1324 BLAKE2B f73506ec63fdad8dc740980d9318d411f299cab562155b05a4320dadf852036faa18847c61b17cec76c871747ca6b4fa76eddd45401eb8f325d9852a0aad86d6 SHA512 bc575fc48e1f08729a53fd2052fb9a0c96beda07fc3be3de40c3132f021422574d1c978f7603be6a77bf06fc167271fe9c625796ffe55572e181ce75b4080655
+EBUILD jinja-3.0.3.ebuild 1316 BLAKE2B 622e3f7fd3b54d2e960d69af59c62f0fbfd6756941383267b6a716e271612c6f857c1ddbc2870f68f19f2f318b89b3e4d2df3a547c91c26f1e345415e782f48c SHA512 fdf83e7f59fe8d5890650f698a11868a048c0d9c9ec4272d09de839c800085ed4681d920a2609094c4ae9992529a04cdea5898603e1853ab4fecbe6241256d99
 MISC metadata.xml 467 BLAKE2B 5cba0288a395e281e76810639b6e74153f1fe7532addb41ab9ff1e7e3d23616f2cd6cce9ef266ec3545fe6694fb3e25457f9ad383d5de3e2612dedd5609f2a6f SHA512 04f6f784b771602d2ad23afba5d8c9d10fb44b68873ea20a92904f0350081265852c9e4874866e8684c6a163e99f88053b5ea367357fd74790861f6e7d9cb1e3
diff --git a/dev-python/jinja/jinja-3.0.2.ebuild b/dev-python/jinja/jinja-3.0.2.ebuild
deleted file mode 100644
index 2fb8cc8d12ee..000000000000
--- a/dev-python/jinja/jinja-3.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/"
-# 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 ~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}]
-	!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_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.0.3.ebuild b/dev-python/jinja/jinja-3.0.3.ebuild
index 6decc5afc7a1..2fb8cc8d12ee 100644
--- a/dev-python/jinja/jinja-3.0.3.ebuild
+++ b/dev-python/jinja/jinja-3.0.3.ebuild
@@ -15,7 +15,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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+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="