gentoo resync : 30.06.2019

3 files changed, 56 insertions, 0 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 85f8505724d7..92dae81b4a65 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,3 +1,4 @@
+AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1
 DIST httpie-0.9.2.tar.gz 73153 BLAKE2B 53ca1f5dd683d68ff6416a297bb45a2827f516a64cbca7f354243e7e2f8765677798d138b949db79c2735f9f71e106af2f669e6ba58ac7e11b86d4e0ed6c9457 SHA512 5622caa2f3136137d85f91eba9b0a165ec987b696a5e001844c8ecb868d66cfc86b3f3fb3a1ac493d7603c67ca88de0e0ffc776dce855ad69364190607b4fb73
 DIST httpie-0.9.3.tar.gz 73693 BLAKE2B f188a7fe5f63b39022d2a67e8f9dc2582ce8e8d4860b880b2e26403149361b999294bf0e55b41bf1773e73c0ffe81abd01c6c1e2ddaf755dfc31ab7e463b8516 SHA512 a98aa19ddcc5223133f1081ce22457d21b838b5779788a08d0b65ea80f903ab577a55e0c73b3656486eec08c3c0910d3e987aed0f117c5f9b3e005c6001000cc
 DIST httpie-0.9.4.tar.gz 79889 BLAKE2B 13053cb3389a03ecbd90caba85801772cba9f09a03f759d526256fc0195a31824408a02b004d3af50a1fbcaca7c02128b438ce341464825a08e4dbd5177ddf99 SHA512 eea4e0fce334d12f9438d89f87d119bc569f8042d95c87f6898b9110030674f49361bf8e119d815330aa117479557766d614510d81c42c9c3a6803c769f38b26
@@ -9,5 +10,6 @@ EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81a
 EBUILD httpie-0.9.4.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
 EBUILD httpie-0.9.9.ebuild 517 BLAKE2B d0b2031926effcd24b8d23b1dbf3ea311294dc439f56cefdb30359d82c0e727bae8cc19f37bc6681b4c61b3b715e00a7f20c8245464aefb46899395b5c9a29ad SHA512 880dfc9565f7f3791e97ebd946178e0dfcd2896e00813725f2b726d06091201b055fd759107459524c4d7ff35e6af1cc4cdf18cef2a94e23d11181a51f0fb0b9
 EBUILD httpie-1.0.0.ebuild 797 BLAKE2B 8964804fd47ee2543d5bfd7557a020a5103a4f0cc1534653786baab8d2073421c6ad2ee839ac85a7e39cd2161d3008f49b6e89d32663a6232ea6c3409f30880e SHA512 51b519746529294e151c982c8b45270223310796472b91e3b42ec88decc1daa8b39ec6af34b50319176c9245aa2eadd6010913ef5800c711f9e7efb909454f70
+EBUILD httpie-1.0.2-r1.ebuild 1178 BLAKE2B 7828143ca9265e373282a7f3fbce6e9cad8245dfc870f5dfd915c125770dfd1c8005e71ce07eff5c025eb3bdbce3cacfd8288556c2c0731402f0815d3c6384f2 SHA512 14ef3bb2498ecd3c5a72d867a1c3d0caaefc2f300954af28a5ee81deb075d886e97ace96dc57e6f9361c0a06a194467fb70993036e404fc13e9d2954113a7ce1
 EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602
 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
new file mode 100644
index 000000000000..212f91f41e82
--- /dev/null
+++ b/net-misc/httpie/files/httpie-1.0.2-fix-test_ssl.patch
@@ -0,0 +1,11 @@
+--- 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/httpie-1.0.2-r1.ebuild b/net-misc/httpie/httpie-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..e7057e9fb651
--- /dev/null
+++ b/net-misc/httpie/httpie-1.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,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"
+
+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" )
+
+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
+}