[arch-commits] Commit in python2-setuptools/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, August 17, 2022 @ 13:16:48
  Author: felixonmars
Revision: 453030

upgpkg: python2-setuptools 2:44.1.1-2: drop devendoring as they all rely on obsolete old versions. there is little point to maintain more separated python2 version of unmaintained packages

Modified:
  python2-setuptools/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-17 13:12:00 UTC (rev 453029)
+++ PKGBUILD	2022-08-17 13:16:48 UTC (rev 453030)
@@ -4,13 +4,13 @@
 
 pkgname=python2-setuptools
 pkgver=44.1.1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
 arch=('any')
 license=('PSF')
 url="https://pypi.org/project/setuptools/"
-depends=('python2-appdirs' 'python2-packaging' 'python2-ordered-set')
+depends=('python2')
 makedepends=('git')
 provides=('python2-distribute')
 replaces=('python2-distribute')
@@ -20,23 +20,6 @@
 export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
 
 prepare() {
-  rm -r setuptools-$pkgver/{pkg_resources,setuptools}/{extern,_vendor}
-
-  # Upstream devendoring logic is badly broken, see:
-  # https://bugs.archlinux.org/task/58670
-  # https://github.com/pypa/pip/issues/5429
-  # 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
-
   # Remove post-release tag since we are using stable tags
   sed -e '/tag_build = .post/d' \
       -e '/tag_date = 1/d' \