gentoo resync : 16.04.2022

4 files changed, 2 insertions, 69 deletions

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 158e10e241f8..4408690184a1 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,3 @@
-AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
-DIST Mako-1.1.6.tar.gz 495132 BLAKE2B bbdf0db9303f5d369b5c6c6644ee44d767630f51305ae259c44c65a3fba959a07d9833fdc69fc8168f7424cc0c3a05e991daae239bef8392c01396c1295967c7 SHA512 e87d883d7a549a902bb2e16d20306ccd3dd7b3bf855dfdaff20477dd182a782a5cecbdc447e4b1607f190a7b0febcca001333137f7cac6ffa674824c2a2fd1bb
 DIST Mako-1.2.0.tar.gz 488603 BLAKE2B 30ef597e2dd500d52d02118e0ec8a40cfeeff00604eb9fec887df4aff794aed7d6a1d78b2defb6f985947f9429d912a083b9941ee30b1e53ef32890d19e94158 SHA512 ad608016d7785a735a28ea18f697be4882da747e3da32e4a7c7be4bf846d37e4d3374d78e62ef85607ae9f3f73ee35dc78b473347e4110c059a504be2c497c6e
-EBUILD mako-1.1.6.ebuild 811 BLAKE2B 374a241e97b227d8f147ea0cd48cd61af878be3c8a6c476dd11e5a0a1c19dd4f6fd1f0eba679115454e28217919b73149eb4b77f12c70494c4e0024c60b86abb SHA512 deae38cc5d6018ce0f48077ac18a6cd629e48583eb24b3d222dcebbca76c20dcb939700a9d1bee7c4b362b998964713d3006d611b496401c51ed427fb517ec69
-EBUILD mako-1.2.0.ebuild 1155 BLAKE2B 6b176659bccd9632fe73a0ab38a54e2c02712925ace8064f5c2a3541deade50f874d5dffd9756edcf4c6ae4f35cc8227a2b2fd85c4addecd385a047eb8981afd SHA512 b65749f10c29e33da0239b3ba69e5a40bc594dcddfe82258c11ec2250f439daadcbdacc5039afea321049d082ae72fc7c9d4bb3232464e103beac88c0455ddbd
+EBUILD mako-1.2.0.ebuild 1147 BLAKE2B 02183c3b061d77c05db6e76c46a3cffec6a159ba116d4534cec21c1d774fd39dea0d42d67d7efa729c84a7c5ebb86226fafc37ebc6393fd8aa361a4be82b2568 SHA512 747039e9d7e8591c4a7f6b0c9732df9dda692c98b2152fe684eaa39b851a13812b721d4ff046299f0a9fa8c7c5b30cf7b2a04676da140e451d11547a0f9c4659
 MISC metadata.xml 450 BLAKE2B 271e9801e0361eb9cf222fa9aca34f641e6118e17707469a87c1b41a6de34c67ec6a19576a86cc3c7ba1f671f8a28f9df8e994b3f232fe224eda85f4b8cf8b8b SHA512 d168ca10d7759129088a0d10ad73e4d0973ccaed1e649828077158aee55a8640db2446c9d874ef0da4fba5b27a6a0eacdc9d9ff4ec04a19cd1b9699542b5b0c1
diff --git a/dev-python/mako/files/mako-1.1.1-pypy3-test.patch b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
deleted file mode 100644
index 6ae5c04ab997..000000000000
--- a/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5559e0205c7fbf2f4a321a978249a41c1d073278 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 21 Feb 2020 19:03:29 +0100
-Subject: [PATCH] Skip broken test on PyPy3
-
----
- test/test_exceptions.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/test/test_exceptions.py b/test/test_exceptions.py
-index 2ec46cf..6a30b48 100644
---- a/test/test_exceptions.py
-+++ b/test/test_exceptions.py
-@@ -1,5 +1,6 @@
- # -*- coding: utf-8 -*-
- import sys
-+import unittest
- 
- from mako import compat
- from mako import exceptions
-@@ -429,6 +430,7 @@ ${foo()}
-         else:
-             assert False
- 
-+    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), 'Broken on pypy3')
-     def test_alternating_file_names(self):
-         l = TemplateLookup()
-         l.put_string(
--- 
-2.25.1
-
diff --git a/dev-python/mako/mako-1.1.6.ebuild b/dev-python/mako/mako-1.1.6.ebuild
deleted file mode 100644
index c5fb4ab717f6..000000000000
--- a/dev-python/mako/mako-1.1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-MY_P=${P^}
-DESCRIPTION="A Python templating language"
-HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
-)
-
-distutils_enable_tests pytest
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/mako/mako-1.2.0.ebuild b/dev-python/mako/mako-1.2.0.ebuild
index ecb89e60b831..7585c60d976f 100644
--- a/dev-python/mako/mako-1.2.0.ebuild
+++ b/dev-python/mako/mako-1.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
 RDEPEND="