commit ed92e14a49b35d39aa2bce498f92948d54bea8d3 Author: Danny Rawlins <monster.romster@gmail.com> Date: Mon Jul 2 07:03:01 2018 +1000 python-pyparsing: update to remove bootstrap code diff --git a/python-pyparsing/.footprint b/python-pyparsing/.footprint index 1f25b7561..f764381b6 100644 --- a/python-pyparsing/.footprint +++ b/python-pyparsing/.footprint @@ -2,11 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing-2.2.0-py2.7.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/pyparsing.pyo diff --git a/python-pyparsing/.md5sum b/python-pyparsing/.md5sum index 86fd73855..7d40b92a0 100644 --- a/python-pyparsing/.md5sum +++ b/python-pyparsing/.md5sum @@ -1,2 +1 @@ -a73d0534575b904d17913889dce5bd99 get-pip.py 0214e42d63af850256962b6744c948d9 pyparsing-2.2.0.tar.gz diff --git a/python-pyparsing/.signature b/python-pyparsing/.signature index a246990fa..6ab1a7496 100644 --- a/python-pyparsing/.signature +++ b/python-pyparsing/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SdZhBzWeDaUszUoqaHJ69mXG6SURU+e5nfopjMYM9bPJipIMReq+PAPH9SxqiZaz7yY6Czqx+aySYjmyYvedw4= -SHA256 (Pkgfile) = dd4d75444b0895daa8d5687b46da9d0c72db17ebde625225f511502dff03b738 -SHA256 (.footprint) = 1bf4affb3742bf2ce7be604d4d516b9c703cbe13711602eb0d64e018b54cecc1 +RWSE3ohX2g5d/anDIcIZFZQX7tidRejw8fRYVzUXRytY0Rp+uA5E+Iz4CkcsgM1NtyNxJMtmuCK8hhFJpHzMk3R3gsJicf/RrAs= +SHA256 (Pkgfile) = b2c0fabd315f9b22950368762e2f3e759b7dde20dd26e75f462c0afe7fe46a42 +SHA256 (.footprint) = 2bd7a4a57961df53436ef49f6e09f9d216c15e9f2801f82e37d610f3d05fb56b SHA256 (pyparsing-2.2.0.tar.gz) = 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 -SHA256 (get-pip.py) = c21805790f7fa317f09798303281e33f9559096123f713e90a22567c88d28d40 diff --git a/python-pyparsing/Pkgfile b/python-pyparsing/Pkgfile index c2e7a087d..8e87553de 100644 --- a/python-pyparsing/Pkgfile +++ b/python-pyparsing/Pkgfile @@ -5,35 +5,20 @@ name=python-pyparsing version=2.2.0 -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 + find $PKG/usr/lib/python*/site-packages -type f -exec chmod go-w {} + - 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 - - local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') - find $PKG/usr/lib/python$PYTHONVERSION/site-packages -type f -exec chmod go-w {} + + # 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 }