gentoo resync : 14.05.2020

4 files changed, 7 insertions, 50 deletions

diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index 50a8023380fe..7c7c5e2da151 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,7 +1,5 @@
-DIST Chameleon-2.25.tar.gz 193965 BLAKE2B a6ae7768c52807a82229d75fc044116a77df5ae3032a98e44558a1d2b3ee2f427f3291b7c2895639050ea1e9fda0e6868ca7b8299cbbf1d5e1b0714af0d835c0 SHA512 b2ffc05c6ab5268757ae6a93a0579d8031dfe7e09882f0f3f0b9a25677ecf896af99a8e7cf6bec98648e9c8526365e7e517bc174d36137734968d80f3f14a05d
-DIST Chameleon-3.6.2.tar.gz 121518 BLAKE2B 1a49b671a2ec437570581489670a86f4f07ec512a5902ad128806ed9cd3bc813be17b806d942a8a8ed30ec9a48e7f20116a691a5d1c0e3f7d98f8781de470b3b SHA512 0bdc1314cbb37f462de640b89f0e7319025938253df34303c033c8cc903f94f183bb33fc99afdda9ff4cf500c78778df6f5f1f72c0c1607014d6a38117d269e4
 DIST chameleon-3.7.0.gh.tar.gz 135209 BLAKE2B 14e890eca1a3c211dfb5a658457473b21948b6f252e76e5391e862850a29e9e0fe4aaa31a03da7ec1674a2b563d083ee31fb342be2dc9bf4e7b4dbccbabf8637 SHA512 9f1d2a9222b795ac139f0c06ea8169ec132c00714ec4608e58dd5781dba8380f988141f6659c47e8920ee0cd4d4bcde9070794cd0e2b5f34d0fce21d24e2dc98
-EBUILD chameleon-2.25.ebuild 831 BLAKE2B b569579d10518dcda7f2d4f8915d4487ab0998f7475c531c270550c49f4904ccddb1491e8591c2c3a2f3dd1091bd2ce405a1649c6791377d62bb0a64e97af2f1 SHA512 ab50e4e374da67ca6c46089e462ed6d8ccf69aecd27b4c9fcb703d33b95a493513ff1a0d3b34aae8043f6a4f8a8004356a058a3a2ac29f5b9d638e527c9da3b6
-EBUILD chameleon-3.6.2.ebuild 489 BLAKE2B 5f0d7f78db24efd8c94949a2ba3c9aa7ac6666d65f8ffe53e5392fb68fdefec79f9654b1ebac267442e7c173a2e0eeb4b7c7a4cd859aa2b2ed4453f955fc0246 SHA512 5670e83a39f6b2381303095f818fce93bb365caca0e81bb1897208b4f14de3359e1cab1572b5e7bc905552f285bd2def99ef5c1909d309a6e0f45d7c3f76c4c5
-EBUILD chameleon-3.7.0.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
+DIST chameleon-3.7.1.gh.tar.gz 135230 BLAKE2B f0bd4dd90f7ea976e96101c2937f0ae5db110531caf28890042d0cd7a628489f03f9e2e3eed16dea2981ebb6e064a53adf95638102dfde6c8218e41e0473b32d SHA512 158b418fa6fbd13cd48d913ab34fb4f16450aa0fa3b382c6c829efed3100753814449a1d4004c9bc45d327d2a66130db0518b9c28943af300b4b310e955c426c
+EBUILD chameleon-3.7.0.ebuild 487 BLAKE2B b4bfce3c5bbcc2bf1499a36ce44295bcdb3f138b919192fea523e353747d291ee7c030f208642b1f7df7603e892fa0592d0c7c2c94e2ce0c8f232773df9ca073 SHA512 99e480305dd8870980bac8b4ccd2cca4eddb1d0b09d33810f9406d06dad42af6e51037d732fdb8b8abf4941b7f75d2121abeeab7bd7e1aff32dfff6a5662fcf2
+EBUILD chameleon-3.7.1.ebuild 489 BLAKE2B c13e3c34a531fb9154e0675285ca97ae1f8b0d13bc76d594ff31a2e9e8f67b035bf1b1ea91730f858952e43df9866618649aa537d8ab3863080e02712bb9d77d SHA512 b6afcef7a6e86273894e0588c9bc83102366137bdfd872ec40fa087228ec5efc47980130aea0e33ea7150efc8fc8b7451b2c66225287326776f7f9e3dd06a52b
 MISC metadata.xml 312 BLAKE2B 9cef667b151e7c744637259ffe810e24eff175a6c1544091effc28d2bfcbc8f7d221af7d572662a037a78af3dfeefdf70ee4ea2ec066b798525d686130632c8d SHA512 12c503e809af190746a7f59c4367083bf566e1d908e0166d109cfb507e1b7472ef8574d790d6f9403d9bb6d4246eafa2cdf77ece46dde74ced493c91acf52f1c
diff --git a/dev-python/chameleon/chameleon-2.25.ebuild b/dev-python/chameleon/chameleon-2.25.ebuild
deleted file mode 100644
index ea608feeba1e..000000000000
--- a/dev-python/chameleon/chameleon-2.25.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Chameleon"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Fast HTML/XML template compiler for Python"
-HOMEPAGE="http://chameleon.repoze.org https://pypi.org/project/Chameleon/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && emake html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/{[a-z]*,_static} )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chameleon/chameleon-3.7.0.ebuild b/dev-python/chameleon/chameleon-3.7.0.ebuild
index 4bee57992bd6..691d011358e2 100644
--- a/dev-python/chameleon/chameleon-3.7.0.ebuild
+++ b/dev-python/chameleon/chameleon-3.7.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/chameleon/chameleon-3.6.2.ebuild b/dev-python/chameleon/chameleon-3.7.1.ebuild
index 78effbc5138f..4bee57992bd6 100644
--- a/dev-python/chameleon/chameleon-3.6.2.ebuild
+++ b/dev-python/chameleon/chameleon-3.7.1.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
-MY_P=${P^}
 DESCRIPTION="Fast HTML/XML template compiler for Python"
 HOMEPAGE="https://github.com/malthe/chameleon
 	https://pypi.org/project/Chameleon/"
-SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"