diff --git a/dev-python/pbr/pbr-5.1.1.recipe b/dev-python/pbr/pbr-5.4.3.recipe similarity index 83% rename from dev-python/pbr/pbr-5.1.1.recipe rename to dev-python/pbr/pbr-5.4.3.recipe index ebfab2eee..c434f8e8c 100644 --- a/dev-python/pbr/pbr-5.1.1.recipe +++ b/dev-python/pbr/pbr-5.4.3.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2013-2018 OpenStack Contributors" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://files.pythonhosted.org/packages/source/p/pbr/pbr-$portVersion.tar.gz" -CHECKSUM_SHA256="f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68" +CHECKSUM_SHA256="2c8e420cd4ed4cec4e7999ee47409e876af575d4c35a45840d59e8b5f3155ab8" ARCHITECTURES="any" @@ -25,16 +25,10 @@ REQUIRES=" BUILD_REQUIRES=" haiku_devel - setuptools_python - setuptools_python3 - " -BUILD_PREREQUIRES=" - cmd:python - cmd:python3 " -PYTHON_PACKAGES=(python python3) -PYTHON_VERSIONS=(2.7 3.6) +PYTHON_PACKAGES=(python python36 python3) +PYTHON_VERSIONS=(2.7 3.6 3.7) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} pythonVersion=${PYTHON_VERSIONS[$i]} @@ -45,10 +39,17 @@ for i in "${!PYTHON_PACKAGES[@]}"; do haiku cmd:python$pythonVersion \"" +BUILD_REQUIRES="$BUILD_REQUIRES + setuptools_$pythonPackage" +BUILD_PREREQUIRES="$BUILD_PREREQUIRES + cmd:python$pythonVersion" done PROVIDES_python+=" cmd:pbr2 " +PROVIDES_python36+=" + cmd:pbr36 + " PROVIDES_python3+=" cmd:pbr " @@ -86,6 +87,9 @@ INSTALL() if [ "$pythonPackage" = python ]; then mv "$binDir"/pbr "$binDir"/pbr2 fi + if [ "$pythonPackage" = python36 ]; then + mv "$binDir"/pbr "$binDir"/pbr36 + fi packageEntries $pythonPackage \ "$binDir" \