gentoo resync : 14.05.2020

3 files changed, 2 insertions, 84 deletions

diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 12c50af22a49..283840baded7 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,5 @@
 DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.11.2.tar.gz 258055 BLAKE2B 5cf12d6c79e7e659b16318cb3dc483a276511192903469629ec497c10ba6cd023f5a834961ac74cbda556177aaac46f5045c5aaca3068dcef87017760895851c SHA512 453e0c94c57065ab78f997726256bd2a31bb79124a2ee17b632cb124a3ccefded33d81b35cac73497f095b1cd5d8cd4420d6932a637fd7c4cdb786f1753e49ac
-DIST jinja-2.8.1.tar.gz 397144 BLAKE2B 78e4903da05ab3e8961b6bb6047116941b4bbf59d08b8283582972590409f98b5dc1f468a988525d96c552000279fcd0a31dae3ac1e5226f609a8854c8f9ca0b SHA512 f4655f1a43c06f7651fbd5251d0538788a3a6a3ffb93d9a8c239711cf043082c43d34706b6d71a18679d957faa6590e7e0259ffb8f7cc5e3300749526417a987
 EBUILD jinja-2.11.1.ebuild 1593 BLAKE2B 985628ee73cb5d5f89ff721e224e50f7fb8c19cfacfddc65991d68d25243268f68a90995b96d35c6bcce7913864cd5be832f1b5e5f3b23506a7938f4b3ae45ed SHA512 c3b8497e622f6685b65a7e3e4367b97d497b6a6331862fe6df945e8ff6eb94dd0e5214ee5157b123f4bb09ea7b3f3fb980e8da99b45b8f82b97acd097f57d75e
 EBUILD jinja-2.11.2.ebuild 1602 BLAKE2B 85ffe75f9fd9a98a69a09bd5a15afb3a7cc0b5e43e66938ee5c68118fb3897931c33bbead72abdb5e204a2127a8ae59bfe6db24670c4e888c3786cb0ef83879f SHA512 8e91556172c446a47262f98d8f5946b334b53d8ef1067399388f24c8a23aa9a224b07008b14cf0276a3286620e67ccd1b7d2e1d1bad234f761458da3810887c6
-EBUILD jinja-2.8.1.ebuild 1924 BLAKE2B 27d15f0effcde5781a43715495c2a1a13878758306a1a51cd9a7c139c3b8082ad3bea77504c7e1c7dea571bbe194e6ec109cb283b7c92b7a17507cf17f0c1a1d SHA512 a10ffa64725224accb6c32fa0849cd7bf7937ee0a814b6dcf78d1a19a231cc827464d2e944a38429de21ecc5bc0aa3aa7e178fe7aec112712cc8f7f0888b3555
-MISC metadata.xml 399 BLAKE2B 14bf47b823b00af4744a8aa5495f39206b4d423123bc23346b6dce4bdc6cc09b74a8b04dabda7864885717a8c056e8d8eafe81f0e29d6ef51dd88fc85713d7e6 SHA512 e42af23d426af69d7a51d033a498a1563ebb19d100ac1bd8bc8d1f9d8410abdc0ece7a1159ab3c7b22b53cfc79e3dd47a05ffc877cfa0d6d09b79dc587128f51
+MISC metadata.xml 466 BLAKE2B 89bbd7d238c94528f0ad8cca2fb358456f88403f06f517e71ca36ae63b01e8309a7ddda5c9063a01b90e8321445013ab5bc93ab33a1219e48b36a02f5ca23d60 SHA512 81af66b462fed2f8e9bfc8c3120e2e70dec933d0300a3d32264c73ce7606b6b3b375c4d4ed0c9f92ccb91c046c20ccfef17f1ed50a95844eccc3ee5baa0b56d0
diff --git a/dev-python/jinja/jinja-2.8.1.ebuild b/dev-python/jinja/jinja-2.8.1.ebuild
deleted file mode 100644
index cf1ca69bbed4..000000000000
--- a/dev-python/jinja/jinja-2.8.1.ebuild
+++ /dev/null
@@ -1,81 +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,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 ~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}]
-	!dev-python/jinja:compat"
-RDEPEND="${CDEPEND}
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}"
-
-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/metadata.xml b/dev-python/jinja/metadata.xml
index 2f5f702ac23b..00e97962493e 100644
--- a/dev-python/jinja/metadata.xml
+++ b/dev-python/jinja/metadata.xml
@@ -9,5 +9,6 @@
   <upstream>
     <remote-id type="pypi">Jinja2</remote-id>
     <remote-id type="github">pallets/jinja</remote-id>
+    <remote-id type="cpe">cpe:/a:palletsprojects:jinja</remote-id>
   </upstream>
 </pkgmetadata>