commit c71d762993c2d62d90376fd64b543a57414decb3 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Feb 4 11:38:30 2017 +1100 setuptools: make all the dependencies bootstrap if not all are previously installed diff --git a/appdirs/Pkgfile b/appdirs/Pkgfile index 840f661..c3c79a7 100644 --- a/appdirs/Pkgfile +++ b/appdirs/Pkgfile @@ -1,7 +1,6 @@ # Description: A Python module for determining appropriate platform-specific dirs. # URL: https://pypi.python.org/pypi/packaging/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me # Depends on: python name=appdirs @@ -13,7 +12,7 @@ source=(https://pypi.python.org/packages/bd/66/0a7f48a0f3fb1d3a4072bceb5bbd78b1a build() { cd $name-$version - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build diff --git a/packaging/Pkgfile b/packaging/Pkgfile index ba608aa..b339b0f 100644 --- a/packaging/Pkgfile +++ b/packaging/Pkgfile @@ -1,7 +1,6 @@ # Description: Core utilities for Python packages. # URL: https://pypi.python.org/pypi/packaging/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me # Depends on: pyparsing six name=packaging @@ -13,7 +12,7 @@ source=(https://pypi.python.org/packages/c6/70/bb32913de251017e266c5114d0a645f26 build() { cd $name-$version - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build diff --git a/pip/Pkgfile b/pip/Pkgfile index ff95409..f95b80a 100644 --- a/pip/Pkgfile +++ b/pip/Pkgfile @@ -1,19 +1,18 @@ -# Description: A tool for installing and managing Python packages -# URL: http://www.pip-installer.org/ -# Maintainer: Thomas Penteker, tek at serverop dot de -# Packager: James Mills, prologic at shortcircuit dot net dot au -# Depends on: python +# Description: A tool for installing and managing Python packages. +# URL: https://www.pip-installer.org/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: python name=pip version=9.0.1 release=2 -source=(https://pypi.io/packages/source/p/pip/pip-${version}.tar.gz +source=(https://pypi.io/packages/source/p/pip/pip-$version.tar.gz https://bootstrap.pypa.io/get-pip.py) build() { cd $name-$version - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build diff --git a/pyparsing/Pkgfile b/pyparsing/Pkgfile index 9b59a50..998c660 100644 --- a/pyparsing/Pkgfile +++ b/pyparsing/Pkgfile @@ -1,7 +1,7 @@ -# Description: Python parsing module -# URL: https://pypi.python.org/pypi/pyparsing -# Maintainer: Thomas Penteker, tek at serverop dot de -# Depends on: python +# Description: Python parsing module. +# URL: https://pypi.python.org/pypi/pyparsing/ +# Maintainer: Danny Rawlins, crux at romster dot me +# Depends on: python name=pyparsing version=2.1.10 @@ -12,7 +12,7 @@ source=(https://pypi.python.org/packages/38/bb/bf325351dd8ab6eb3c3b7c07c3978f38b build() { cd $name-$version - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build diff --git a/setuptools/Pkgfile b/setuptools/Pkgfile index 1553a72..67bc26a 100644 --- a/setuptools/Pkgfile +++ b/setuptools/Pkgfile @@ -1,7 +1,6 @@ # Description: Easily download, build, install, upgrade, and uninstall Python packages. -# URL: http://pypi.python.org/pypi/setuptools +# URL: https://pypi.python.org/pypi/setuptools # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me # Depends on: appdirs packaging pip name=setuptools @@ -16,7 +15,7 @@ build() { export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build diff --git a/six/Pkgfile b/six/Pkgfile index 488191c..a1627e0 100644 --- a/six/Pkgfile +++ b/six/Pkgfile @@ -1,7 +1,6 @@ -# Description: Python compatibility utilities. +# Description: Python 2 and 3 compatibility utilities. # URL: https://pypi.python.org/pypi/six/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me # Depends on: python name=six @@ -13,7 +12,7 @@ source=(https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb269 build() { cd $name-$version - if [ -z "$(pkginfo -i | egrep '^setuptools ')" ]; then + if [ "$(pkginfo -i | egrep -c '^(setuptools|appdirs|pyparsing|six|pip|packaging) ')" != 6 ]; then install -d build /usr/bin/python $SRC/get-pip.py --root=$SRC/build