gentoo resync : 15.01.2020

5 files changed, 62 insertions, 10 deletions

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 78f70e51885b..86c0f1f3be73 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,7 +2,9 @@ AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0
 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
-EBUILD mako-1.0.3.ebuild 1430 BLAKE2B df896eecbc8fb947ec125970f956f76f79edc2e6dc5c0ed0648f87f0c578d1dedeb406b0972ad4f97299c725ff80d328d73c3a5e189db1b0f8d5a931cfb1878c SHA512 9c008dd1db194230734f5637e004133f673caa81682061396243c07189749a59566f56780e5dbe272b66fb7fdb14d84a12c7dc4565d81435bd1f5b496c6a0a30
-EBUILD mako-1.0.6.ebuild 1486 BLAKE2B cd0033a577553a01de9b38f555d0bbaba44bb289e4a4211fc8c70a1755dd29c1855f8da5de83ba7b003b96742a61b40b8097d4a069290969b5c33ca24f179ac9 SHA512 08c387c48dfc3cf0df79db16619d337599a279d30a1a7252e59953c1aae7a58c3ecdf54222c126acb2a8e86ec180af906c42855d75604edb8f2fd59b320ee8ec
-EBUILD mako-1.0.7.ebuild 1171 BLAKE2B 5abc74f77cafc583d5a43a8ee0addf0213e222fb5f09b55ee5d8235a59daa9e605a05688b9dd79638c66e0f19716f1d8f1b24306c2d7ad594f520476d4e1fc2a SHA512 c1131304e8ad11ad7c778d5401c5a760d3c4519ce6a3553a6aaf995d15c2bae8b790ed0e0d688acf9df5a0f8a921441601bc778946efc745386143727f9fb711
+DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
+EBUILD mako-1.0.3.ebuild 1421 BLAKE2B 95d75e0d84b3e93fa95ae5116959c12a93f3c359891d4ed5af9ab93a093bf0954ee454522e35e8a622915ef0d52c9b96e13f2201bde4a3395d5160f896903ea2 SHA512 4a4da490d7ccf4458ac51a5027f3c451e815f27cdd83bed664f9210d297c51ba8acba45f23325a0c3eac5eb767ac7950c0c284add00185eb89d213f6724c2e6c
+EBUILD mako-1.0.6.ebuild 1477 BLAKE2B e153eb99dce290859c1be13ca54222cccf5d1a0db7d6b39abce2dfd95426179f5d0baf5a0a0ff239d5a064dc20453fa49f5e1f3b95ea2733d70a04153a025c21 SHA512 67f87c4fc1b87046905e1fc8a07e5f8745673ea3670c755fdf5bdc2ed9ee85acddc086a421d91fe91a8c9552048b14230079b6bf493198a436aec4e55c18cab7
+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
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index b05167b27f9e..ae35fc28324e 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index d2734ef22bad..628b082b9e1c 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 eutils versionator
 
diff --git a/dev-python/mako/mako-1.0.7.ebuild b/dev-python/mako/mako-1.0.7.ebuild
index 6b3548360afb..692dc1007f31 100644
--- a/dev-python/mako/mako-1.0.7.ebuild
+++ b/dev-python/mako/mako-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1 eutils
 
@@ -27,7 +27,7 @@ DEPEND="
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
-		dev-python/pytest[${PYTHON_USEDEP}]
+		<dev-python/pytest-4[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/mako/mako-1.1.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
new file mode 100644
index 000000000000..c993bccace2a
--- /dev/null
+++ b/dev-python/mako/mako-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="http://www.makotemplates.org/ https://pypi.org/project/Mako/"
+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"
+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)
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
+
+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
+}