commit: 5314ab7c018fb5e7e4da28c56b2b498f09ad2cbc Author: Ralph Seichter <github <AT> seichter <DOT> de> AuthorDate: Tue Jul 21 19:20:57 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Aug 3 08:53:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5314ab7c
net-misc/httpie: Remove obsolete ebuilds Old ebuilds and associated patch files removed. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de> Closes: https://github.com/gentoo/gentoo/pull/16768 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/httpie/Manifest | 2 - .../httpie/files/httpie-1.0.2-fix-test_ssl.patch | 11 ----- .../httpie/files/httpie-1.0.3-test_binary.patch | 17 -------- .../httpie/files/httpie-1.0.3-test_stream.patch | 20 --------- net-misc/httpie/httpie-1.0.3.ebuild | 48 ---------------------- net-misc/httpie/httpie-2.0.0.ebuild | 39 ------------------ 6 files changed, 137 deletions(-) diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest index aa02bf4cbda..91999604531 100644 --- a/net-misc/httpie/Manifest +++ b/net-misc/httpie/Manifest @@ -1,4 +1,2 @@ -DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7 -DIST httpie-2.0.0.tar.gz 1752529 BLAKE2B 212e7a142f3efdf1bf238d6eb7e472579a8a8248950caf19ec584eba4f903de09b08433805105a61714046857d32b662f54cde927d20db2a2a1ab81bc99bc753 SHA512 ddac5206107241c9fdc2d2697a31fc7a123c3a01c2ccbd0aad8d52e1472f093b201e422522972cce992bfb2fc7d32ffc6380d457112c83ab643008086f9a7f2d DIST httpie-2.1.0.tar.gz 1754801 BLAKE2B dabb6a1ce0cc4ecebbc7e933ed3084d7b75e0fac1fbf6968f41d37ee95cef684ee3603ddb5361e072328d13c9c98332b23bfdd0454da3399038307b124ea2e98 SHA512 39d56c9b9aad4871ce439a235377a930ad7c78b833f9bad568142efc9fd8af9123ac931e434c6ddb7fa6e0deb0acf8f5fd1ddf79f3b7a65467267cbf4629555b DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533 diff --git a/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch b/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch deleted file mode 100644 index 212f91f41e8..00000000000 --- a/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/tests/test_ssl.py 2018-11-14 16:36:19.000000000 +0100 -+++ b/tests/test_ssl.py 2019-06-29 16:28:09.466528486 +0200 -@@ -45,7 +45,7 @@ - except ssl_errors as e: - if ssl_version == 'ssl3': - # pytest-httpbin doesn't support ssl3 -- assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) -+ assert 'SSLV3_ALERT_HANDSHAKE_FAILURE' in str(e) or 'handshake failure' in str(e) - else: - raise - diff --git a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch deleted file mode 100644 index 0e4112629c7..00000000000 --- a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/tests/test_binary.py 2019-10-13 17:33:33.346205203 +0200 -+++ b/tests/test_binary.py 2019-10-13 17:37:39.474820883 +0200 -@@ -35,12 +35,12 @@ - - def test_binary_suppresses_when_terminal(self, httpbin): - r = http('GET', httpbin + '/bytes/1024') -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - def test_binary_suppresses_when_not_terminal_but_pretty(self, httpbin): - env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) - r = http('--pretty=all', 'GET', httpbin + '/bytes/1024', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - def test_binary_included_and_correct_when_suitable(self, httpbin): - env = MockEnvironment(stdin_isatty=True, stdout_isatty=False) diff --git a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch deleted file mode 100644 index 0df4a0a760e..00000000000 --- a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/tests/test_stream.py 2019-10-13 17:33:33.346205203 +0200 -+++ b/tests/test_stream.py 2019-10-13 17:37:57.513646115 +0200 -@@ -19,7 +19,7 @@ - stdout_isatty=False) - r = http('--verbose', '--pretty=all', '--stream', 'GET', - httpbin.url + '/get', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - - def test_encoded_stream(httpbin): -@@ -29,7 +29,7 @@ - env = MockEnvironment(stdin=f, stdin_isatty=False) - r = http('--pretty=none', '--stream', '--verbose', 'GET', - httpbin.url + '/get', env=env) -- assert BINARY_SUPPRESSED_NOTICE.decode() in r -+ assert True - - - def test_redirected_stream(httpbin): diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild deleted file mode 100644 index 4c1b60f7651..00000000000 --- a/net-misc/httpie/httpie-1.0.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"; -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.19.1[${PYTHON_USEDEP}]" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -# Extend list of expected strings in test -PATCHES=( - "${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch" - "${FILESDIR}/${PN}-1.0.3-test_binary.patch" - "${FILESDIR}/${PN}-1.0.3-test_stream.patch" -) - -python_test() { - pytest -vv || die "Tests failed with ${EPYTHON}" -} - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -} diff --git a/net-misc/httpie/httpie-2.0.0.ebuild b/net-misc/httpie/httpie-2.0.0.ebuild deleted file mode 100644 index 12211f339e9..00000000000 --- a/net-misc/httpie/httpie-2.0.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_6 python3_7 ) -PYTHON_REQ_USE="ssl(+)" - -inherit bash-completion-r1 distutils-r1 - -DESCRIPTION="Modern command line HTTP client" -HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"; -SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}]" -DEPEND="test? ( - ${RDEPEND} - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/pytest-httpbin[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -python_install_all() { - newbashcomp extras/httpie-completion.bash http - insinto /usr/share/fish/vendor_completions.d - newins extras/httpie-completion.fish http.fish - distutils-r1_python_install_all -}
