diff --git a/dev-python/cppy/cppy-1.2.1.recipe b/dev-python/cppy/cppy-1.2.1.recipe index 0220d1912..03e676ee1 100644 --- a/dev-python/cppy/cppy-1.2.1.recipe +++ b/dev-python/cppy/cppy-1.2.1.recipe @@ -5,9 +5,8 @@ DESCRIPTION="A small C++ header library which makes it easier to write Python ex HOMEPAGE="https://github.com/nucleic/cppy/" COPYRIGHT="2014-2022, Nucleic Development Team" LICENSE="BSD (3-clause)" -REVISION="2" -pypiVersion="31/5e/b8faf2b2aeb679c0f4359fd1a4716fe90d65f72f72639413ffb95f3c3b46" -SOURCE_URI="https://files.pythonhosted.org/packages/$pypiVersion/$portName-$portVersion-py3-none-any.whl#noarchive" +REVISION="3" +SOURCE_URI="https://files.pythonhosted.org/packages/py3/${portName:0:1}/$portName/$portName-$portVersion-py3-none-any.whl#noarchive" CHECKSUM_SHA256='c5b5eac3d3f42593a07d35275b0bc27f447b76b9ad8f27c62e3cfa286dc1988a' ARCHITECTURES="any" @@ -23,37 +22,38 @@ BUILD_REQUIRES=" haiku_devel " -PYTHON_PACKAGES=(python39 python310) -PYTHON_VERSIONS=(3.9 3.10) -for i in "${!PYTHON_PACKAGES[@]}"; do -pythonPackage=${PYTHON_PACKAGES[i]} -pythonVersion=${PYTHON_VERSIONS[$i]} -eval "PROVIDES_${pythonPackage}=\"\ - ${portName}_$pythonPackage = $portVersion\ - \"; \ -REQUIRES_$pythonPackage=\"\ - haiku\n\ - cmd:python$pythonVersion\ - \"" -BUILD_PREREQUIRES="$BUILD_PREREQUIRES - installer_$pythonPackage - cmd:python$pythonVersion" +PYTHON_VERSIONS=(3.10) +defaultVersion=3.10 + +for pythonVersion in ${PYTHON_VERSIONS[@]}; do + pythonPackage=python${pythonVersion//.} + + eval "PROVIDES_${pythonPackage}=\" + ${portName}_$pythonPackage = $portVersion + \"" + eval "REQUIRES_$pythonPackage=\" + haiku + cmd:python$pythonVersion + \"" + + BUILD_REQUIRES+=" + installer_$pythonPackage + " + BUILD_PREREQUIRES+=" + cmd:python$pythonVersion + " done INSTALL() { - for i in "${!PYTHON_PACKAGES[@]}"; do - pythonPackage=${PYTHON_PACKAGES[i]} - pythonVersion=${PYTHON_VERSIONS[$i]} + for pythonVersion in ${PYTHON_VERSIONS[@]}; do + pythonPackage=python${pythonVersion//.} python=python$pythonVersion - installLocation=$prefix/lib/$python/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - rm -rf build + $python -m installer -p $prefix $portName-$portVersion-py3-none-any.whl - packageEntries $pythonPackage \ + packageEntries $pythonPackage \ $prefix/lib/python* done }