gentoo resync : 28.04.2021

3 files changed, 2 insertions, 59 deletions

diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 737abae5b342..23fee3b45fd2 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,5 +1,3 @@
-DIST httpie-2.3.0.tar.gz 1769401 BLAKE2B e9bb5ca9ebb5fde3bed66ba15c46cccff1f8d5d01841f954fe4d19be92d3282cd3c19e1fc34b42fe1c36798438aa116f5bb91147864be9d8ee37030cb7796e16 SHA512 d0c5b46075892e9d6df76c1e3b430fcd768238c7fbdeda51368dc1bc7c657efc901088ccb7f1e6fc6e4f54dde4c9bcbe626dfa926c8ca1a6bcfd12e522414505
 DIST httpie-2.4.0.tar.gz 1772537 BLAKE2B 111451cc7dc353d5b586554f98ac715a3198f03e74d261944a5f021d2dcc948455500800222b323d182a2a067d0549bda7c318ab3a6c934b9a9beec64aff2db2 SHA512 44cc7ff4fe0f3d8c53a7dd750465f6b56c36f5bbac06d22b760579bd60949039e82313845699669a659ec91adc69dbeac22c06ddd63af64e6f2e0edecf3e732a
-EBUILD httpie-2.3.0.ebuild 1580 BLAKE2B d21fdd15e5656af0a54d13652cdcd7c6ff4e8eb57875fe6c5200b496172d399ee566998d1d75be36fafd1e0504005e750ebab8437c7283eebf26b7a51e2e4baa SHA512 39e169d6673a8c120ee64efce8957550d43fdac6cf5fc31554ba23d69e4feda2da355d8f7dd67869e0c51b4de09ea5996f53fd238b0a957e0b876d293235640e
-EBUILD httpie-2.4.0.ebuild 1579 BLAKE2B 2ee916321ac4fb4e0bacc3477b142bf1f3579a636fb9bf84ee0031f7c4bcb6e0874da3b9f1009bbaa8a83b8e4546895ba0a4b0a61a09626300efd5fe3dde67a4 SHA512 0e05c02df76810f03817fa0964474cbb6cdf7f3dffba71f911871fa58094128f4637f88e0e2018ffb183202f54666d617e00769574926118faf53b7ffdbba7a2
+EBUILD httpie-2.4.0.ebuild 1577 BLAKE2B 09c82238242dd6bc2bfede83fd47e219ca29f34ca848b660f097156f4576d65ba6a575bd08c98ccf70a8113638d73195207e7f1f2f91a9ffe6e7a18ecf47075f SHA512 68a57ce1e74b68e0245a8370531ce9382b899f0ae732412eace4988cb068aedff5eb98a2bab04c3a8c0dd16bdcd15077c435958b7035dff5081add48ad7efa93
 MISC metadata.xml 749 BLAKE2B cb920766146fcc33952835a6e2fff7aeb12dff221655b53550a5158679639256529d51165dc25697ceac13113c6b34e3b174f75fb34e448c0d3121790324c06b SHA512 c3da003a8f72ab4df475211a13c35d83b0cbae2883fa7babecc3325c16ad967f80c25e6c28b35d1a120dba627a82ff629dde26aae62ad6e86494579e2e3eff3d
diff --git a/net-misc/httpie/httpie-2.3.0.ebuild b/net-misc/httpie/httpie-2.3.0.ebuild
deleted file mode 100644
index fb68e7636b15..000000000000
--- a/net-misc/httpie/httpie-2.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
-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}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=()
-
-	if has network-sandbox ${FEATURES} ; then
-		skipped_tests+=(
-			tests/test_uploads.py::test_chunked_json
-			tests/test_uploads.py::test_chunked_form
-			tests/test_uploads.py::test_chunked_stdin
-			tests/test_uploads.py::TestMultipartFormDataFileUpload::test_multipart_chunked
-			tests/test_uploads.py::TestRequestBodyFromFilePath::test_request_body_from_file_by_path_chunked
-		)
-	fi
-
-	pytest -v ${skipped_tests[@]/#/--deselect } || 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.4.0.ebuild b/net-misc/httpie/httpie-2.4.0.ebuild
index ee9d95b77935..0b65a23fe517 100644
--- a/net-misc/httpie/httpie-2.4.0.ebuild
+++ b/net-misc/httpie/httpie-2.4.0.ebuild
@@ -15,7 +15,7 @@ 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 )"