gentoo resync : 29.01.2021

3 files changed, 3 insertions, 75 deletions

diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 630bca47b535..5019afe5d13c 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,9 +1,7 @@
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
-DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.17.1-r1.ebuild 2124 BLAKE2B 7a1cfd3426ae6e5b2c714eed9513f117af440dc5ff4ce18f0558e1108dbf90e946cb5488142151fb53d1f31a8072cfc1f2d450ec316624c21f98b148dd9b3efb SHA512 301dc533d0fa8b208b4ab76a8c8757c2f8096f7e6dabac1b39a2ed34679dcf6eec43fbaa8048f635287a542ee08132c8154b6519df3c3bf1acdd1786cc00c2c7
 EBUILD jedi-0.17.2-r1.ebuild 2122 BLAKE2B 024075a30fd86c3299a0e3a53f67fb2a2b1d86ed66b16105b9d4d50ab2896b39f8b1b48e738ea0827d7dac994579ef79de9e61808b520c33051361c10b11491f SHA512 8be3d7c4985a1ac7e71ccade2f3b74cab705ee70cab85c8e1e2e3455731c430c8949ced57c90d40f2275f2ce992ea641d9346fdc0d2056e643bdfc3f6f8c1f6e
-EBUILD jedi-0.18.0.ebuild 2172 BLAKE2B 460e20959868921d03ba1e08e2ad8ae38b1aae032488e211e8b4e18e1d9cf540cccd5f7712fa1ccdd24fb1e8078ed376a329850f8bcbd853c0c11e60ed810bb0 SHA512 b3aa103e1180fff0999753abe9fa13e28ef69186e46cac7b9b5f7d1fba8acd1eb4d6457a79627962ab7e8babb3284590b00b6b94c6612f873fb3ec6f84a82ad6
+EBUILD jedi-0.18.0.ebuild 2168 BLAKE2B 2da536fd949d57519851c8da29ba91c5bcbbfa977c3e913cb1ede700dea66d7a10c6b270688d847b8c7af31a912e6a25314f05b95d59a8937f0c0fc4f058ce9b SHA512 b3a524c1b533e97dda22448fc1983445b0b3fef77a6cfe0bff778b20ff795ac5dcecf10dc01bb73be02f88586bcbd2a948d0d2544a9f115a73461f895304fa03
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.1-r1.ebuild b/dev-python/jedi/jedi-0.17.1-r1.ebuild
deleted file mode 100644
index e6c54498d508..000000000000
--- a/dev-python/jedi/jedi-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="
-	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
-		-> ${TYPESHED_P}.tar.gz
-	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.tar.gz"
-
-LICENSE="MIT
-	test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="=dev-python/parso-0.7*[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes these as submodules ...
-	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
-	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
-		"${S}/jedi/third_party/django-stubs" || die
-	mv "${WORKDIR}/${TYPESHED_P}" \
-		"${S}/jedi/third_party/typeshed" || die
-
-	# don't run doctests, don't depend on colorama
-	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
-	sed -i "s: --doctest-modules::" pytest.ini || die
-
-	# speed tests are fragile
-	rm test/test_speed.py || die
-
-	# test_complete_expanduser relies on $HOME not being empty
-	touch "${HOME}"/somefile || die
-
-	# TODO: investigate
-	sed -e 's:test_local_import:_&:' \
-		-i test/test_utils.py || die
-	sed -e '/with sqlite3\.connect/,+2d' \
-		-i test/completion/stdlib.py || die
-	rm test/completion/django.py || die
-
-	# tests relying on pristine virtualenv
-	# this relies on test* not matching anything else
-	sed -e "/#\? \['test'\]/,+1d" \
-		-i test/completion/on_import.py || die
-	# this one's broken by 'path' module (dev-python/path-py)
-	sed -e 's:test_os_issues:_&:' \
-		-i test/test_inference/test_imports.py || die
-	sed -e 's:test_venv_and_pths:_&:' \
-		-i test/test_inference/test_sys_path.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index f85ac8301b93..75a301d9c8ea 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"