gentoo auto-resync : 22:01:2024 - 16:48:54

3 files changed, 4 insertions, 76 deletions

diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest
index abc3bc42370a..563fd525264c 100644
--- a/dev-python/virtualenvwrapper/Manifest
+++ b/dev-python/virtualenvwrapper/Manifest
@@ -1,8 +1,6 @@
 AUX virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch 905 BLAKE2B e3dc59287d4fa4efe5427c77690853136a3d52abf58ae3f8931755c846f6f81beb5d04338d9a587a1281ef7ef9b99616c95d2c355df3481141a13d843dc4cb79 SHA512 b5827d93420d33767e6931ebb7ab6337baa186848e270eff4bfe2f31d98e550647754c7b466290a8fee666acd8a0f5b4d4a962af8834c43349b448f569ba15d9
 AUX virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch 4608 BLAKE2B 06a808faa7c3fbb96206c59d6c40429800496be41e8b03bf760a199bbb50b1735469094e6cb35504c23a7339d5564329e335b7a563b1df96143e9cf48b9cde43 SHA512 52ed979503f50d53dc849f99f219200e3ec837693612a8723dd7f0cb8bd325573c9bbbefbd162da1390eae9e4e0031079ac9d151cff2232c43fa4aa892bf81f6
 AUX virtualenvwrapper-6.0.0-remove-use-of-which.patch 4163 BLAKE2B 18b55822ef7fdf9da462fa35a0bc9a40ff99617dc0a0df1d29dd93b0ae1ba77c598f5458eb1ccf1f9fb86503e23d332db224fe59acd1af6b692a88bdffd5944f SHA512 e7749734d9a58841eff2019e89d36c5f1c2c8a2138b088584da5eec30cce2ee4e94fdbeae802d6d9d883076863d967eb0096f84b2bbb3180ac7cfa9936945fb7
-DIST virtualenvwrapper-4.8.4_p20230121.gh.tar.gz 72852 BLAKE2B 2996b88f93790587ffbeed936334bb1f12a9d6d952eb7c9b728a6644c9b7c7e0953bc7c71201fbd590f6258eb163af1aa6494f476decfa54f095ca215e4e13e1 SHA512 9df8b20dd8d50fe7891b845c8112edc165b08cc231ebb4010aed8ec50a22005207a9a3c9c9941daa2b958022f0edf993425bf95692f7032d1e5c5719a552d3b4
 DIST virtualenvwrapper-6.0.0.tar.gz 95407 BLAKE2B b2a6a7a58be23e1cf0642d780d8fc53e9aef6e44703fa15a2e7627db3c3e12024b33da75b591897ea5181ed5407eb2d52e96f56d7026c083a03e13f94165d9e4 SHA512 ab805b61a9f81e0b0842182686a88fcf07e41ad7206484f002110c693ca6076e2a88fefbef8b7409838082ed7e7a43f61f1a0006a314cb1d71efb943dc6fdede
-EBUILD virtualenvwrapper-4.8.4_p20230121-r2.ebuild 1888 BLAKE2B 15666b92afe81bfb98db8759cca62e7052a4c67cb7d6e679e20801d3630a719578209218b7bb8a35afc4c8dc8c44e844187e76c917ac9ee859bae6d4d2a05bb9 SHA512 9ea5c3929247bd3d6343ec67205e61d9a214224d35339fed4a2f714688d25d3a952f35178cd66063de167e3f7009d7e82f48af05f0a62b00961ebaa32e71f497
-EBUILD virtualenvwrapper-6.0.0.ebuild 1728 BLAKE2B 4ae29cf6a68d5be6adec2ac00d4c6d2d2df57a14299da2915816eeb7a768989f2a5ad24c5dbb460e30cb602aed43ffb13eadd4a6731d25428c4484ab04c7150d SHA512 d99188cc099ddf68e407047b18b62c2a27c7288ed6ba2dca5d353ce5ff70f6d62f31042e238f17f790562bfd2bb351285e4f04d018c0f91dbdb38e364e9931d5
+EBUILD virtualenvwrapper-6.0.0.ebuild 1795 BLAKE2B 0352ecb5c59f8371c431da8b4fbc665f29b5dd51e6d57befc03695acb071cd750c3a1ddca243d791367ba85f8ab36cc6dc90e0c8131a4057fffe282839c6eefd SHA512 7462480c8f1e79d0526869bfc80936c3a2cc0a7847c89c3bfcbba771aca92ca0bd1f2d0d0fe85c47bd58a410ec9554547f5e2ba2ff51f6a20e8a1c5087e0186b
 MISC metadata.xml 732 BLAKE2B fa857378ea2001e084a9d00d5ccc65644cc4e3ade62c04ff7dfeec4cf7df245bd700833aec1f5f430d780be5adb8fb594300e43a113b232fa83a3cfd2fa0cb15 SHA512 935796e3055e0104328dab877ca92e579770d6748053e464f6ce3563ea49022eaeae322c5c9cb026e9c3f42089c89ae06c0a2e755d124c71e05768cbbefdda44
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild
deleted file mode 100644
index 5a6e6871efc5..000000000000
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool"
-HOMEPAGE="
-	https://github.com/python-virtualenvwrapper/virtualenvwrapper
-	https://pypi.org/project/virtualenvwrapper/
-"
-
-COMMIT="e63d2c389ed276aa161bb50a27c77af94d96a50c"
-SRC_URI="
-	https://github.com/python-virtualenvwrapper/virtualenvwrapper/archive/${COMMIT}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-export PBR_VERSION="${PV/_p/.post}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/stevedore[${PYTHON_USEDEP}]
-		dev-python/virtualenv-clone[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	${RDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pbr[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/virtualenvwrapper-${PV}-remove-use-of-which.patch"
-	"${FILESDIR}/virtualenvwrapper-${PV}-override-default-python-executable.patch"
-)
-
-src_prepare() {
-	default
-
-	# specify default python interpeter to align with PYTHON_SINGLE_TARGET
-	sed -i -e "s:@@GENTOO_PYTHON_EXECUTABLE@@:${PYTHON}:" virtualenvwrapper.sh || die
-
-	# remove tests which require an internet connection
-	rm tests/test_mkvirtualenv_install.sh || die
-	rm tests/test_mkvirtualenv_requirements.sh || die
-
-	# remove tests which require functional git repos with remotes
-	sed -i -e '/test_wipeenv_\(pip_e\|develop\) () {/,/}/ d' tests/test_wipeenv.sh || die
-}
-
-python_test() {
-	# tests have unusual expectations
-	local -x HOME="${HOME%/}"
-	local -x USER="${USER}"
-
-	cp -a "${BUILD_DIR}"/{install/usr,test} || die
-	local -x VIRTUAL_ENV="${BUILD_DIR}/test"
-
-	bash ./tests/run_tests "${VIRTUAL_ENV}" || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
index f94c8c8dcdc2..45e014b5fb7f 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-6.0.0.ebuild
@@ -34,6 +34,9 @@ BDEPEND="
 	')
 	test? (
 		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/pip[${PYTHON_USEDEP}]
+		')
 	)
 "