[gentoo-commits] repo/proj/guru:dev commit in: dev-python/libcst/

["Theo Anderson" <telans@posteo.de>]

commit:     e36b5cb9d631601da99fec5db91916b070677887
Author:     James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Wed Jun  8 05:35:01 2022 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Wed Jun  8 05:36:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e36b5cb9

dev-python/libcst: fix build (remove testing changes)

Signed-off-by: James Beddek <telans <AT> posteo.de>

 dev-python/libcst/Manifest                      |  6 +++---
 dev-python/libcst/libcst-0.4.3_p20220607.ebuild | 22 +++++++---------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/dev-python/libcst/Manifest b/dev-python/libcst/Manifest
index e4a254d6a..d62c90599 100644
--- a/dev-python/libcst/Manifest
+++ b/dev-python/libcst/Manifest
@@ -13,9 +13,9 @@ DIST criterion-0.3.4.crate 111110 BLAKE2B 1a27f32745dfedcddd1b41f1d9fa2096cecb11
 DIST criterion-cycles-per-byte-0.1.2.crate 6360 BLAKE2B 32687a7ee0028406bda3b6a521df222e8fa524f8e5b4ee372d855086f63c2effaa48a7aa926e568f367d145999e4d7ec57a554bbd89765de63609aa7fb4d7f4f SHA512 3f44d5c677b17f52246cd2a921b08fe3d9b8bf3eda56bb92374be3110fd5d7bea5764f169faba3f57a2f15c8947b50058e5d5314b160131d2f77982dc1ec04b5
 DIST criterion-plot-0.4.3.crate 17226 BLAKE2B cf896d08a208e9e317aa7b9095086660e57e5d8e6552b3615b027847e64fd4cf135d361bca7ee45fbe55163739285907320e9a39fbd28506fcb2ba56e091497c SHA512 69620d5b215757ddd818606d1a979c411de803032391be3b56e1c1ff73fbea992ae5e6c14cd78b519eeab806a34320468b44adb04fd1c67076163658f03d2844
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
-DIST crossbeam-deque-0.8.0.crate 20756 BLAKE2B 6bb602547cb0ca65552a9b981502221f1d3570422d22c867f654ba677e5c95aa5f81ed0022a498d3408c3f69291e1805b49fcfbfaff0d9a6075b75be3bf926ea SHA512 4efa73dcb9ef40b841039d24ffaf9bd7c63f8c0233bba1e0728fd5558702b4ef0af117543834c527335e99384d3c80d56293e891c9d94440f51f454b1b90c399
+DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
 DIST crossbeam-epoch-0.9.5.crate 43883 BLAKE2B c0ee0879c583bd1051b63d29eccac37ceb9f9446ee8cb64756b2e3d95a30c5c11bc79d9d460be4ef4b62513049e28900a96085031f805d064e81b5eae4bc297a SHA512 ad822e967e5ef45fa0c4a939f057f44146f1f051032fd032355a75c0f45ae4e0a55e1d31c80bc67c01ff8d9c87a51aba7ccfe9a440f061fd8225c879aa663064
-DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
+DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST csv-1.1.6.crate 886999 BLAKE2B b178d0419af671df570f37a4d054391bc883085b0cd3949de5e967aa4ca323fdadfd8c5d91eef1e8882ec112a1111cf255756eace3c7421e455ea2b6e01cb600 SHA512 81dd826f0ee85e7d335d844e9f9b4d2b66f7076c517d8050ee2e35721bfa4ecb8a906dcd9671b1c5381a968dcce0949202f1afe8eea535b6d215363d4f5be6fc
 DIST csv-core-0.1.10.crate 25668 BLAKE2B 8e9a56c26e75f4c4c9e90a21cc30c60cc3fff17515ac93bc858e8ec45e130df2ecabafa7c513b2d2815269fbbd98c418269dfb1bf1425d2fd32fe46823cee6c8 SHA512 2a269d050fbe5d9e0f5dcda2de1e84bfeb69538dde86040ad1ec7307a214eed813a1482acb5029a51f18126d384d5238355e021964e47811db971a0821bcc328
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
@@ -62,7 +62,7 @@ DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d25
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST redox_syscall-0.2.9.crate 23533 BLAKE2B edff38a41e57f40f9285d43deaacea32d518f5d87382d535b0349f123569613d50e7b45a70e4013f35632485951967a5157146593811102f3c0a7d9177f07fed SHA512 4f3c9dcb925c57253fa27f6355482d4f984fe31c4f562f2cd22e953c6f1f475e0687003e495167f400f77d2594ffb9a69548454db8086da5913c00643ecd337f
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db

diff --git a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
index 918e9d1d9..7dc7f5282 100644
--- a/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
+++ b/dev-python/libcst/libcst-0.4.3_p20220607.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} ) # python3_11 depends on dev-python/black
 
-CARGO_OPTIONAL=1
 # Make sure to remove 'libcst', 'libcst_native' from crates list
 CRATES="
 	aho-corasick-0.7.18
@@ -23,9 +22,9 @@ CRATES="
 	criterion-cycles-per-byte-0.1.2
 	criterion-plot-0.4.3
 	crossbeam-channel-0.5.1
-	crossbeam-deque-0.8.0
+	crossbeam-deque-0.8.1
 	crossbeam-epoch-0.9.5
-	crossbeam-utils-0.8.5
+	crossbeam-utils-0.8.8
 	csv-1.1.6
 	csv-core-0.1.10
 	difference-2.0.0
@@ -71,7 +70,7 @@ CRATES="
 	rayon-1.5.1
 	rayon-core-1.9.1
 	redox_syscall-0.2.9
-	regex-1.5.4
+	regex-1.5.5
 	regex-automata-0.1.10
 	regex-syntax-0.6.25
 	rustc_version-0.4.0
@@ -111,6 +110,7 @@ CRATES="
 # Current version (0.4.3) has git based rust crates
 # https://github.com/Instagram/LibCST/pull/691 updates the rust module to use versioned crates
 MY_REV=380f045fe05bfdc6a0555f8e36a0c1c406ca1b77
+MY_PN="LibCST"
 
 inherit cargo distutils-r1
 
@@ -120,7 +120,7 @@ SRC_URI="
 	https://github.com/Instagram/LibCST/archive/${MY_REV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris)
 "
-S="${WORKDIR}/${PN}-${MY_REV}"
+S="${WORKDIR}/${MY_PN}-${MY_REV}"
 
 LICENSE="MIT Apache-2.0 PSF-2 BSD Boost-1.0 Unlicense"
 SLOT="0"
@@ -143,19 +143,11 @@ DEPEND="
 		>=dev-python/setuptools-rust-0.12.1[${PYTHON_USEDEP}]
 	)
 "
-BDEPEND="
-	virtual/rust
-	test? ( dev-python/ufmt[${PYTHON_USEDEP}] )
-"
+BDEPEND="test? ( dev-python/ufmt[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests --install pytest
 
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-src_unpack() {
-	cargo_src_unpack
-	distutils-r1_src_unpack
-}
+export SETUPTOOLS_SCM_PRETEND_VERSION=0.4.3
 
 python_test() {
 	# Requires `/usr/bin/pyre` from https://github.com/facebook/pyre-check