From 756d98f51be803f5b2b62023e1d4cc6c56151425 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sat, 15 Nov 2014 20:14:14 +0100
Subject: [PATCH] sip: update to 4.16.4

---
 srcpkgs/sip/template | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 52dc215bc3b..1687365482b 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,25 +1,29 @@
 # Template file for 'sip'
 pkgname=sip
-version=4.16.3
+version=4.16.4
 revision=1
 wrksrc="sip-${version}"
 hostmakedepends="python-devel python3.4-devel"
 makedepends="${hostmakedepends}"
 replaces="python-sip<4.16.2_2"
-short_desc="Python extension module generator for C and C++ libraries"
+short_desc="Python extension module generator for C/C++ libraries"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.riverbankcomputing.co.uk/software/sip/intro"
 license="GPL-2, GPL-3, SIP"
 distfiles="${SOURCEFORGE_SITE}/pyqt/${pkgname}-${version}.tar.gz"
-checksum=fd8a65693612f1d0c5dcd41881cd92496d770b3b9e03a138e533e3afc892f421
+checksum=ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5
 
 _do_sip_build() {
-	local v=$1 suffix=$2
+	local pyver=${1:-2.7} pysufx=
 
-	python${v} configure.py \
+	if [ "$pyver" != "2.7" ]; then
+		pysufx="m"
+	fi
+
+	python${pyver} configure.py \
 		CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
-		INCDIR="${XBPS_CROSS_BASE}/usr/include/python${v}${suffix}"
+		INCDIR="${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx}"
 	make ${makejobs}
 }
 
@@ -30,11 +34,11 @@ post_extract() {
 
 do_build() {
 	# build python-sip
-	_do_sip_build 2.7
+	_do_sip_build
 
 	# build python3.4-sip
 	cd ${wrksrc}/python3.4-sip-build
-	_do_sip_build 3.4 "m"
+	_do_sip_build 3.4
 }
 
 do_install() {
@@ -55,10 +59,11 @@ do_install() {
 
 python-sip_package() {
 	replaces="python-sip<4.16.2_2"
-	depends="sip python"
+	depends="${sourcepkg}>=${version}_${revision} python"
 	pycompile_module="sipconfig.py"
 	short_desc+=" - Python2 SIP bindings"
 	pkg_install() {
+		vmove usr/lib/python2.7/site-packages/sip.so
 		vmove usr/lib/python2.7/site-packages/sipconfig.py
 	}
 }
@@ -67,7 +72,7 @@ python-sip-devel_package() {
 	replaces="python-sip<4.16.2_2"
 	depends="python-sip>=${version}_${revision}"
 	pycompile_module="sipdistutils.py"
-	short_desc+=" - Python2 SIP development files"
+	short_desc+=" - Python2 SIP bindings (development files)"
 	pkg_install() {
 		vmove usr/include/python2.7
 		vmove usr/lib/python2.7/site-packages/sipdistutils.py
@@ -76,11 +81,12 @@ python-sip-devel_package() {
 
 python3.4-sip_package() {
 	replaces="python3.4-sip<4.16.2_2"
-	depends="sip python3.4"
+	depends="${sourcepkg}>=${version}_${revision} python3.4"
 	pycompile_version="3.4"
 	pycompile_module="sipconfig.py"
 	short_desc+=" - Python3.4 SIP bindings"
 	pkg_install() {
+		vmove usr/lib/python3.4/site-packages/sip.so
 		vmove usr/lib/python3.4/site-packages/sipconfig.py
 	}
 }
@@ -90,7 +96,7 @@ python3.4-sip-devel_package() {
 	depends="python3.4-sip>=${version}_${revision}"
 	pycompile_version="3.4"
 	pycompile_module="sipdistutils.py"
-	short_desc+=" - Python3.4 SIP development files"
+	short_desc+=" - Python3.4 SIP bindings (development files)"
 	pkg_install() {
 		vmove usr/include/python3.4m
 		vmove usr/lib/python3.4/site-packages/sipdistutils.py