svn commit: r551661 - head/graphics/py-cairo

[Antoine Brodin]

Author: antoine
Date: Wed Oct  7 18:24:06 2020
New Revision: 551661
URL: https://svnweb.freebsd.org/changeset/ports/551661

Log:
  Revert r551636 and unbreak bulk -a, ports still depend on the py27 flavor
  
  With hat:	portmgr

Modified:
  head/graphics/py-cairo/Makefile
  head/graphics/py-cairo/distinfo
  head/graphics/py-cairo/pkg-descr
  head/graphics/py-cairo/pkg-plist

Modified: head/graphics/py-cairo/Makefile
==============================================================================
--- head/graphics/py-cairo/Makefile	Wed Oct  7 18:20:22 2020	(r551660)
+++ head/graphics/py-cairo/Makefile	Wed Oct  7 18:24:06 2020	(r551661)
@@ -2,35 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	cairo
-PORTVERSION=	1.18.2
+PORTVERSION=	1.18.1
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	desktop at FreeBSD.org
-COMMENT=	Python bindings for Cairo
+COMMENT=	Python 2 bindings for Cairo
 
 LICENSE=	LGPL21 MPL11
 LICENSE_COMB=	multi
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING-LGPL-2.1
 LICENSE_FILE_MPL11=	${WRKSRC}/COPYING-MPL-1.1
 
-USES=		compiler:c11 gnome meson pkgconfig python:3.6+,build
-USE_PYTHON=	flavors py3kplist
+PORTSCOUT=	limitw:1,even
+
+USES=		compiler:c11 gnome pkgconfig python
+USE_PYTHON=	distutils py3kplist
 USE_GNOME=	cairo
 
-MESON_ARGS=	-Dpython=${PYTHON_CMD}
-
 PLIST_SUB=	PORTVER=${PORTVERSION}
 
-PORTSCOUT=	limitw:1,even
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so
-	@${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR}/${PORTNAME} \
-		"${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}"
-	@${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR}/${PORTNAME} \
-		"${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}"
 
 .include <bsd.port.mk>

Modified: head/graphics/py-cairo/distinfo
==============================================================================
--- head/graphics/py-cairo/distinfo	Wed Oct  7 18:20:22 2020	(r551660)
+++ head/graphics/py-cairo/distinfo	Wed Oct  7 18:24:06 2020	(r551661)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599990188
-SHA256 (pycairo-1.18.2.tar.gz) = dcb853fd020729516e8828ad364084e752327d4cff8505d20b13504b32b16531
-SIZE (pycairo-1.18.2.tar.gz) = 200462
+TIMESTAMP = 1560185779
+SHA256 (pycairo-1.18.1.tar.gz) = 70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786
+SIZE (pycairo-1.18.1.tar.gz) = 200610

Modified: head/graphics/py-cairo/pkg-descr
==============================================================================
--- head/graphics/py-cairo/pkg-descr	Wed Oct  7 18:20:22 2020	(r551660)
+++ head/graphics/py-cairo/pkg-descr	Wed Oct  7 18:24:06 2020	(r551661)
@@ -1,3 +1,3 @@
-Python bindings for Cairo.
+Python 2 bindings for Cairo.
 
 WWW: https://github.com/pygobject/pycairo

Modified: head/graphics/py-cairo/pkg-plist
==============================================================================
--- head/graphics/py-cairo/pkg-plist	Wed Oct  7 18:20:22 2020	(r551660)
+++ head/graphics/py-cairo/pkg-plist	Wed Oct  7 18:24:06 2020	(r551661)
@@ -1,10 +1,16 @@
-include/pycairo/py3cairo.h
+%%PYTHON2%%include/pycairo/pycairo.h
+%%PYTHON3%%include/pycairo/py3cairo.h
 %%PYTHON_SITELIBDIR%%/cairo/__init__.py
+%%PYTHON_SITELIBDIR%%/cairo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyi
 %%PYTHON_SITELIBDIR%%/cairo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/cairo/_cairo.so
-%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/cairo/include/pycairo.h
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/cairo/include/py3cairo.h
 %%PYTHON_SITELIBDIR%%/cairo/py.typed
-%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%.egg-info
-libdata/pkgconfig/py3cairo.pc
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON2%%libdata/pkgconfig/pycairo.pc
+%%PYTHON3%%libdata/pkgconfig/py3cairo.pc