From 13135c7d708229ecc0c61d26d768df4053c244f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 28 Sep 2020 22:58:18 +0700
Subject: [PATCH] python-sip{,-devel,-PyQt5}: drop packages

---
 srcpkgs/python-sip       |  1 -
 srcpkgs/python-sip-PyQt5 |  1 -
 srcpkgs/python-sip-devel |  1 -
 srcpkgs/sip/template     | 82 ++++------------------------------------
 4 files changed, 8 insertions(+), 77 deletions(-)
 delete mode 120000 srcpkgs/python-sip
 delete mode 120000 srcpkgs/python-sip-PyQt5
 delete mode 120000 srcpkgs/python-sip-devel

diff --git a/srcpkgs/python-sip b/srcpkgs/python-sip
deleted file mode 120000
index 633f7c0bcc..0000000000
--- a/srcpkgs/python-sip
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-PyQt5 b/srcpkgs/python-sip-PyQt5
deleted file mode 120000
index 633f7c0bcc..0000000000
--- a/srcpkgs/python-sip-PyQt5
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/python-sip-devel b/srcpkgs/python-sip-devel
deleted file mode 120000
index 633f7c0bcc..0000000000
--- a/srcpkgs/python-sip-devel
+++ /dev/null
@@ -1 +0,0 @@
-sip
\ No newline at end of file
diff --git a/srcpkgs/sip/template b/srcpkgs/sip/template
index c670e72fb5..8f53db1cf1 100644
--- a/srcpkgs/sip/template
+++ b/srcpkgs/sip/template
@@ -1,9 +1,8 @@
 # Template file for 'sip'
 pkgname=sip
 version=4.19.24
-revision=1
-create_wrksrc=yes
-hostmakedepends="python-devel python3-devel"
+revision=2
+hostmakedepends="python3-devel"
 makedepends="${hostmakedepends}"
 short_desc="Python extension module generator for C/C++ libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,76 +11,22 @@ homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"
 checksum=edcd3790bb01938191eef0f6117de0bf56d1136626c0ddb678f3a558d62e41e5
 
-post_extract() {
-	mv sip-$version sip-${py2_ver}
-	cp -a sip-${py2_ver} sip-${py3_ver}
-	cp -a sip-${py2_ver} sip-${py2_ver}-PyQt5
-}
-
 do_build() {
-	for pyver in $py2_ver $py3_ver ${py2_ver}-PyQt5; do
-		if [ "${pyver%-PyQt5}" != "$py2_ver" ]; then
-			pyinc="$py3_inc"
-		else
-			pyinc="$py2_inc"
-		fi
-		if [ "${pyver##*-}" = "PyQt5" ]; then
-			pyqt5="--sip-module PyQt5.sip --no-tools"
-		fi
-		cd ${wrksrc}/sip-${pyver}
-		python${pyver%-PyQt5} configure.py \
-			CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-			LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
-			INCDIR="${XBPS_CROSS_BASE}/${pyinc}" ${pyqt5}
-		make ${makejobs}
-	done
+	python3 configure.py \
+		CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
+		INCDIR="${XBPS_CROSS_BASE}/${py3_inc}" ${pyqt5}
+	make ${makejobs}
 }
 
 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 $py2_sitelib
-	vinstall sipdistutils.py 644 $py2_sitelib
-
-	# install python3-sip
-	cd ${wrksrc}/sip-${py3_ver}
 	make DESTDIR=${DESTDIR} install -C sipgen
 	make DESTDIR=${DESTDIR} install -C siplib
 	vinstall sipconfig.py 644 $py3_sitelib
 	vinstall sipdistutils.py 644 $py3_sitelib
-
-	# install python2 PyQt5 sip
-	cd ${wrksrc}/sip-${py2_ver}-PyQt5
-	make DESTDIR=${DESTDIR} install -C siplib
-
 	vlicense LICENSE
 }
 
-python-sip_package() {
-	lib32disabled=yes
-	depends="python"
-	short_desc="Python2 SIP bindings"
-	pkg_install() {
-		vmove ${py2_sitelib}/sip.so
-		vmove ${py2_sitelib}/sipconfig.py
-		vmove ${py2_sitelib}/sip.pyi
-		vlicense sip-${py2_ver}/LICENSE
-	}
-}
-
-python-sip-devel_package() {
-	lib32disabled=yes
-	depends="sip-${version}_${revision} python-sip-${version}_${revision}"
-	short_desc="Python2 SIP bindings - development files"
-	pkg_install() {
-		vmove ${py2_inc}
-		vmove ${py2_sitelib}/sipdistutils.py
-	}
-}
-
 python3-sip_package() {
 	lib32disabled=yes
 	depends="python3"
@@ -90,7 +35,7 @@ python3-sip_package() {
 		vmove ${py3_sitelib}/sip.so
 		vmove ${py3_sitelib}/sipconfig.py
 		vmove ${py3_sitelib}/sip.pyi
-		vlicense sip-${py3_ver}/LICENSE
+		vlicense LICENSE
 	}
 }
 
@@ -102,14 +47,3 @@ python3-sip-devel_package() {
 		vmove ${py3_sitelib}/sipdistutils.py
 	}
 }
-
-python-sip-PyQt5_package() {
-	lib32disabled=yes
-	depends="python"
-	short_desc="Python2 SIP bindings (PyQt5 version)"
-	 pkg_install() {
-		vmove ${py2_sitelib}/PyQt5/sip.so
-		vmove ${py2_sitelib}/PyQt5/sip.pyi
-		vlicense sip-${py2_ver}-PyQt5/LICENSE
-	}
-}