commit 1d6d6824be78f79dd85a162aefc574cba7e80fd4 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:00:46 2018 +1000 python-appdirs: update to remove bootstrap code diff --git a/python-appdirs/.md5sum b/python-appdirs/.md5sum index 433fb5d27..c1c16e061 100644 --- a/python-appdirs/.md5sum +++ b/python-appdirs/.md5sum @@ -1,2 +1 @@ 44c679904082a2133f5566c8a0d3ab42 appdirs-1.4.3.tar.gz -a73d0534575b904d17913889dce5bd99 get-pip.py diff --git a/python-appdirs/.signature b/python-appdirs/.signature index d8c7f3dca..306e28c60 100644 --- a/python-appdirs/.signature +++ b/python-appdirs/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WCR/CK5f1Zjt82G2ZPGrVmF5FHv9AxqaNXeCdG3UF6BJRwCcxCvpS+hkMZ+k0q2zBnZ1TEcSCupBGIM/lireAY= -SHA256 (Pkgfile) = 4612e4f0b601f8b8578f60750fe4a7d6703b561b864667ffa8fea651227f693f +RWSE3ohX2g5d/fiGYMiLjze4KOB+evinqHjrdSHSJzktVni3h/k8rq3Kh+Uoc99s2Zz7MPpEy/Be/fdsmZDa0IiydrK7AKZPTQ8= +SHA256 (Pkgfile) = 61b860b971effde8edc5baa30d3a0ba8f9b6d3af8235db640520de07ce71b719 SHA256 (.footprint) = fc0d2e763988678ff344c868c12cce7f95d937ec5288663a6681340e293f446c SHA256 (appdirs-1.4.3.tar.gz) = 9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python-appdirs/Pkgfile b/python-appdirs/Pkgfile index cebfb4201..6fc37085a 100644 --- a/python-appdirs/Pkgfile +++ b/python-appdirs/Pkgfile @@ -5,33 +5,18 @@ name=python-appdirs version=1.4.3 -release=1 -source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz - https://crux.ster.zone/downloads/get-pip.py -# https://bootstrap.pypa.io/get-pip.py -) +release=2 +source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz) build() { cd ${name#*-}-$version - if [ "$(pkginfo -i | egrep -c '^python-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then - install -d build - sed -i 's/"--upgrade"/"--upgrade", "--upgrade-strategy", "only-if-needed"/' $SRC/get-pip.py - /usr/bin/python $SRC/get-pip.py --root=$SRC/build + /usr/bin/python setup.py build - local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + /usr/bin/python setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python setup.py build - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - else - - /usr/bin/python setup.py build - - /usr/bin/python setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - fi + # remove sdist metadata, as wheel metadata will be used with python-pip + find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \ + -name "${name#*-}-$version-py*.egg-info" -delete }