gentoo new year resync : 01.01.2021

4 files changed, 2 insertions, 98 deletions

diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 9009f9198178..4c2cd69edeb2 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,7 +1,3 @@
-DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 DIST httpretty-1.0.3.tar.gz 411707 BLAKE2B b2211457c937e19f8110bc28446a2b78a8042a742341c0492589def7447e819f051d301e9d254260778f349302ccf6fc163a9f2280a55af925ae353752450320 SHA512 a6349257376c12198d0bf7923245c34f6b8a0889946ba0c2551fd3379a8d9a8e4610de81c66f945656c1879ad3fb1485f2f4148634fcc4e156b9f0a59f7dd758
-EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
-EBUILD httpretty-1.0.2-r1.ebuild 1336 BLAKE2B 2925512848a8da4f8d707e8422f398212e146168d7eb669a6eef6f510d05a2822c43d595d6e4296e300249be3169260b8f7263e7a6e7a7d7c2b39041e9b4c5b8 SHA512 15b950045d0edf254f3349b3e0ddfaf241f824cb0f2273aa6a4351522bbd783b90eaa8f88b3dacd45de8df99e6a1f6e57bcc1d75a0672e34046c8ad0563a6bb3
-EBUILD httpretty-1.0.3.ebuild 1342 BLAKE2B 6e4806f5107a21995add20a1781ff3465a68672e0801ef83308dff1e7c18429a550830016cac8404665ee06f57edd3ac62865f730394f396c08b0a04aa552330 SHA512 0a33064f1ab6f53f01bfa441ffe06017dc07ee3ea4fa83d1bc329ea8ebc9f0cb2160651095428d57ee47be59a9acc7a48d8dcba089e62cd2044052cf894859c1
+EBUILD httpretty-1.0.3.ebuild 1335 BLAKE2B ad4c6ac33e39b4ee70c3931016113264651ed87d4deadf5c4c67a0378fd741c7fef0304c8620c1d763683cbf04b3e92429d365cf7bca0841afa20b35d366419f SHA512 ad1b4e93a1ae1759e1c0977b33f3a4c1b144f7b4ec669ddae1acba5fcee504afeb8f6c5c48be1edad8fa24a102d10e75e7e95e770750334b4922d92a115678e9
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
deleted file mode 100644
index 512384afe0fc..000000000000
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
deleted file mode 100644
index 12c6a2505f07..000000000000
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.3.ebuild b/dev-python/httpretty/httpretty-1.0.3.ebuild
index 8e097d95aae1..a06154c51c1f 100644
--- a/dev-python/httpretty/httpretty-1.0.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"