python-cairo: update to 1.13.3

Switch to new upstream, see https://www.cairographics.org/news/pycairo-has-moved/.

srcpkgs/python-cairo/template

@@ -1,39 +1,23 @@
 # Template file for 'python-cairo'
 pkgname=python-cairo
-version=1.10.0
+version=1.13.3
-revision=5
+revision=1
-lib32disabled=yes
+wrksrc="pycairo-${version}"
-wrksrc="py2cairo-${version}"
+build_style=python2-module
-build_style=gnu-configure
+hostmakedepends="pkg-config python"
-configure_args="PYTHON=python"
-hostmakedepends="automake libtool pkg-config python-devel"
 makedepends="cairo-devel python-devel"
-depends="python>=2.7"
-replaces="pycairo<1.10 py2cairo>=0"
-pycompile_module="cairo"
 short_desc="Python2 bindings for the cairo graphics library"
-homepage="http://cairographics.org/pycairo/"
+homepage="https://pycairo.readthedocs.io/"
-license="LGPL-3"
+license="LGPL-2.1, MPL-1.1"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://cairographics.org/releases/py2cairo-${version}.tar.bz2"
+distfiles="https://github.com/pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz"
-checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431
+checksum=2f2ae1acdc7197e4df58e458a0279de206f989972edfe06d54e99d9e5b839938
-
-pre_configure() {
-	touch ChangeLog
-	NOCONFIGURE=1 autoreconf -fi
-	if [ "$CROSS_BUILD" ]; then
-		ln -s ${XBPS_WRAPPERDIR}/python-config ${wrksrc}
-	fi
-}
 
 python-cairo-devel_package() {
-	lib32disabled=yes
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	replaces="pycairo-devel<1.10 py2cairo-devel>=0"
-	depends="python-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 	}
 }
-

srcpkgs/python-cairo/update

@@ -1 +0,0 @@
-pkgname=py2cairo

srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_4.patch

@@ -1,11 +0,0 @@
---- a/waflib/Tools/python.py.orig
-+++ b/waflib/Tools/python.py
-@@ -169,7 +169,7 @@
- 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
- 	includes=[]
- 	if conf.env.PYTHON_CONFIG:
--		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-+		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
- 			if(incstr.startswith('-I')or incstr.startswith('/I')):
- 				incstr=incstr[2:]
- 			if incstr not in includes:

srcpkgs/python3-cairo/files/pycairo-1.10.0-waf-py3_5.patch

@@ -1,10 +0,0 @@
---- a/waflib/Build.py.orig
-+++ b/waflib/Build.py
-@@ -151,6 +151,7 @@ class BuildContext(Context.Context):
- 				f.close()
- 		self.init_dirs()
- 	def store(self):
-+		return
- 		data={}
- 		for x in SAVED_ATTRS:
- 			data[x]=getattr(self,x)

srcpkgs/python3-cairo/template

@@ -1,32 +1,22 @@
 # Template file for 'python3-cairo'
 pkgname=python3-cairo
-version=1.10.0
+version=1.13.3
-revision=8
+revision=1
-nocross=yes
 wrksrc="pycairo-${version}"
-build_style=waf3
+build_style=python3-module
+replaces="python3.4-cairo>=0"
 hostmakedepends="pkg-config python3"
 makedepends="cairo-devel python3-devel"
 short_desc="Python3 bindings for the cairo graphics library"
-homepage="http://cairographics.org/pycairo/"
+homepage="https://pycairo.readthedocs.io/"
-license="LGPL-3"
+license="LGPL-2.1, MPL-1.1"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
-distfiles="http://cairographics.org/releases/pycairo-${version}.tar.bz2"
+distfiles="https://github.com/pygobject/pycairo/releases/download/v${version}/pycairo-${version}.tar.gz"
-checksum=9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be
+checksum=2f2ae1acdc7197e4df58e458a0279de206f989972edfe06d54e99d9e5b839938
-replaces="python3.4-cairo>=0"
-
-post_extract() {
-	# We need to call waf to extract waflib before patching files
-	python3 waf --version 1>&2 > /dev/null
-	ln -s .waf3-* waf3
-	cd waf3
-	patch -Np1 -i ${FILESDIR}/pycairo-1.10.0-waf-py3_4.patch
-	patch -Np1 -i ${FILESDIR}/pycairo-1.10.0-waf-py3_5.patch
-}
 
 python3-cairo-devel_package() {
 	replaces="python3.4-cairo-devel>=0"
-	depends="python3-devel ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/python3-cairo/update

@@ -1 +0,0 @@
-pkgname=pycairo