commit: 6b5cc781fd30d0135530115bbd5adf7256d644f1 Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com> AuthorDate: Mon Jan 17 14:26:34 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 18 12:34:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5cc781
dev-python/pipenv: retain tomlkit in v2022.1.8 Bug: https://bugs.gentoo.org/831101 Bug: https://bugs.gentoo.org/717666 Signed-off-by: Oz N Tiram <oz.tiram <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23840 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-python/pipenv/pipenv-2022.1.8.ebuild | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-python/pipenv/pipenv-2022.1.8.ebuild b/dev-python/pipenv/pipenv-2022.1.8.ebuild index ed11a603ff9d..0f6ae16fc22d 100644 --- a/dev-python/pipenv/pipenv-2022.1.8.ebuild +++ b/dev-python/pipenv/pipenv-2022.1.8.ebuild @@ -81,9 +81,12 @@ src_prepare() { # remove vendored versions for pkgName in ${packages[@]}; do - find ./pipenv/vendor/ -name "${pkgName}*" -prune -exec rm -rvf {} + || die - # package names can be foo-bar, their module will be however foo_bar - find ./pipenv/vendor/ -name "${pkgName/_/-}*" -prune -exec rm -rvf {} + || die + # remove all packages toml* also catches tomlkit. Remove this when tomlkit is stable + find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -prune -exec rm -rvf {} + || die + # find ./pipenv/vendor -maxdepth 1 ! -name tomlkit -name "${pkgName}*" -print + + # package names can be foo-bar, their module will be however foo_bar + find ./pipenv/vendor/ -maxdepth 1 ! -name tomlkit -name "${pkgName/_/-}*" -prune -exec rm -rvf {} + || die done
