diff --git a/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe b/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe index 4288f7992..8dffa05e2 100644 --- a/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe +++ b/dev-python/pyasn1-modules/pyasn1_modules-0.2.8.recipe @@ -5,8 +5,8 @@ data structures (X.509, PKCS etc.)." HOMEPAGE="https://pypi.org/project/pyasn1-modules/" COPYRIGHT="2011-2019 Ilya Etingof " LICENSE="BSD (2-clause)" -REVISION="4" -SOURCE_URI="https://pypi.io/packages/source/p/pyasn1-modules/pyasn1-modules-$portVersion.tar.gz" +REVISION="5" +SOURCE_URI="https://files.pythonhosted.org/packages/source/p/pyasn1-modules/pyasn1-modules-$portVersion.tar.gz" SOURCE_DIR="pyasn1-modules-$portVersion" CHECKSUM_SHA256="905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e" @@ -23,41 +23,44 @@ 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_REQUIRES="$BUILD_REQUIRES - setuptools_$pythonPackage" -BUILD_PREREQUIRES="$BUILD_PREREQUIRES - cmd:python$pythonVersion" +PYTHON_VERSIONS=(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+=" + setuptools_$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 setup.py build install \ --root=/ --prefix=$prefix - packageEntries $pythonPackage \ + packageEntries $pythonPackage \ $prefix/lib/python* done } - -