gentoo resync : 15.12.2019

3 files changed, 3 insertions, 47 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 6df812994cc5..65628183847d 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,8 +1,6 @@
 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.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
 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.3.ebuild 1269 BLAKE2B 35ffed56743e5115e1e7273296368e6c7c7419281ecce2544c983413e16e8fc16ad829900d8eb60870e2b49d5097affeca255075ffceec4746b3900d6006d67a SHA512 113b1f56570cc89988c39434071aeb5e43b666869d49a68ff958c22e227dac636c1f29d7c1134ad4bff71df8ca6fd616d3af6f5d682d2dc6fc099ac7bc9fdba1
+EBUILD httpie-1.0.3.ebuild 1294 BLAKE2B 8d9577f2b9d2a940f55bfbcbfd672084d489fb9fea641da9b0a588e90aa8117bc5f11e3f4fbf51cd521a078069b06a2a9ea68c6909c1ce81a79c59bbca6b0ef7 SHA512 5877d5884dff32f404cf787ef5f1a11be22ec55e62d5ab64b25f5d94d1c265bd351af6a7e82bee295a7134ec0024d893aea868643ea3e2e8567bae5c901f2ef4
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-1.0.2-r1.ebuild b/net-misc/httpie/httpie-1.0.2-r1.ebuild
deleted file mode 100644
index aac3979a8995..000000000000
--- a/net-misc/httpie/httpie-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,43 +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} )
-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
-}
diff --git a/net-misc/httpie/httpie-1.0.3.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index 7849e8a95d9b..526bb639658f 100644
--- a/net-misc/httpie/httpie-1.0.3.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -14,8 +14,9 @@ SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.19.1[${PYTHON_USEDEP}]"