From 0fe18cf339fba9dc04b1e292681f258bb1143db9 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Fri, 9 Jan 2015 01:42:15 +0100 Subject: [PATCH] python-Pillow: update to 2.6.2 --- srcpkgs/python-Pillow/template | 137 ++++++++++++++++----------------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template index 1808b3ed3df..329e927a6ef 100644 --- a/srcpkgs/python-Pillow/template +++ b/srcpkgs/python-Pillow/template @@ -1,6 +1,6 @@ # Template file for 'python-Pillow' pkgname=python-Pillow -version=2.6.1 +version=2.6.2 revision=1 wrksrc="Pillow-${version}" python_versions="2.7 3.4" @@ -12,138 +12,137 @@ makedepends=" replaces="python-imaging>=0" pycompile_module="PIL" short_desc="Python Imaging Library (PIL) fork (Python2)" +_short_desc="${short_desc/Python2/Python3.4}" maintainer="Alessio Sergi " homepage="https://python-pillow.github.io/" license="PIL" distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.zip" -checksum=96bdd40714daf326d01c6286591b5dfe60336c23b7a6bf8e048bcc339513a414 +checksum=0652825265de91cdf0c7917d14428f35484492de8a4ca7436c0f5d553d4efc33 +nocross=yes post_extract() { sed -i '/^#!\//,1d' PIL/OleFileIO.py - cp -a ${wrksrc} /tmp/python2.7-build - cp -a ${wrksrc} /tmp/python3.4-build - mv /tmp/python{2.7,3.4}-build ${wrksrc} + cp -a ${wrksrc} /tmp/Pillow-2.7 + cp -a ${wrksrc} /tmp/Pillow-3.4 + mv /tmp/Pillow-{2.7,3.4} ${wrksrc} } - do_build() { - cd ${wrksrc}/python2.7-build + cd ${wrksrc}/Pillow-2.7 python setup.py build cd Sane python setup.py build - cd ${wrksrc}/python3.4-build + cd ${wrksrc}/Pillow-3.4 python3.4 setup.py build cd Sane python3.4 setup.py build } - pre_install() { for file in convert driver file font print; do - mv python2.7-build/build/scripts-2.7/pil${file}{.py,} - mv python3.4-build/build/scripts-3.4/pil${file}{.py,3} + mv Pillow-2.7/build/scripts-2.7/pil${file}{.py,} + mv Pillow-3.4/build/scripts-3.4/pil${file}{.py,3} done } - do_install() { - cd ${wrksrc}/python2.7-build + cd ${wrksrc}/Pillow-2.7 python setup.py install --root=${DESTDIR} cd Sane python setup.py install --root=${DESTDIR} - cd ${wrksrc}/python3.4-build + cd ${wrksrc}/Pillow-3.4 python3.4 setup.py install --root=${DESTDIR} cd Sane python3.4 setup.py install --root=${DESTDIR} } - post_install() { rm ${DESTDIR}/usr/bin/*.py vlicense docs/LICENSE } -python3.4-Pillow_package() { - pycompile_version="3.4" - pycompile_module="PIL" - short_desc="${short_desc/Python2/Python3.4}" - pkg_install() { - vmove usr/bin/*3 - vmove usr/lib/python3.4 - vlicense ${wrksrc}/docs/LICENSE - } -} - python-Pillow-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - cd ${wrksrc}/python2.7-build + cd ${wrksrc}/Pillow-2.7 vmkdir usr/include/python2.7/Imaging vcopy libImaging/*.h usr/include/python2.7/Imaging } } - -python3.4-Pillow-devel_package() { - depends="python3.4-Pillow>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - cd ${wrksrc}/python3.4-build - vmkdir usr/include/python3.4/Imaging - vcopy libImaging/*.h usr/include/python3.4/Imaging - } -} - python-Pillow-qt_package() { depends="${sourcepkg}>=${version}_${revision} python-PyQt4" short_desc+=" - Qt interface" + pycompile_module="PIL" pkg_install() { vmove usr/lib/python2.7/site-packages/PIL/ImageQt.py } } - -python3.4-Pillow-qt_package() { - depends="python3.4-Pillow>=${version}_${revision} python3.4-PyQt4" - short_desc+=" - Qt interface" - pkg_install() { - vmove usr/lib/python3.4/site-packages/PIL/ImageQt.py - } -} - -python-Pillow-sane_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - Sane interface" - pkg_install() { - vmove usr/lib/python2.7/site-packages/sane.py - vmove usr/lib/python2.7/site-packages/pysane-2.0-py2.7.egg-info - vmove usr/lib/python2.7/site-packages/_sane.so - } -} - -python3.4-Pillow-sane_package() { - depends="python3.4-Pillow>=${version}_${revision}" - short_desc+=" - Sane interface" - pkg_install() { - vmove usr/lib/python3.4/site-packages/sane.py - vmove usr/lib/python3.4/site-packages/pysane-2.0-py3.4.egg-info - vmove usr/lib/python3.4/site-packages/_sane.cpython-34m.so - } -} - python-Pillow-tk_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - Tk interface" + pycompile_module="PIL" pkg_install() { vmove usr/lib/python2.7/site-packages/PIL/ImageTk.py vmove usr/lib/python2.7/site-packages/PIL/SpiderImagePlugin.py vmove usr/lib/python2.7/site-packages/PIL/_imagingtk.so } } - +python-Pillow-sane_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - Sane interface" + pycompile_module="sane.py" + pkg_install() { + vmove usr/lib/python2.7/site-packages/sane.py + vmove usr/lib/python2.7/site-packages/pysane-2.0-py2.7.egg-info + vmove usr/lib/python2.7/site-packages/_sane.so + } +} +python3.4-Pillow_package() { + short_desc="${_short_desc}" + pycompile_version="3.4" + pycompile_module="PIL" + pkg_install() { + vmove usr/bin/*3 + vmove usr/lib/python3.4 + vlicense ${wrksrc}/docs/LICENSE + } +} +python3.4-Pillow-devel_package() { + depends="python3.4-Pillow>=${version}_${revision}" + short_desc="${_short_desc} - development files" + pkg_install() { + cd ${wrksrc}/Pillow-3.4 + vmkdir usr/include/python3.4/Imaging + vcopy libImaging/*.h usr/include/python3.4/Imaging + } +} +python3.4-Pillow-qt_package() { + depends="python3.4-Pillow>=${version}_${revision} python3.4-PyQt4" + short_desc="${_short_desc} - Qt interface" + pycompile_version="3.4" + pycompile_module="PIL" + pkg_install() { + vmove usr/lib/python3.4/site-packages/PIL/ImageQt.py + } +} python3.4-Pillow-tk_package() { depends="python3.4-Pillow>=${version}_${revision}" - short_desc+=" - Tk interface" + short_desc="${_short_desc} - Tk interface" + pycompile_version="3.4" + pycompile_module="PIL" pkg_install() { vmove usr/lib/python3.4/site-packages/PIL/ImageTk.py vmove usr/lib/python3.4/site-packages/PIL/SpiderImagePlugin.py vmove usr/lib/python3.4/site-packages/PIL/_imagingtk.cpython-34m.so } } +python3.4-Pillow-sane_package() { + depends="python3.4-Pillow>=${version}_${revision}" + short_desc="${_short_desc} - Sane interface" + pycompile_version="3.4" + pycompile_module="sane.py" + pkg_install() { + vmove usr/lib/python3.4/site-packages/sane.py + vmove usr/lib/python3.4/site-packages/pysane-2.0-py3.4.egg-info + vmove usr/lib/python3.4/site-packages/_sane.cpython-34m.so + } +}