From 8efc138d987aa07f2b89a32ffef59ce2c75f132c Mon Sep 17 00:00:00 2001 From: Crestwave <35413013+Crestwave@users.noreply.github.com> Date: Sat, 26 Jan 2019 10:29:26 +0000 Subject: [PATCH] nose: move patching to PATCH() (#3570) --- dev-python/nose/nose-1.3.7.recipe | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dev-python/nose/nose-1.3.7.recipe b/dev-python/nose/nose-1.3.7.recipe index d96b25b19..190eb49b2 100644 --- a/dev-python/nose/nose-1.3.7.recipe +++ b/dev-python/nose/nose-1.3.7.recipe @@ -46,7 +46,7 @@ PYTHON_PACKAGES=(python python3) PYTHON_VERSIONS=(2.7 3.6) for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} - pythonVersion=${PYTHON_VERSIONS[$i]} + pythonVersion=${PYTHON_VERSIONS[i]} eval "PROVIDES_$pythonPackage=\" nose_$pythonPackage = $portVersion cmd:nosetests_$pythonVersion @@ -57,11 +57,16 @@ for i in "${!PYTHON_PACKAGES[@]}"; do \"" done +PATCH() +{ + sed -i "s|man/|$relativeManDir/|" setup.py +} + BUILD() { for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} - pythonVersion=${PYTHON_VERSIONS[$i]} + pythonVersion=${PYTHON_VERSIONS[i]} rm -rf "$sourceDir"-$pythonPackage cp -a "$sourceDir" "$sourceDir"-$pythonPackage @@ -76,12 +81,9 @@ INSTALL() { for i in "${!PYTHON_PACKAGES[@]}"; do pythonPackage=${PYTHON_PACKAGES[i]} - pythonVersion=${PYTHON_VERSIONS[$i]} + pythonVersion=${PYTHON_VERSIONS[i]} cd "$sourceDir"-$pythonPackage - sed -i \ - -e "/data_files =/ s|'man/|'$relativeManDir/|" \ - setup.py python=python$pythonVersion installLocation=$prefix/lib/$python/vendor-packages