From cdcc14962c01288fb265aa81fc6d8480cdf0dbb8 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sat, 27 Dec 2014 19:41:14 +0100
Subject: [PATCH] sip: update to 4.16.5

---
 srcpkgs/sip/template | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index 1687365482..fca9cc763b 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,17 +1,16 @@
 # Template file for 'sip'
 pkgname=sip
-version=4.16.4
+version=4.16.5
 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/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=ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5
+checksum=a00ba34c30bedc0f61916eb10bd12867b4754910a766647e3e58f88bd00f1e87
 
 _do_sip_build() {
 	local pyver=${1:-2.7} pysufx=
@@ -26,21 +25,18 @@ _do_sip_build() {
 		INCDIR="${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx}"
 	make ${makejobs}
 }
-
 post_extract() {
-	cp -a ${wrksrc} /tmp/python3.4-sip-build
-	mv /tmp/python3.4-sip-build ${wrksrc}
+	cp -a ${wrksrc} /tmp/sip-3.4
+	mv /tmp/sip-3.4 ${wrksrc}
 }
-
 do_build() {
 	# build python-sip
 	_do_sip_build
 
 	# build python3.4-sip
-	cd ${wrksrc}/python3.4-sip-build
+	cd ${wrksrc}/sip-3.4
 	_do_sip_build 3.4
 }
-
 do_install() {
 	# install sip
 	make DESTDIR=${DESTDIR} install -C sipgen
@@ -51,14 +47,13 @@ do_install() {
 	vinstall sipdistutils.py 644 usr/lib/python2.7/site-packages
 
 	# install python3.4-sip
-	cd ${wrksrc}/python3.4-sip-build
+	cd ${wrksrc}/sip-3.4
 	make DESTDIR=${DESTDIR} install -C siplib
 	vinstall sipconfig.py 644 usr/lib/python3.4/site-packages
 	vinstall sipdistutils.py 644 usr/lib/python3.4/site-packages
 }
 
 python-sip_package() {
-	replaces="python-sip<4.16.2_2"
 	depends="${sourcepkg}>=${version}_${revision} python"
 	pycompile_module="sipconfig.py"
 	short_desc+=" - Python2 SIP bindings"
@@ -67,9 +62,7 @@ python-sip_package() {
 		vmove usr/lib/python2.7/site-packages/sipconfig.py
 	}
 }
-
 python-sip-devel_package() {
-	replaces="python-sip<4.16.2_2"
 	depends="python-sip>=${version}_${revision}"
 	pycompile_module="sipdistutils.py"
 	short_desc+=" - Python2 SIP bindings (development files)"
@@ -78,9 +71,7 @@ python-sip-devel_package() {
 		vmove usr/lib/python2.7/site-packages/sipdistutils.py
 	}
 }
-
 python3.4-sip_package() {
-	replaces="python3.4-sip<4.16.2_2"
 	depends="${sourcepkg}>=${version}_${revision} python3.4"
 	pycompile_version="3.4"
 	pycompile_module="sipconfig.py"
@@ -90,9 +81,7 @@ python3.4-sip_package() {
 		vmove usr/lib/python3.4/site-packages/sipconfig.py
 	}
 }
-
 python3.4-sip-devel_package() {
-	replaces="python3.4-sip<4.16.2_2"
 	depends="python3.4-sip>=${version}_${revision}"
 	pycompile_version="3.4"
 	pycompile_module="sipdistutils.py"