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