gentoo resync : 24.12.2018

10 files changed, 2 insertions, 490 deletions

diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index c238547aba4f..0d7981620c39 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,17 +1,3 @@
-AUX httpretty-0.7.0-deps.patch 2344 BLAKE2B b2f7e8b49f8612dc8ee732529ddafc70adc61d42e84d46165ce8627e4b0ea4324e75433a3b05086d23ac5c981747874beaf8ac0350c42c0a2dd06d73b18c4554 SHA512 d8c06d426966673d178969c8d0edb79e903ba89831a9942ba6788006d62e52a0302f306c40e1d171e39aaef03e75b73606b5a936babe50940b04025e7c46229c
-DIST httpretty-0.7.0.tar.gz 28066 BLAKE2B e4460fb060efd5b2551218a01f52b9dc6250f1ad0582e8c48ebc98fbaaac053ca914620e7a88d4404e8a15106853caae31ee05434f3756f293c1d01db23e5514 SHA512 9adfd906336aa0ac2c21be8b789eb2e57994f4aac719958fc657291d922fe28b1fcc60d9b39e0e616b6d8565adaecb8228df3a9d1428cc189372b1cc700f664e
-DIST httpretty-0.7.1.tar.gz 28394 BLAKE2B 2b98d2b6f9cca35d5396a038c0851cffc6aa45456f6ae3ef082b0fba90c6cd137a2e99534ee836c7c00b5394668a266206df579253a32b4213b8127b58f8d629 SHA512 53b6f063e0e7863fa77aad1eebb0ad3078528bc97d26df80a3c6491c42b9a9008080da35bbb1e9372674c996f25e5109c84b48a2a6d9f0de5b7c53331bdad857
-DIST httpretty-0.8.0.tar.gz 34291 BLAKE2B 71bc13eeb1153f6b7a1c5e60b6cb197a3e6a7d8bf32db047843d17cdd1fe0eff0904f10c4b9424728e12f12a98574de317a6a7db16b1f1e8315642e872187275 SHA512 0c6193c488a27345b3d98cc6a62e8933b67828b7335700367b28cf328ef86ff2342056bada84ca631d6acc5650b7b456e80d85d8099e873f07cd41140c481650
-DIST httpretty-0.8.10.tar.gz 41741 BLAKE2B 2d0648074eea08223fe2191c1f416af7349ab16d1578e4b259d02e163462bb1c2222f122ed532a9d4c8179d332ef29347a8da67765e34a81643f8fa988f095bd SHA512 5bc734a89c45daa746551ef7d150c02bf6d9cddf1bc5426a8800d2241bb5bf8a834d2736fd9a4846ce150747d9c2064686a3ed63e97e5f131778d834956a9107
-DIST httpretty-0.8.12.tar.gz 43396 BLAKE2B ed2b9e7d8b2e7088a613234c8d60edcc5294506c77f16e5821060e3115bc8521f568abba313b359008add09e47e320bfc7178eca86e5e59158d7e303dc6f017d SHA512 1d1cbc2fd56c4aa8c2ba1e5bdb6d56db57a74f73028ebeab141f93d55eaac4a46a19c66148435e45c91d21a561ecaa6100cbe1ac0dbb65b2bdf2c8551b99a523
 DIST httpretty-0.8.14.tar.gz 43574 BLAKE2B 4015bb234c2fe3017a43fff6e3b51a7f015d9d133756d4326750da1ea06ce1910d91d7b47625a08ec85856d156a0d8b3b18706e582578e3d186994b8e4f55c69 SHA512 5adab6450e8360cc21bab4136f64cd11757b9f292c7e27980fe2561f3e705baf4f0211b9e6ff4ec9ba96a788a6c5b5b1d26657972b67423c9c25491927b0884b
-DIST httpretty-0.8.6.tar.gz 40815 BLAKE2B 6964f96fb6de59f2ff9bc5018e6bec15c391454888fb0f42045257bad8fcc96a9cb6e1c4f4347267e85efc96473ede26c37f6680b67bb47a1632e371dcf313de SHA512 bd5d0b1a33b52ae3d0e09673429e771ce582795bf58d38b34d4df39f74b377ec199d720fa061a84b64175b6ba67a91bdb35c242b4fd754627d2744cb8b33b313
-EBUILD httpretty-0.7.0.ebuild 1397 BLAKE2B 37053146f58fd72f676bfd51f9d395fc82774d53c22431d9aaec94bcf180d542759443eb64b72fe3be9106924cce9d9d82bc3cecc7c2ffedfcb2f50f10f62353 SHA512 a99cbc6ed739e133a6d812f267c0aca45c3298ce0aa0a1682cb30d35bd6f3ba83fd49f56b2f4ded0db0ddde56f2b46723647e08fe444098c3affca8f6a3ffbcc
-EBUILD httpretty-0.7.1.ebuild 1268 BLAKE2B cbeec2751366db7c9f22900648d5a06d0f776dbc97478676daac33df7f02b5bca44b6512763ffbd7c040dc65ce3f3228858996ff6742e487ee44cac4f23f1890 SHA512 f5ee3a5cbedd31ada8785bb9cf8763c29537b543819b0f77c99fd324fd0e952a832151b7edf0b53f05da03f736655b8aeff0cfb41e3eca1c9cf46d83e5c72430
-EBUILD httpretty-0.8.0-r1.ebuild 2309 BLAKE2B b10b7c394adb6c2f3a575ca5d73cced907aa3e1fa160b2cdea82db10a5f8f49e76d6cb01916e4dfaee49b6749ab67841eab3237d77aafd52cc508f827313581f SHA512 d36021d2470c4410802341ea39c48ef0c3a75a5d998e597c48374dc992bac07839ce17fd80fdd125a5250f90179928c1595257b2fbf270afca134654ce043311
-EBUILD httpretty-0.8.0.ebuild 1223 BLAKE2B b868e9f107eab4720ddc9b5bf18823691f04c79492cf08534e080553657e6365911efcad3e6f5f506690f9e1bf14bdcb8aac021b802f80b586ff886405b51db7 SHA512 8f3eef3205c7ed4d1165d6c0e389a4c9aad75260330f26828cdb69de83ac4f9db0441a70801b32064c63678ebc1f20aff9863e3714c161a2e7ff5f943d605e91
-EBUILD httpretty-0.8.10.ebuild 2307 BLAKE2B fdceb19536f36f4cd51c923a4b35a6e0905221090faccbd07b95fb54471e7111adbb8e68d45572aee3c7f853959a02eaa1a7c064ce5c5e728ebc563f4869f940 SHA512 ba89125cdbd1c277ae523e6052b9cf4e94cc8c879e755c5d01e30cf074cbe612626b74f07dab7814b0f6bd0f92b625a32526b28e23ecccc05805d3ad1fe94092
-EBUILD httpretty-0.8.12.ebuild 2321 BLAKE2B 48c363fd10a9ad49081276a23490a7869c5b8faa531340af5fa58c9720a9490cd923a71f5a3fa8ac0a4e8f6e635518dbc69c0ddb76d9695f306f2a2c4ac22a53 SHA512 b283fcb17cfc8468035ab28acb5b6cb117634ea14f8557c06f3a0cc6485f87b89f17ca0bae3db6eb019a82583299f2d5c0a65b67e26b9b44964671e25ca36bfe
-EBUILD httpretty-0.8.14.ebuild 2320 BLAKE2B 531224d633c62cf995a3fa3be258b96375287af3544df16bc165d8f29d92c7021ced7e026a0f358900f5450cbad3e6bbb964d998b2bd8ebfee9083b5ab3a8bd7 SHA512 3980892e50376218d848940e22b594146e1d6d2ac46d5131ecb5f39fd42cd6c788d5dcf4fd7274ee9ab3656f35ffc6b1551ad4521313cf7bf46ff929a4cafc68
-EBUILD httpretty-0.8.6.ebuild 2330 BLAKE2B ba780538d7ea4656ad5442ce0466e2dde7d1d86c532169b74f1a86f20cf4258fc141ddfac87e16fb4619352b923f52f77dbe82828a873b142fd6d50e7babde3d SHA512 fb4ea0ef4bddd1fbafde0126f91c8efc4024c267a633f0f378143e93ec3b054f93f65ec689713674351b35b43fd3b26e570d3196023c57a5a142100eed258293
+EBUILD httpretty-0.8.14.ebuild 2235 BLAKE2B cf30913d00e567de74f182924ca2d6c19f05269ea1b7d8e999a8011ef4724074aaca7d1f02d9d8539cf302392f9bb1afe488eea343bb87e013963e17f99e46dd SHA512 39d6cd3880e8e0fc7c6c10bdc950e4fe7303f46665fe22a6a3b71cd380b980aa4725be45d79f6e2535e4814485e0f72549fffd3fb01c744dea13cc1cef799a33
 MISC metadata.xml 393 BLAKE2B 904c5889a4cb7ee65cd6e400dd7484aa3e05ff66f5fe8c4822d13aa67be4573a70dc1188304cc1f93821deb98f41fd84218d7fcac2a7fa5b29346bce51303eab SHA512 79c7b3c101043ed36490f7b543f191d79e8fc3b2d9830ea44999e7e8018e6d1fcbe73915fb2f1adff9e6110404467bb98786aa6091fdf751021a995f0ef6f483
diff --git a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch b/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
deleted file mode 100644
index 26c6ebec4e5e..000000000000
--- a/dev-python/httpretty/files/httpretty-0.7.0-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-rebased from https://github.com/jamielennox/HTTPretty/commit/3a7d5a04b2ed5cebc8e1fc14f706f5da7fc5162f
-diff -ur httpretty-0.7.0.orig/requirements.pip httpretty-0.7.0/requirements.pip
---- requirements.pip	2013-10-02 12:44:47.000000000 +0800
-+++ requirements.pip	2013-12-02 15:37:00.611977792 +0800
-@@ -1,12 +1,9 @@
--argparse==1.2.1
--coverage==3.5.3
--httplib2==0.7.6
--misaka==1.0.2
--mock==1.0.1
--nose==1.2.1
--requests==1.1.0
--steadymark==0.4.5
-+coverage>=3.5
-+httplib2
-+mock>=1.0
-+nose>=1.2
-+requests>=1.1
- sure>=1.2.1
--tornado==2.4
--tox==1.4.2
--urllib3
-\ No newline at end of file
-+tornado>=2.2
-+tox>=1.4.2
-+urllib3
-diff -ur httpretty-0.7.0.orig/setup.cfg httpretty-0.7.0/setup.cfg
---- setup.cfg	2013-10-08 05:42:31.000000000 +0800
-+++ setup.cfg	2013-12-02 15:40:34.331985437 +0800
-@@ -2,4 +2,9 @@
- tag_build = 
- tag_date = 0
- tag_svn_revision = 0
--
-+[nosetests]
-+verbosity=2
-+with-coverage=1
-+cover-erase=1
-+cover-package=httpretty
-+cover-inclusive=1
-diff -ur httpretty-0.7.0.orig/setup.py httpretty-0.7.0/setup.py
---- setup.py	2013-10-08 05:42:31.000000000 +0800
-+++ setup.py	2013-12-02 15:42:26.467989448 +0800
-@@ -50,10 +50,11 @@
-     author_email='gabriel@nacaolivre.org',
-     url='http://github.com/gabrielfalcao/httpretty',
-     zip_safe=False,
--    packages=find_packages(HTTPRETTY_PATH, ('tests')),
-+    packages=find_packages(),
-     tests_require=test_packages(),
-     install_requires=['urllib3'],
-     license='MIT',
-+    test_suite='nose.collector',
-     classifiers=["Intended Audience :: Developers",
-                  "License :: OSI Approved :: MIT License",
-                  "Topic :: Software Development :: Testing"],
-diff -ur httpretty-0.7.0.orig/tests/functional/test_requests.py httpretty-0.7.0/tests/functional/test_requests.py
---- tests/functional/test_requests.py	2013-10-08 05:42:31.000000000 +0800
-+++ tests/functional/test_requests.py	2013-12-02 15:43:48.763992391 +0800
-@@ -698,7 +698,7 @@
-     response['response'].should.have.key("status").being.equal(200)
-     response['response'].should.have.key("body").being.an(unicode)
-     response['response'].should.have.key("headers").being.a(dict)
--    response['response']["headers"].should.have.key("server").being.equal("TornadoServer/2.4")
-+    response['response']["headers"].should.have.key("server").being.equal("TornadoServer")
- 
- 
- def test_playing_calls():
diff --git a/dev-python/httpretty/httpretty-0.7.0.ebuild b/dev-python/httpretty/httpretty-0.7.0.ebuild
deleted file mode 100644
index eec8bd8fc2d1..000000000000
--- a/dev-python/httpretty/httpretty-0.7.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_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"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-# I believe we don't need unpackaged package markment
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-PATCHES=( "${FILESDIR}"/${P}-deps.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		-e test_streaming_responses \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.7.1.ebuild b/dev-python/httpretty/httpretty-0.7.1.ebuild
deleted file mode 100644
index 9913d5128b50..000000000000
--- a/dev-python/httpretty/httpretty-0.7.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_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"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/steadymark-0.4.5[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.2.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild b/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
deleted file mode 100644
index e74338ab415c..000000000000
--- a/dev-python/httpretty/httpretty-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=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}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.0.ebuild b/dev-python/httpretty/httpretty-0.8.0.ebuild
deleted file mode 100644
index 5ed9516eff5b..000000000000
--- a/dev-python/httpretty/httpretty-0.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-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"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-		"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=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}]
-		dev-python/ipdb )"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	if ! use test; then
-		rm -rf tests/
-	fi
-}
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125
-	nosetests tests/unit \
-		-e test_recording_calls \
-		-e test_playing_calls \
-		-e test_callback_setting_headers_and_status_response \
-		tests/functional || die "Tests failed under ${EPYTHON}"
-	rm -rf tests/ "${BUILD_DIR}"/lib/tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.10.ebuild b/dev-python/httpretty/httpretty-0.8.10.ebuild
deleted file mode 100644
index d8f9443c6f99..000000000000
--- a/dev-python/httpretty/httpretty-0.8.10.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-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"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=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}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.12.ebuild b/dev-python/httpretty/httpretty-0.8.12.ebuild
deleted file mode 100644
index f0dcd0326bbe..000000000000
--- a/dev-python/httpretty/httpretty-0.8.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-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 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=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}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
-)"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-		rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
index 2645a4b1820d..ff621a82378f 100644
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,14 +20,12 @@ RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/coverage-3.5[${PYTHON_USEDEP}]
 		>=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}]
-		dev-python/ipdb[${PYTHON_USEDEP}]
 )"
 
 #Required for test phase
diff --git a/dev-python/httpretty/httpretty-0.8.6.ebuild b/dev-python/httpretty/httpretty-0.8.6.ebuild
deleted file mode 100644
index f49200316958..000000000000
--- a/dev-python/httpretty/httpretty-0.8.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-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"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
-	"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( >=dev-python/coverage-3.5[${PYTHON_USEDEP}]
-		>=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}]
-		dev-python/ipdb[${PYTHON_USEDEP}] )"
-
-#Required for test phase
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_test() {
-	# https://github.com/gabrielfalcao/HTTPretty/issues/125, still occur
-	# py3.4 hangs on many tests and is deemed underdone
-	# Upstream does not make it clear whether py3.4 is sctually tested and supported.
-	# python2.7 has substantial failure in tests/functional/test_requests.py and is removed.
-	# Some tests excluded attempt connection to the network
-	# On testing in the state below, py2.7 still has a tally of FAILED (failures=5)
-	# that occur within the folder tests/unit which upstream should address.
-	# https://github.com/gabrielfalcao/HTTPretty/issues/236 Bug #532106
-
-	if [[ "${EPYTHON}" == python3.4 ]]; then
-		einfo "python3.4 not adequately supported in testsuite"
-	elif [[ "${EPYTHON}" == python2.7 ]]; then
-	rm -f tests/functional/test_requests.py || die
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python2.7"
-	else
-		nosetests -e test_recording_calls \
-			-e test_playing_calls \
-			-e test_callback_setting_headers_and_status_response \
-			-e test_httpretty_bypasses_when_disabled \
-			-e test_using_httpretty_with_other_tcp_protocols \
-			tests/unit \
-			tests/functional || die "Tests failed under python3.3"
-	fi
-
-	rm -rf "${BUILD_DIR}"/../tests/ || die
-}