From cfa3804575f0928af363df25215fe468058d7cff Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 17 Oct 2016 00:49:35 +0200
Subject: [PATCH] sip: rebuild for Python 3.5

Switch to python3-* pkgs.
Convert python3.4-* pkgs into dummy pkgs.
---
 srcpkgs/python3-sip       |   1 +
 srcpkgs/python3-sip-devel |   1 +
 srcpkgs/sip/template      | 112 ++++++++++++++++++++------------------
 3 files changed, 61 insertions(+), 53 deletions(-)
 create mode 120000 srcpkgs/python3-sip
 create mode 120000 srcpkgs/python3-sip-devel

diff --git a/srcpkgs/python3-sip b/srcpkgs/python3-sip
new file mode 120000
index 00000000000..633f7c0bcce
--- /dev/null
+++ b/srcpkgs/python3-sip
@@ -0,0 +1 @@
+sip
\ No newline at end of file
diff --git a/srcpkgs/python3-sip-devel b/srcpkgs/python3-sip-devel
new file mode 120000
index 00000000000..633f7c0bcce
--- /dev/null
+++ b/srcpkgs/python3-sip-devel
@@ -0,0 +1 @@
+sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index fd005e80b3b..01ee020cc68 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,9 @@
 # Template file for 'sip'
 pkgname=sip
 version=4.18.1
-revision=1
+revision=2
 wrksrc="sip-${version}"
-hostmakedepends="python-devel python3.4-devel"
+hostmakedepends="python-devel python3-devel"
 makedepends="${hostmakedepends}"
 short_desc="Python extension module generator for C/C++ libraries"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -12,45 +12,41 @@ license="GPL-2, GPL-3, SIP"
 distfiles="${SOURCEFORGE_SITE}/pyqt/sip-${version}.tar.gz"
 checksum=9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290
 
-_do_sip_build() {
-	local pyver=${1:-2.7} pysufx=
-
-	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${pyver}${pysufx}"
-	make ${makejobs}
-}
 pre_build() {
-	cp -a ${wrksrc} /tmp/sip-3.4
-	mv /tmp/sip-3.4 ${wrksrc}
+	mkdir -p sip-${py2_ver}
+	mv * sip-${py2_ver} || true
+	cp -a sip-${py2_ver} sip-${py3_ver}
 }
 do_build() {
-	# build python-sip
-	_do_sip_build
+	for pyver in $py2_ver $py3_ver; do
+		if [ "$pyver" != "$py2_ver" ]; then
+			pyinc="$py3_inc"
+		else
+			pyinc="$py2_inc"
+		fi
 
-	# build python3.4-sip
-	cd ${wrksrc}/sip-3.4
-	_do_sip_build 3.4
+		cd ${wrksrc}/sip-${pyver}
+		python${pyver} configure.py \
+			CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+			LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+			INCDIR="${XBPS_CROSS_BASE}/${pyinc}"
+		make ${makejobs}
+	done
 }
 do_install() {
+	cd ${wrksrc}/sip-${py2_ver}
 	# install sip
 	make DESTDIR=${DESTDIR} install -C sipgen
-
 	# install python-sip
 	make DESTDIR=${DESTDIR} install -C siplib
-	vinstall sipconfig.py 644 usr/lib/python2.7/site-packages
-	vinstall sipdistutils.py 644 usr/lib/python2.7/site-packages
+	vinstall sipconfig.py 644 $py2_sitelib
+	vinstall sipdistutils.py 644 $py2_sitelib
 
-	# install python3.4-sip
-	cd ${wrksrc}/sip-3.4
+	# install python3-sip
+	cd ${wrksrc}/sip-${py3_ver}
 	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
+	vinstall sipconfig.py 644 $py3_sitelib
+	vinstall sipdistutils.py 644 $py3_sitelib
 }
 post_install() {
 	# Remove references to hardening -specs.
@@ -65,39 +61,49 @@ python-sip_package() {
 	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
-		vmove usr/lib/python2.7/site-packages/sip.pyi
+		vmove ${py2_sitelib}/sip.so
+		vmove ${py2_sitelib}/sipconfig.py
+		vmove ${py2_sitelib}/sip.pyi
 	}
 }
 python-sip-devel_package() {
 	depends="python-sip-${version}_${revision}"
 	pycompile_module="sipdistutils.py"
-	short_desc="Python2 SIP bindings (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
+		vmove ${py2_inc}
+		vmove ${py2_sitelib}/sipdistutils.py
+	}
+}
+python3-sip_package() {
+	lib32disabled=yes
+	replaces="python3.4-sip>=0"
+	depends="${sourcepkg}-${version}_${revision} python3"
+	pycompile_module="sipconfig.py"
+	short_desc="Python3 SIP bindings"
+	pkg_install() {
+		vmove ${py3_sitelib}/sip.so
+		vmove ${py3_sitelib}/sipconfig.py
+		vmove ${py3_sitelib}/sip.pyi
+	}
+}
+python3-sip-devel_package() {
+	replaces="python3.4-sip-devel>=0"
+	depends="python3-sip-${version}_${revision}"
+	pycompile_module="sipdistutils.py"
+	short_desc="Python3 SIP bindings - development files"
+	pkg_install() {
+		vmove ${py3_inc}
+		vmove ${py3_sitelib}/sipdistutils.py
 	}
 }
 python3.4-sip_package() {
-	lib32disabled=yes
-	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
-		vmove usr/lib/python3.4/site-packages/sip.pyi
-	}
+	build_style=meta
+	short_desc="Python3.4 SIP bindings (transitional dummy package)"
+	depends="python3-sip>=${version}_${revision}"
 }
 python3.4-sip-devel_package() {
-	depends="python3.4-sip-${version}_${revision}"
-	pycompile_version="3.4"
-	pycompile_module="sipdistutils.py"
-	short_desc="Python3.4 SIP bindings (development files)"
-	pkg_install() {
-		vmove usr/include/python3.4m
-		vmove usr/lib/python3.4/site-packages/sipdistutils.py
-	}
+	build_style=meta
+	short_desc="Python3.4 SIP bindings - development files (transitional dummy package)"
+	depends="python3-sip-devel>=${version}_${revision}"
 }