gentoo resync : 13.10.2019

9 files changed, 49 insertions, 127 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 59570a404021..6df812994cc5 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,15 +1,8 @@
 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
-DIST httpie-0.9.9.tar.gz 85006 BLAKE2B c5412348b3add127a5d5dfc04fdc13a47f82ec65634eedefb55a0cf1ce182a49f81a3a68c0cbb5e8c90b53efb165c89b7444d23328e545bdbf92d69d1de9c921 SHA512 e9adb1ecf9a25b57c634f35199bf1f8fbe4136179c0ba0d6032a41ae786da9344f54436f91d89e624c154bdca325f94c637364a934fc2d5742b83056434f7e4c
-DIST httpie-1.0.0.tar.gz 268982 BLAKE2B 36ae23876c995f450ac4d814a56a79db7aee175f3b6b060bf08049cd2ea5ec5000c91bf49a12eae8a2dff2c91e5d5200d3febc4cdd50d0488db35eb96777ed14 SHA512 9a68746636e367d1131069787f4a4a199b6434b828fe58fecef70e810c1d63c662c790fc45fd955a390113920a29d0116cf29d1167d638debe6b9419a4ae2d48
+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.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
-EBUILD httpie-0.9.2.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
-EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
-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
+DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7
 EBUILD httpie-1.0.2-r1.ebuild 1176 BLAKE2B 751f1e157f875752477bc5453de9e592bc39542ccdb998fd5fa14e34da14cfb04e9268742b101e9cc5efadb6087c58fa35a88c5bbd13c2e7bb55b541d37fc173 SHA512 be69977798c726337afeaf9447d800dd9141685894a446e7240ab7dd90c03612710aec61ab14d62c45701c6b8ca1870188eb087d283d04cd3f1a461eeaea0c08
-EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602
+EBUILD httpie-1.0.3.ebuild 1269 BLAKE2B 35ffed56743e5115e1e7273296368e6c7c7419281ecce2544c983413e16e8fc16ad829900d8eb60870e2b49d5097affeca255075ffceec4746b3900d6006d67a SHA512 113b1f56570cc89988c39434071aeb5e43b666869d49a68ff958c22e227dac636c1f29d7c1134ad4bff71df8ca6fd616d3af6f5d682d2dc6fc099ac7bc9fdba1
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
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
new file mode 100644
index 000000000000..0e4112629c73
--- /dev/null
+++ b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch
@@ -0,0 +1,17 @@
+--- 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
new file mode 100644
index 000000000000..0df4a0a760eb
--- /dev/null
+++ b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch
@@ -0,0 +1,20 @@
+--- 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-0.9.2.ebuild b/net-misc/httpie/httpie-0.9.2.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.3.ebuild b/net-misc/httpie/httpie-0.9.3.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.4.ebuild b/net-misc/httpie/httpie-0.9.4.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.9.ebuild b/net-misc/httpie/httpie-0.9.9.ebuild
deleted file mode 100644
index 6a5fc06e7b2e..000000000000
--- a/net-misc/httpie/httpie-0.9.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-1.0.0.ebuild b/net-misc/httpie/httpie-1.0.0.ebuild
deleted file mode 100644
index f25019e3c61a..000000000000
--- a/net-misc/httpie/httpie-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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,7} )
-
-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=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-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-1.0.2.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index 07866281b6e7..7849e8a95d9b 100644
--- a/net-misc/httpie/httpie-1.0.2.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -22,11 +22,19 @@ RDEPEND="dev-python/pygments[${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}"
 }