From d7380c421d4b97a7b173380f3ec7ff5bc55cd102 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 17 Oct 2016 03:10:39 +0200
Subject: [PATCH] python-Pillow: rebuild for Python 3.5

Switch to python3-* pkgs.
Convert python3.4-* pkg into dummy pkg.
---
 .../python-Pillow/python3-Pillow.INSTALL.msg  |  3 +
 .../python3.4-Pillow.INSTALL.msg              |  3 -
 srcpkgs/python-Pillow/template                | 74 ++++++++++---------
 srcpkgs/python3-Pillow                        |  1 +
 4 files changed, 43 insertions(+), 38 deletions(-)
 create mode 100644 srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg
 delete mode 100644 srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg
 create mode 120000 srcpkgs/python3-Pillow

diff --git a/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg b/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg
new file mode 100644
index 00000000000..3531dfc9779
--- /dev/null
+++ b/srcpkgs/python-Pillow/python3-Pillow.INSTALL.msg
@@ -0,0 +1,3 @@
+To use the Tk image interface install python3-tkinter.
+To use the Qt image interface install python3-PyQt{4,5} or
+python3-pyside.
diff --git a/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg b/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg
deleted file mode 100644
index 1c4e11c3edf..00000000000
--- a/srcpkgs/python-Pillow/python3.4-Pillow.INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-To use the Tk image interface install python3.4-tkinter.
-To use the Qt image interface install python3.4-PyQt{4,5} or
-python3.4-pyside.
diff --git a/srcpkgs/python-Pillow/template b/srcpkgs/python-Pillow/template
index 238af0c44d8..ba01749b7b4 100644
--- a/srcpkgs/python-Pillow/template
+++ b/srcpkgs/python-Pillow/template
@@ -1,12 +1,11 @@
 # Template file for 'python-Pillow'
 pkgname=python-Pillow
 version=3.2.0
-revision=2
+revision=3
 wrksrc="Pillow-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
-hostmakedepends="python-setuptools python3.4-setuptools python-tkinter python3.4-tkinter"
-makedepends="python-devel python3.4-devel python-tkinter python3.4-tkinter
+hostmakedepends="python-setuptools python3-setuptools python-tkinter python3-tkinter"
+makedepends="python-devel python3-devel python-tkinter python3-tkinter
  libjpeg-turbo-devel libopenjpeg2-devel zlib-devel tiff-devel freetype-devel
  lcms2-devel libwebp-devel tk-devel"
 pycompile_module="PIL"
@@ -18,45 +17,50 @@ distfiles="${PYPI_SITE}/P/Pillow/Pillow-${version}.tar.gz"
 checksum=64b0a057210c480aea99406c9391180cd866fc0fd8f0b53367e3af21b195784a
 
 alternatives="
- pil:createfontdatachunk:/usr/bin/createfontdatachunk.py2.7
- pil:enhancer:/usr/bin/enhancer.py2.7
- pil:explode:/usr/bin/explode.py2.7
- pil:gifmaker:/usr/bin/gifmaker.py2.7
- pil:painter:/usr/bin/painter.py2.7
- pil:pilconvert:/usr/bin/pilconvert.py2.7
- pil:pildriver:/usr/bin/pildriver.py2.7
- pil:pilfile:/usr/bin/pilfile.py2.7
- pil:pilfont:/usr/bin/pilfont.py2.7
- pil:pilprint:/usr/bin/pilprint.py2.7
- pil:player:/usr/bin/player.py2.7
- pil:thresholder:/usr/bin/thresholder.py2.7
- pil:viewer:/usr/bin/viewer.py2.7"
+ pil:createfontdatachunk:/usr/bin/createfontdatachunk.py2
+ pil:enhancer:/usr/bin/enhancer.py2
+ pil:explode:/usr/bin/explode.py2
+ pil:gifmaker:/usr/bin/gifmaker.py2
+ pil:painter:/usr/bin/painter.py2
+ pil:pilconvert:/usr/bin/pilconvert.py2
+ pil:pildriver:/usr/bin/pildriver.py2
+ pil:pilfile:/usr/bin/pilfile.py2
+ pil:pilfont:/usr/bin/pilfont.py2
+ pil:pilprint:/usr/bin/pilprint.py2
+ pil:player:/usr/bin/player.py2
+ pil:thresholder:/usr/bin/thresholder.py2
+ pil:viewer:/usr/bin/viewer.py2"
 
 post_install() {
 	vlicense LICENSE
 }
 
-python3.4-Pillow_package() {
+python3-Pillow_package() {
 	alternatives="
-	 pil:createfontdatachunk:/usr/bin/createfontdatachunk.py3.4
-	 pil:enhancer:/usr/bin/enhancer.py3.4
-	 pil:explode:/usr/bin/explode.py3.4
-	 pil:gifmaker:/usr/bin/gifmaker.py3.4
-	 pil:painter:/usr/bin/painter.py3.4
-	 pil:pilconvert:/usr/bin/pilconvert.py3.4
-	 pil:pildriver:/usr/bin/pildriver.py3.4
-	 pil:pilfile:/usr/bin/pilfile.py3.4
-	 pil:pilfont:/usr/bin/pilfont.py3.4
-	 pil:pilprint:/usr/bin/pilprint.py3.4
-	 pil:player:/usr/bin/player.py3.4
-	 pil:thresholder:/usr/bin/thresholder.py3.4
-	 pil:viewer:/usr/bin/viewer.py3.4"
-	pycompile_version="3.4"
+	 pil:createfontdatachunk:/usr/bin/createfontdatachunk.py3
+	 pil:enhancer:/usr/bin/enhancer.py3
+	 pil:explode:/usr/bin/explode.py3
+	 pil:gifmaker:/usr/bin/gifmaker.py3
+	 pil:painter:/usr/bin/painter.py3
+	 pil:pilconvert:/usr/bin/pilconvert.py3
+	 pil:pildriver:/usr/bin/pildriver.py3
+	 pil:pilfile:/usr/bin/pilfile.py3
+	 pil:pilfont:/usr/bin/pilfont.py3
+	 pil:pilprint:/usr/bin/pilprint.py3
+	 pil:player:/usr/bin/player.py3
+	 pil:thresholder:/usr/bin/thresholder.py3
+	 pil:viewer:/usr/bin/viewer.py3"
 	pycompile_module="PIL"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-Pillow>=0"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/*3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
 		vlicense LICENSE
 	}
 }
+python3.4-Pillow_package() {
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-Pillow>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-Pillow b/srcpkgs/python3-Pillow
new file mode 120000
index 00000000000..bafc9b1001d
--- /dev/null
+++ b/srcpkgs/python3-Pillow
@@ -0,0 +1 @@
+python-Pillow
\ No newline at end of file