From 03637760d8c82761622b2c4f5089e21c892d4dbf Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 14 Apr 2016 22:35:09 +0000 Subject: [PATCH] python_pillow: bump version. --- .../{pillow-3.1.1.recipe => pillow-3.2.0.recipe} | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename dev-python/pillow/{pillow-3.1.1.recipe => pillow-3.2.0.recipe} (84%) diff --git a/dev-python/pillow/pillow-3.1.1.recipe b/dev-python/pillow/pillow-3.2.0.recipe similarity index 84% rename from dev-python/pillow/pillow-3.1.1.recipe rename to dev-python/pillow/pillow-3.2.0.recipe index 883c486ed..efa2563bf 100644 --- a/dev-python/pillow/pillow-3.1.1.recipe +++ b/dev-python/pillow/pillow-3.2.0.recipe @@ -8,8 +8,8 @@ COPYRIGHT="1997-2011 by Secret Labs AB 1995-2011 by Fredrik Lundh" LICENSE="HPND" REVISION="1" -SOURCE_URI="https://pypi.python.org/packages/source/P/Pillow/Pillow-3.1.1.tar.gz" -CHECKSUM_SHA256="486f4ccddee09429cb1c63ea56c02894aecf9d69acdcaf006c53835df2549fff" +SOURCE_URI="https://pypi.python.org/packages/source/P/Pillow/Pillow-$portVersion.tar.gz" +CHECKSUM_SHA256="64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a" SOURCE_DIR="Pillow-$portVersion" ARCHITECTURES="x86 x86_gcc2 x86_64" @@ -32,7 +32,7 @@ PROVIDES=" " REQUIRES=" haiku - cmd:python + cmd:python2 #python_setuptools lib:libfreetype lib:libjpeg @@ -56,7 +56,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:gcc cmd:ld - cmd:python + cmd:python2 cmd:freetype_config " @@ -64,7 +64,7 @@ BUILD() { export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)" export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)" - $portPackageLinksDir/cmd~python/bin/python setup.py build + $portPackageLinksDir/cmd~python2/bin/python2 setup.py build } INSTALL() @@ -72,13 +72,13 @@ INSTALL() export INCLUDE="$(findpaths -c: B_FIND_PATH_HEADERS_DIRECTORY)" export LIB="$(findpaths -c: B_FIND_PATH_DEVELOP_LIB_DIRECTORY)" # GENERIC: all python_setuptools-based installs need this - export PATH="$portPackageLinksDir/cmd~python/bin:$PATH" - pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3) + export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH" + pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$PYTHONPATH mkdir -p $installLocation - python setup.py install \ + python2 setup.py install \ --single-version-externally-managed \ --root=/ --prefix=$prefix }