gentoo resync : 25.08.2020

6 files changed, 3 insertions, 104 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 8e1d8394b142..bcd3a4c4e381 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,10 +1,5 @@
-AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1
-AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8
-AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99
-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
-EBUILD httpie-1.0.3.ebuild 1280 BLAKE2B 8dc29d0ac813e1a560329dcaa81a7d09a9943ab7da68cdfd8fe51d78e5770b488cfaba540d37ba846a28a4dea2637f6f120e139ca77781ddf8b797024ca74c86 SHA512 7fcd9f49ed92db12b57ad9bb684113260f941ac764f329616f7cb0c0d758c1c0ece6611ac0d7551243890b6a6991af3fa45b8e2a1ab594da97eb5dffa9ce9cf8
-EBUILD httpie-2.0.0.ebuild 1055 BLAKE2B 81e139ebc0bf0c666ea991a8e2afef1d2927304244012a955145c16b2f73a4e04716ad5d5580d9ecf92a1ec276a4e46e5d43c0af24d660a96bed88120c39e597 SHA512 e4ee9b4188bf81da301a3f306ac19f2fa3ab9fa751fc6ff36183e2d065ff91c4ea3ae998f6ffb8737277fc9aca373190536a1b5f50b077e7a338b00379661c31
+DIST httpie-2.2.0.tar.gz 1761927 BLAKE2B 3ce8acf4abf9cb189315e07e7f9c8dfc1b0a537696a2c9fd795e8e944c85c1df8e7e13fbaee68d3b93115296ba048e664d31245fe2c6b832123818292b4fac8d SHA512 00c1f34041854319816d7d643a79358723c27a3744f405d629b5361685745bfdd8ce0a0f127cb3d6746e46405d24562625ca37733a5955809d7bfc077ae5c533
 EBUILD httpie-2.1.0.ebuild 1049 BLAKE2B 14c805d3d274998fcd8dc8c559730024d38f54cd20b0dc8dbb585003330702f5c7bb4d549c5bf594810d00686dffde61abcb526649f1d021506a77c84841b526 SHA512 126244d16e874663315fe0ece6e7be2107f11974d8c7f0fd072860cc518eeef9705b7626ed95e12a4d218f51e30e4623c823c9c91e8f8e07fac66c2f45eead2f
+EBUILD httpie-2.2.0.ebuild 1051 BLAKE2B 0fff59edd7b2731da9e2d8c45448d60f66ce20db4dd842491fe898a9ea2df00236151319b7b65005d2644d4bb753ec23110141bb802e24bfdc8702dda8f98947 SHA512 12efd9b94a95798ef5802e8610d3af43e3553ebcef42f8a15b6ce60312ca5ae6b5c9d2f806b5173541a0ebf4650a0b78f6470c4c3e910e5e82e2175ac574bbe9
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
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 212f91f41e82..000000000000
--- 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 0e4112629c73..000000000000
--- 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 0df4a0a760eb..000000000000
--- 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 4c1b60f7651d..000000000000
--- 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.2.0.ebuild
index 12211f339e9b..e3773e796fbe 100644
--- a/net-misc/httpie/httpie-2.0.0.ebuild
+++ b/net-misc/httpie/httpie-2.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit bash-completion-r1 distutils-r1