gentoo resync : 03.03.2021

3 files changed, 2 insertions, 52 deletions

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index e5f889ab4565..abd28d0a3a07 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,4 @@
 AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
-DIST Mako-1.1.3.tar.gz 477440 BLAKE2B ffa148815d64f1fbfac0291e6afdbcf967d7445e13f364e1e2a492330ad1cd71a788255776e07bbec95877f65440073ec873b035d6f6fc1293a299b0478524a3 SHA512 a9b94fa34a61e7794b6e4549fa0bada6ff84dfb0d9edb8d5c7f9b95d12184fa4499f42303cfee720b576a9f7e986a57d91ad3aeb26c9f93154dbc08fb2975952
 DIST Mako-1.1.4.tar.gz 479823 BLAKE2B 048c63c6caf493b9809dbcda8d1d697a7a25c8d22e97f439facae64b26d5b8f5f3002ff65529e9599e6069482fa25d6db95d810175f7f674f5af02cbd3f9f5e3 SHA512 4844c1d6c8d0d474b4ca4e1b31d3557747fc7e30f70a1976163a26b46b1b45c4c96ca6101fbef252b4e3bb4a61635d2a2c6d1c2933fde5b82bb1a1306f31ff84
-EBUILD mako-1.1.3-r1.ebuild 1096 BLAKE2B 86928333f5142e131b314d69aa1b6dc16022927e2e394ef426ab5b1b9e0f347e5a0d1db072b54abe0876af27761d07efd93498d083ac954233a72cd0231acadd SHA512 97dcd3809b3fe205ea9278e5fb4778486179e33f21bdf4de0bb7602e70c03b5869348368ab83d129e5c6a3a8ee4db3132b1a5011a871d5f679c22293380ec1ca
-EBUILD mako-1.1.4.ebuild 962 BLAKE2B 3d9574057923d5822c39e241ec07851d593ddcc2b3de3937885cb5b62b6687dd035f880c2bf9c87dd31ce27cb790a36956366d4ee8bd54aca9029d2f639e7c16 SHA512 1c0d70b40c6ae13f6d0ae5d7f541c91aac865d30f1233664db44c4b6dc428dd6ec7980c925544f6b53f33100cc65f3ab34400f972e88ba6723daf7055edce406
+EBUILD mako-1.1.4.ebuild 953 BLAKE2B 1cf69b2e410fe842eb1ddc742fafcfeef8365bcdc82753c713e4b181db19d00e51fe75590cca438c7c813c1ae6f7e3fb918e62ed634a0833ddfacc721d93798d SHA512 cdb397e6004609033c1c41ec8d8d1bec59e2381f9346cf65c45c59c0507787c4499730ba2972e4031805d1bd6b58cba439064a03fb779851be1184504621c134
 MISC metadata.xml 449 BLAKE2B 335ad5322f8e6b149cdc07c161bae35957f1d387ad0ab1ae4563ed1896211aa2889e9b285d8209b57397da95b5791d526d71f0eb1cc768c3ceee4be5af84ba6d SHA512 94e6ec358a7de187702ffc41becb7792714498195c6a384d5debf10186af534506955d5575a68442de0e41140800fb134c128e22ac919dcd40b8b11ce2a3da26
diff --git a/dev-python/mako/mako-1.1.3-r1.ebuild b/dev-python/mako/mako-1.1.3-r1.ebuild
deleted file mode 100644
index 025d56dfd892..000000000000
--- a/dev-python/mako/mako-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1 optfeature
-
-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
-
-src_prepare() {
-	# seriously?
-	sed -i -e 's:from nose import:from unittest import:' \
-		test/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	rm -r doc/build || die
-
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	optfeature "caching support" dev-python/beaker
-}
diff --git a/dev-python/mako/mako-1.1.4.ebuild b/dev-python/mako/mako-1.1.4.ebuild
index 4f374f9abb56..a676d9dd54a0 100644
--- a/dev-python/mako/mako-1.1.4.ebuild
+++ b/dev-python/mako/mako-1.1.4.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=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"