diff --git a/dev-python/lxml/patches/python_lxml-3.3.5.patchset b/dev-python/lxml/patches/python_lxml-3.6.0.patchset similarity index 100% rename from dev-python/lxml/patches/python_lxml-3.3.5.patchset rename to dev-python/lxml/patches/python_lxml-3.6.0.patchset diff --git a/dev-python/lxml/python_lxml-3.3.5.recipe b/dev-python/lxml/python_lxml-3.6.0.recipe similarity index 76% rename from dev-python/lxml/python_lxml-3.3.5.recipe rename to dev-python/lxml/python_lxml-3.6.0.recipe index 6d6c97fe6..d63f405f2 100644 --- a/dev-python/lxml/python_lxml-3.3.5.recipe +++ b/dev-python/lxml/python_lxml-3.6.0.recipe @@ -10,11 +10,11 @@ COPYRIGHT="2003-2010 Gustavo Niemeyer" #FIXME: check exact license #gentoo says: LICENSE="BSD ElementTree GPL-2 PSF-2" LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://lxml.de/files/lxml-3.3.5.tgz" -CHECKSUM_SHA256="6ad6949dc7eea744a30fba77a968dd5910f545220e58bcc813b9df5c793e318a" +REVISION="1" +SOURCE_URI="http://lxml.de/files/lxml-$portVersion.tgz" +CHECKSUM_SHA256="9c74ca28a7f0c30dca8872281b3c47705e21217c8bc63912d95c9e2a7cac6bdf" SOURCE_DIR="lxml-$portVersion" -PATCHES="python_lxml-3.3.5.patchset" +PATCHES="python_lxml-$portVersion.patchset" ARCHITECTURES="x86 x86_gcc2 x86_64" @@ -26,8 +26,7 @@ REQUIRES=" lib:libxml2$secondaryArchSuffix lib:libxslt$secondaryArchSuffix lib:libz$secondaryArchSuffix - cmd:python - python_setuptools + cmd:python2 " BUILD_REQUIRES=" @@ -38,26 +37,26 @@ BUILD_REQUIRES=" python_setuptools " BUILD_PREREQUIRES=" - cmd:python + cmd:python2 cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix " BUILD() { - $portPackageLinksDir/cmd~python/bin/python setup.py build + $portPackageLinksDir/cmd~python2/bin/python2 setup.py build } INSTALL() { # 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 }