From 5b94abafa9c95e706ffb325110df255f74dcb60d Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 17 Oct 2016 03:26:25 +0200
Subject: [PATCH] uwsgi: rebuild for Python 3.5

Switch to python3-* pkgs.
Convert python3.4-* pkg into dummy pkg.
---
 srcpkgs/uwsgi-python3  |  1 +
 srcpkgs/uwsgi/template | 35 ++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)
 create mode 120000 srcpkgs/uwsgi-python3

diff --git a/srcpkgs/uwsgi-python3 b/srcpkgs/uwsgi-python3
new file mode 120000
index 00000000000..2d8a4b6714b
--- /dev/null
+++ b/srcpkgs/uwsgi-python3
@@ -0,0 +1 @@
+uwsgi
\ No newline at end of file
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 0e90eec7c65..dfe07b2cea5 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,9 +1,9 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.14
-revision=1
-hostmakedepends="python python3.4"
-makedepends="python-devel python3.4-devel"
+revision=2
+hostmakedepends="python python3"
+makedepends="python-devel python3-devel"
 short_desc="Fast, self-healing application container server"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2"
@@ -13,7 +13,7 @@ checksum=21b3d1ef926d835ff23576193a2c60d4c896d8e21567850cf0677a4764122887
 
 _libdir=usr/lib/uwsgi
 
-subpackages="uwsgi-python uwsgi-python3.4"
+subpackages="uwsgi-python uwsgi-python3 uwsgi-python3.4"
 case "$XBPS_TARGET_MACHINE" in
 	armv[67]l-musl) subpackages="uwsgi-python"
 esac
@@ -29,26 +29,26 @@ do_build() {
 	local _cflags="$CFLAGS"
 	local _ldflags="$LDFLAGS"
 
-	python uwsgiconfig.py --build core
+	python2 uwsgiconfig.py --build core
 
 	if [ -n "$CROSS_BUILD" ]; then
-		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/include/python2.7
+		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py2_inc}
 			-I${XBPS_CROSS_BASE}/usr/include"
-		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python2.7
+		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py2_lib}
 			-L${XBPS_CROSS_BASE}/usr/lib"
 	fi
-	CFLAGS="$_cflags" LDFLAGS="$_ldflags" python uwsgiconfig.py \
+	CFLAGS="$_cflags" LDFLAGS="$_ldflags" python2 uwsgiconfig.py \
 		--plugin plugins/python core python
 
 	if [ -n "$CROSS_BUILD" ]; then
-		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/include/python3.4m
+		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc}
 			-I${XBPS_CROSS_BASE}/usr/include"
-		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/lib/python3.4m
+		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py3_lib}
 			-L${XBPS_CROSS_BASE}/usr/lib"
 	fi
 	case "$subpackages" in
-		*uwsgi-python3.4*)
-			CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3.4 uwsgiconfig.py \
+		*uwsgi-python3*)
+			CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
 				--plugin plugins/python core python3
 			;;
 	esac
@@ -66,10 +66,15 @@ uwsgi-python_package() {
 		vmove $_libdir/python_plugin.so
 	}
 }
-
-uwsgi-python3.4_package() {
-	short_desc="$short_desc (Python3.4 plugin)"
+uwsgi-python3_package() {
+	replaces="uwsgi-python3.4>=0"
+	short_desc="$short_desc (Python3 plugin)"
 	pkg_install() {
 		vmove $_libdir/python3_plugin.so
 	}
 }
+uwsgi-python3.4_package() {
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="uwsgi-python3>=${version}_${revision}"
+}