python-Pillow: update to 2.7.0

Drop sane subpackage, is in a separate repo now.

srcpkgs/python-Pillow-sane

@@ -1 +0,0 @@
-python-Pillow

srcpkgs/python-Pillow/template

@@ -1,61 +1,39 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
-version=2.6.2
+version=2.7.0
 revision=1
 wrksrc="Pillow-${version}"
+build_style=python-module
 python_versions="2.7 3.4"
-hostmakedepends="unzip python-setuptools python3.4-setuptools"
+hostmakedepends="python-setuptools python3.4-setuptools"
 makedepends="
  python-devel python3.4-devel python-tkinter python3.4-tkinter
  libjpeg-turbo-devel libopenjpeg2-devel zlib-devel tiff-devel
- freetype-devel lcms2-devel libwebp-devel tk-devel sane-devel"
+ freetype-devel lcms2-devel libwebp-devel tk-devel"
 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 <al3hex@gmail.com>"
-homepage="https://python-pillow.github.io/"
+homepage="https://github.com/python-pillow/Pillow"
 license="PIL"
-distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.zip"
+distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
-checksum=0652825265de91cdf0c7917d14428f35484492de8a4ca7436c0f5d553d4efc33
+checksum=26e9320e73f5821826b6b2408a3bff0a8c29e45159530069a117efd39ef619f8
 nocross=yes
 
-post_extract() {
+pre_build() {
 	sed -i '/^#!\//,1d' PIL/OleFileIO.py
-	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}/Pillow-2.7
-	python setup.py build
-	cd Sane
-	python setup.py 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
+	# rename bins and remove .py suffix
-		mv Pillow-2.7/build/scripts-2.7/pil${file}{.py,}
+	for f in convert driver file font print; do
-		mv Pillow-3.4/build/scripts-3.4/pil${file}{.py,3}
+		mv build-2.7/scripts-2.7/pil${f}{.py,}
+		mv build-3.4/scripts-3.4/pil${f}{.py,3}
 	done
 }
-do_install() {
-	cd ${wrksrc}/Pillow-2.7
-	python setup.py install --root=${DESTDIR}
-	cd Sane
-	python setup.py install --root=${DESTDIR}
-
-	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
+	# clean up bins
+	rm -f ${DESTDIR}/usr/bin/*.py
 	vlicense docs/LICENSE
 }
 
@@ -63,7 +41,6 @@ python-Pillow-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		cd ${wrksrc}/Pillow-2.7
 		vmkdir usr/include/python2.7/Imaging
 		vcopy libImaging/*.h usr/include/python2.7/Imaging
 	}
@@ -86,16 +63,6 @@ python-Pillow-tk_package() {
 		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"
@@ -110,9 +77,8 @@ 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.4m/Imaging
-		vmkdir usr/include/python3.4/Imaging
+		vcopy libImaging/*.h usr/include/python3.4m/Imaging
-		vcopy libImaging/*.h usr/include/python3.4/Imaging
 	}
 }
 python3.4-Pillow-qt_package() {
@@ -135,14 +101,3 @@ python3.4-Pillow-tk_package() {
 		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
-	}
-}

srcpkgs/python3.4-Pillow-sane

@@ -1 +0,0 @@
-python-Pillow