diff --git a/dev-python/setuptools/setuptools-42.0.0.recipe b/dev-python/setuptools/setuptools-57.4.0.recipe similarity index 75% rename from dev-python/setuptools/setuptools-42.0.0.recipe rename to dev-python/setuptools/setuptools-57.4.0.recipe index 0a1854abb..02aaff61e 100644 --- a/dev-python/setuptools/setuptools-42.0.0.recipe +++ b/dev-python/setuptools/setuptools-57.4.0.recipe @@ -6,10 +6,10 @@ Perl and PHP, respectively." HOMEPAGE="https://pypi.python.org/pypi/setuptools" COPYRIGHT="2006-2019 Python Packaging Authority" LICENSE="Python" -REVISION="4" +REVISION="1" SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" SOURCE_FILENAME="setuptools-$portVersion.tar.gz" -CHECKSUM_SHA256="c60bd4cbb2a963c73993951ff4ec7ef0044015c3ffd42e573f6c4e615d1c7cf8" +CHECKSUM_SHA256="e418aa710ab3205c24235e34af8ad6544ffb7d1011cf6896bda0229a20977b39" ARCHITECTURES="any" @@ -27,8 +27,8 @@ BUILD_PREREQUIRES=" cmd:sed " -PYTHON_PACKAGES=(python python3 python38 python39) -PYTHON_VERSIONS=(2.7 3.7 3.8 3.9) +PYTHON_PACKAGES=(python3 python38 python39 python310) +PYTHON_VERSIONS=(3.7 3.8 3.9 3.10) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} @@ -44,16 +44,6 @@ BUILD_PREREQUIRES="$BUILD_PREREQUIRES cmd:python$pythonVersion" done -PROVIDES_python="$PROVIDES_python - cmd:easy_install - " -REPLACES_python=" - python_setuptools - " -REPLACES_python3=" - python3_setuptools - " - BUILD() { rm -rf build* @@ -62,11 +52,11 @@ BUILD() pythonVersion=${PYTHON_VERSIONS[$i]} # GENERIC: all python_setuptools-based installs need this python=$portPackageLinksDir/cmd~python$pythonVersion/bin/python$pythonVersion - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + pythonVersion=$($python --version 2>&1) | sed -e 's/Python \(.*\)\..*/\1/' installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - $python bootstrap.py $python setup.py build + mkdir build/scripts-$pythonVersion mv build build$pythonVersion done } @@ -86,13 +76,8 @@ INSTALL() $python setup.py install \ --root=/ --prefix=$prefix --skip-build - sed -i -e "s|^#\!.*/usr/bin/env python|#!/bin/env python$pythonVersion|" $binDir/easy_install* - if [ $pythonPackage != python ]; then - rm $binDir/easy_install - fi - packageEntries $pythonPackage \ - $prefix/lib/python* \ - $binDir + $prefix/lib/python* + mv build build$pythonVersion done } diff --git a/dev-python/setuptools/setuptools_python-42.0.0.recipe b/dev-python/setuptools/setuptools_python-42.0.0.recipe new file mode 100644 index 000000000..4f98a5bfe --- /dev/null +++ b/dev-python/setuptools/setuptools_python-42.0.0.recipe @@ -0,0 +1,63 @@ +SUMMARY="Download, build, install, upgrade, and uninstall Python packages" +DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \ +to install packages remotely by connecting to the cheeseshop or even other \ +websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \ +Perl and PHP, respectively." +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +COPYRIGHT="2006-2019 Python Packaging Authority" +LICENSE="Python" +REVISION="5" +SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz" +SOURCE_FILENAME="setuptools-$portVersion.tar.gz" +CHECKSUM_SHA256="c60bd4cbb2a963c73993951ff4ec7ef0044015c3ffd42e573f6c4e615d1c7cf8" +SOURCE_DIR="setuptools-$portVersion" + +ARCHITECTURES="any" + +PROVIDES=" + $portName = $portVersion + cmd:easy_install + cmd:easy_install_2.7 + " +REQUIRES=" + haiku + cmd:python2.7 + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + cmd:python2.7 + cmd:sed + " + +BUILD() +{ + rm -rf build + pythonPackage=python + pythonVersion=2.7 + # GENERIC: all python_setuptools-based installs need this + python=$portPackageLinksDir/cmd~python$pythonVersion/bin/python$pythonVersion + pythonVersion=$($python --version 2>&1) | sed -e 's/Python \(.*\)\..*/\1/' + installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ + + $python bootstrap.py + $python setup.py build +} + +INSTALL() +{ + pythonPackage=python + pythonVersion=2.7 + + python=python$pythonVersion + installLocation=$prefix/lib/$python/vendor-packages/ + export PYTHONPATH=$installLocation:$PYTHONPATH + mkdir -p $installLocation + + $python setup.py install \ + --root=/ --prefix=$prefix --skip-build + + sed -i -e "s|^#\!.*/usr/bin/env python|#!/bin/env python$pythonVersion|" $binDir/easy_install* +}