diff --git a/python-pyparsing/Pkgfile b/python-pyparsing/Pkgfile index 22201b34e..a851141e3 100644 --- a/python-pyparsing/Pkgfile +++ b/python-pyparsing/Pkgfile @@ -5,19 +5,20 @@ name=python-pyparsing version=2.1.10 -release=2 -source=(https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$name-$version.tar.gz +release=3 +source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz https://bootstrap.pypa.io/get-pip.py) build() { cd ${name#*-}-$version + local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') + if [ "$(pkginfo -i | egrep -c '^python-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then + install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build - local PYTHONVERSION=$(/usr/bin/python -c 'import sys; print("%s.%s" % sys.version_info[:2])') - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python setup.py build diff --git a/python3-pyparsing/Pkgfile b/python3-pyparsing/Pkgfile index c1fff76d5..8ffd381d5 100644 --- a/python3-pyparsing/Pkgfile +++ b/python3-pyparsing/Pkgfile @@ -5,19 +5,19 @@ name=python3-pyparsing version=2.1.10 -release=2 +release=3 source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz https://bootstrap.pypa.io/get-pip.py) build() { cd ${name#*-}-$version + local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') + if [ "$(pkginfo -i | egrep -c '^python3-(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python3 $SRC/get-pip.py --root=$SRC/build - local PYTHONVERSION=$(/usr/bin/python3 -c 'import sys; print("%s.%s" % sys.version_info[:2])') - PYTHONPATH=$SRC/build/usr/lib/python$PYTHONVERSION/site-packages \ /usr/bin/python3 setup.py build diff --git a/qt5/Pkgfile b/qt5/Pkgfile index 29afc3f23..8ea5b89c2 100644 --- a/qt5/Pkgfile +++ b/qt5/Pkgfile @@ -52,7 +52,6 @@ build() { -sysconfdir /usr/etc/xdg \ -confirm-license \ -dbus-linked \ - -no-cups \ -no-egl \ -nomake examples \ -no-pch \