gentoo (leap year) resync : 29.02.2020

5 files changed, 88 insertions, 6 deletions

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index dbcd4826c7c5..df39da2bfd7d 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,10 +1,13 @@
+AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
 AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
 DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
+DIST Mako-1.1.1.tar.gz 468894 BLAKE2B f6ef4f67e369c6d2078b0a7534a765aa254afcf7c373b5d3f8fcac05336b9a46d8391398e4b287fa0826bc03cdbea3361c5225c5e5bcc966f88adb089ff3a5be SHA512 ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7
 EBUILD mako-1.0.3.ebuild 1422 BLAKE2B 8a03fed7eaebfa8eabfd4418cd75cbe5f342114d7fe5016d4de31f0fb8feecccade64bf3cadbd990c6e6c8eb4dd20f0afa3dd27f6425937fdb6bdceadca5f38b SHA512 fee3ca9fded2a85d07391d9ee1f9d4e9a9498c43c778e99cbe3950b4088c8af7d1d9004c043a9f674697cf29184fe325420453e6e17c655bc276dcd576d21b2b
 EBUILD mako-1.0.6.ebuild 1478 BLAKE2B 82dc6e6ded16423f03f9304f94fde58b566c224c2c530a0bee696166d80db903cbe1833ea927f35b32114bcd1acd68a61736476626d8d88cfc214bc911c0d921 SHA512 91cb999d3275193c7f37bf21ce0e747e8d9bb877019191b6198464808bcdf842bebce436f1c806aa97a6b759712968f0f6a9121999d483519e6bd67691ac914c
 EBUILD mako-1.0.7.ebuild 1169 BLAKE2B 91e96e598344f4df7f8ba0656ea533250774a9f07b343813a4c780d66cc724ee72c077ab79706bb1a19afd8f359713b78244d2986fe83236d5060f2e99e80906 SHA512 a9b47ca8f19fc33e01e1009aa3afd4281ffb49d8e2a57aa8e48d67523408263ad82d3d0ae148ad7ce159e379b73e08f32707a7947646a8646fd78117a88c89fa
-EBUILD mako-1.1.0.ebuild 1170 BLAKE2B ec353a7ba7008ae87427f3cc290d549dcc3c2afcc124bfa776619fcdb604741b609d5bfa89d37c635dff9412fe265777bf86aca1f53e06ac2fb049bdb4f21f88 SHA512 f9048e1365ef4205a896b128c4afd621e362b37e8f9bd07b1c71bb04eb387d39a61d80971eb106987ebd710060fc1b6e8eb7cfce7b467f5ed365a498d3061680
-MISC metadata.xml 437 BLAKE2B 4dc2a160a2054ffe0bd59638a0170845b22d7eafeb77e94999ff239dac231e9b1a0c06b688da2c4699f73b99ae2c1306332cb0b5e91779da757bc048452c7c22 SHA512 ac01b2c4843ec9ab15f5b20677a003aa34fceeb2f1ad39a76e3782e077824f1d1103c831dd2f911ae5e64bb7530db2e87c2b1e5fde2fb77acf6d1df65f0e0b69
+EBUILD mako-1.1.0.ebuild 1154 BLAKE2B 084f154a914c49ece4cce823dd6a57afc6a92f2a607ccde9ffe2344338ae0807fe93b6260f2141e0da81d64aeb23c005c8b9f8916a479afff2258c79a49a1617 SHA512 6ca3749a017bbf11fb9fda487ece4ad828f91896ecf71e149ebdce201a704491d522465b38ee8d157fa68b56979cfe509e7832f233d9ee4d105c30c11a1f3fed
+EBUILD mako-1.1.1.ebuild 1087 BLAKE2B fb89cdd9199e7398cdec99c165bc894c56280d2b8227dd8fcb27aa20745edb64ee8cf84fe41b7555f776e11d6936758e2c4065452e0a2e31ca33618db55e497d SHA512 e9f160bf3f21112d9feb9a6b014f5703cadd25b93ca24f7978ebf111233ae176ec66ea802c8591f76d5203ac42056f4f2ba41e7301d232f3f91c371fbc7c39bf
+MISC metadata.xml 439 BLAKE2B 878233e885789b9b6efac5aab00feed58d9eb0459070cecf2444e4d7d101675bbeded1384982e7445dddacd73093efd02cf061d9d7f318188eaac3c7a417a12e SHA512 5cebe17cc0901496fa9a126f9e6920a90b1296ad8ec2b8670edbc16d84b48d38dfa9d351a8fde3a48005c33d0c4dd93c759373fa6f76b9bd38c7babdb3346ecc
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
new file mode 100644
index 000000000000..6ae5c04ab997
--- /dev/null
+++ b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
@@ -0,0 +1,31 @@
+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.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
index c993bccace2a..df429c95db68 100644
--- a/dev-python/mako/mako-1.1.0.ebuild
+++ b/dev-python/mako/mako-1.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1 eutils
@@ -16,14 +17,13 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
diff --git a/dev-python/mako/mako-1.1.1.ebuild b/dev-python/mako/mako-1.1.1.ebuild
new file mode 100644
index 000000000000..bd9a5bccac50
--- /dev/null
+++ b/dev-python/mako/mako-1.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 eutils
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+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
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index 4e2283f56f3f..13bb07869643 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mako</remote-id>
-    <remote-id type="bitbucket">zzzeek/mako</remote-id>
-    <bugs-to>https://bitbucket.org/zzzeek/mako/issues</bugs-to>
+    <remote-id type="github">sqlalchemy/mako</remote-id>
+    <bugs-to>https://github.com/sqlalchemy/mako/issues</bugs-to>
   </upstream>
 </pkgmetadata>