commit 8b272ab420ad23c8319848fe60a3d9ccb9a9d095 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:28:35 2018 +1000 python3-appdirs: update to remove bootstrap code diff --git a/python3-appdirs/.footprint b/python3-appdirs/.footprint index 383e87b33..e065b2cea 100644 --- a/python3-appdirs/.footprint +++ b/python3-appdirs/.footprint @@ -5,9 +5,4 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/ drwxr-xr-x root/root usr/lib/python3.6/site-packages/__pycache__/ -rw-r--r-- root/root usr/lib/python3.6/site-packages/__pycache__/appdirs.cpython-36.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.6/site-packages/__pycache__/appdirs.cpython-36.pyc -drwxr-xr-x root/root usr/lib/python3.6/site-packages/appdirs-1.4.3-py3.6.egg-info/ --rw-r--r-- root/root usr/lib/python3.6/site-packages/appdirs-1.4.3-py3.6.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.6/site-packages/appdirs-1.4.3-py3.6.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/appdirs-1.4.3-py3.6.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.6/site-packages/appdirs-1.4.3-py3.6.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python3.6/site-packages/appdirs.py diff --git a/python3-appdirs/.md5sum b/python3-appdirs/.md5sum index 433fb5d27..c1c16e061 100644 --- a/python3-appdirs/.md5sum +++ b/python3-appdirs/.md5sum @@ -1,2 +1 @@ 44c679904082a2133f5566c8a0d3ab42 appdirs-1.4.3.tar.gz -a73d0534575b904d17913889dce5bd99 get-pip.py diff --git a/python3-appdirs/.signature b/python3-appdirs/.signature index 31ef70a13..0ded6e692 100644 --- a/python3-appdirs/.signature +++ b/python3-appdirs/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WB8RpEG8YzTRFMDifz2vcPq0WpNyplPX0CVB0RNIs6Ezo3IAOGFKU5tiqgf5SaHgF8Pzgc1ERrLbRM7wESeDQE= -SHA256 (Pkgfile) = 6c791630f7ae3ba123655cb0b15eae804b806690be8f29f5b93e9fdb1accf63f -SHA256 (.footprint) = 3e6f5a72d14f9079ef76992f40cc52e33814cf2ca79ec462aafe527e276d0d68 +RWSE3ohX2g5d/SzC7qrU3heAKkGCqArNUDDDB+QckA37hZ7n8oApNWKQZoM380WkX06TZCB1kX2vIjWPF0IbDvnjtN/eWRtfOgU= +SHA256 (Pkgfile) = 840ec0e55eb512660e675591152041e7937f2362077b39aee4fcecb8b6a3781f +SHA256 (.footprint) = 0a8a3b31927a41d7da23c8ac1cc942cba74f5875611b095d6f8d72a33431ca1b SHA256 (appdirs-1.4.3.tar.gz) = 9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python3-appdirs/Pkgfile b/python3-appdirs/Pkgfile index 90dda7441..4ff134808 100644 --- a/python3-appdirs/Pkgfile +++ b/python3-appdirs/Pkgfile @@ -5,33 +5,18 @@ name=python3-appdirs version=1.4.3 -release=1 -source=(https://files.pythonhosted.org/packages/source/${name:8: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:8:1}/${name#*-}/${name#*-}-$version.tar.gz) build() { cd ${name#*-}-$version - if [ "$(pkginfo -i | egrep -c '^python3-(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/python3 $SRC/get-pip.py --root=$SRC/build + /usr/bin/python3 setup.py build - local PYTHONVERSION=$(python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') + /usr/bin/python3 setup.py install \ + --prefix=/usr --root=$PKG --optimize=1 - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python3 setup.py build - - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ - /usr/bin/python3 setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - else - - /usr/bin/python3 setup.py build - - /usr/bin/python3 setup.py install \ - --prefix=/usr --root=$PKG --optimize=1 - fi + # remove sdist metadata, as wheel metadata will be used with python3-pip + find $PKG/usr/lib/python*/site-packages/ -maxdepth 1 -type f \ + -name "${name#*-}-$version-py*.egg-info" -delete }