Date: Friday, October 25, 2019 @ 14:12:16 Author: felixonmars Revision: 365558
remove bootstrap, again Modified: python-setuptools/trunk/PKGBUILD ----------+ PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-25 14:11:54 UTC (rev 365557) +++ PKGBUILD 2019-10-25 14:12:16 UTC (rev 365558) @@ -22,7 +22,7 @@ export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 prepare() { - #rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor} + rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor} # Upstream devendoring logic is badly broken, see: # https://bugs.archlinux.org/task/58670 @@ -30,14 +30,14 @@ # https://github.com/pypa/setuptools/issues/1383 # The simplest fix is to simply rewrite import paths to use the canonical # location in the first place - #for _module in setuptools pkg_resources '' ; do - # find setuptools-$pkgver -name \*.py -exec sed -i \ - # -e 's/from '$_module.extern' import/import/' \ - # -e 's/from '$_module.extern'./from /' \ - # -e 's/import '$_module.extern'./import /' \ - # -e "s/__import__('$_module.extern./__import__('/" \ - # {} + - # done + for _module in setuptools pkg_resources '' ; do + find setuptools-$pkgver -name \*.py -exec sed -i \ + -e 's/from '$_module.extern' import/import/' \ + -e 's/from '$_module.extern'./from /' \ + -e 's/import '$_module.extern'./import /' \ + -e "s/__import__('$_module.extern./__import__('/" \ + {} + + done # Remove post-release tag since we are using stable tags sed -e '/tag_build = .post/d' \