py-cairo3: remove, merged into py-cairo

8 files changed, 1 insertions, 118 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index f2eaf4f16d6..55951d0f6f0 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.776 2017/11/10 23:02:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.777 2017/11/24 22:17:41 wiz Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -422,7 +422,6 @@ SUBDIR+=	py-biggles
 SUBDIR+=	py-blockdiag
 SUBDIR+=	py-brewer2mpl
 SUBDIR+=	py-cairo
-SUBDIR+=	py-cairo3
 SUBDIR+=	py-cairocffi
 SUBDIR+=	py-chart
 SUBDIR+=	py-cycler
diff --git a/graphics/py-cairo3/DESCR b/graphics/py-cairo3/DESCR
deleted file mode 100644
index 1e0a9f9d2a9..00000000000
--- a/graphics/py-cairo3/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Cairo is a 2D graphics library with support for multiple output
-devices.  Currently supported output targets include the X Window
-System, win32, and image buffers. Experimental backends include OpenGL
-(through glitz), Quartz, XCB, PostScript and PDF file output.
-
-This package contains the Python bindings for Cairo for Python 3.x.
diff --git a/graphics/py-cairo3/Makefile b/graphics/py-cairo3/Makefile
deleted file mode 100644
index a52b469e339..00000000000
--- a/graphics/py-cairo3/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2016/03/30 10:43:49 jperkin Exp $
-
-DISTNAME=		pycairo-1.10.0
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=		3
-CATEGORIES=		graphics
-MASTER_SITES=		http://cairographics.org/releases/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		leuzi@trash.net
-HOMEPAGE=		http://cairographics.org/pycairo/
-COMMENT=		Python bindings for cairo (python-3.x version)
-LICENSE=		gnu-lgpl-v2.1 OR mpl-1.1
-
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-
-PKGCONFIG_OVERRIDE+=	py3cairo.pc.in
-PYTHON_VERSIONS_INCOMPATIBLE=	27
-PY_PATCHPLIST=		yes
-# waf is not smart enough for this as of 1.10.0
-PY_PEP3147=		no
-
-pre-patch:
-	cd ${WRKSRC:Q} && \
-		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf --help
-
-do-configure:
-	cd ${WRKSRC:Q} && \
-		${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
-			--destdir=${DESTDIR} --prefix=${PREFIX} \
-			--mandir=${PREFIX}/${PKGMANDIR}
-
-do-build:
-	cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
-
-.include "../../mk/bsd.prefs.mk"
-
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
-.if ${OPSYS} == "Darwin"
-	install_name_tool -id ${PREFIX}/${PYSITELIB}/cairo/_cairo.so \
-		${DESTDIR}${PREFIX}/${PYSITELIB}/cairo/_cairo.so
-.endif
-
-.include "../../lang/python/extension.mk"
-BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.10
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-cairo3/PLIST b/graphics/py-cairo3/PLIST
deleted file mode 100644
index d5fb7ef939c..00000000000
--- a/graphics/py-cairo3/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/23 11:11:09 wiz Exp $
-include/pycairo/py3cairo.h
-lib/pkgconfig/py3cairo.pc
-${PYSITELIB}/cairo/__init__.py
-${PYSITELIB}/cairo/__init__.pyc
-${PYSITELIB}/cairo/__init__.pyo
-${PYSITELIB}/cairo/_cairo.so
diff --git a/graphics/py-cairo3/buildlink3.mk b/graphics/py-cairo3/buildlink3.mk
deleted file mode 100644
index 3a907af2fe8..00000000000
--- a/graphics/py-cairo3/buildlink3.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2015/04/25 14:23:18 tnn Exp $
-
-BUILDLINK_TREE+=	py-cairo
-
-.if !defined(PY_CAIRO_BUILDLINK3_MK)
-PY_CAIRO_BUILDLINK3_MK:=
-
-.  include "../../lang/python/pyversion.mk"
-
-BUILDLINK_API_DEPENDS.py-cairo+=	${PYPKGPREFIX}-cairo>=1.10.0
-BUILDLINK_ABI_DEPENDS.py-cairo?=	${PYPKGPREFIX}-cairo>=1.10.0nb3
-BUILDLINK_PKGSRCDIR.py-cairo?=	../../graphics/py-cairo3
-
-.include "../../graphics/cairo/buildlink3.mk"
-.endif	# PY_CAIRO_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-py-cairo
diff --git a/graphics/py-cairo3/distinfo b/graphics/py-cairo3/distinfo
deleted file mode 100644
index 4dfca84443c..00000000000
--- a/graphics/py-cairo3/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2015/12/12 07:42:26 wiz Exp $
-
-SHA1 (pycairo-1.10.0.tar.bz2) = b4283aa1cc9aafd12fd72ad371303a486da1d014
-RMD160 (pycairo-1.10.0.tar.bz2) = 7d1c1c05113e5bbad32dbe96c65c918b170cac33
-SHA512 (pycairo-1.10.0.tar.bz2) = a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f
-Size (pycairo-1.10.0.tar.bz2) = 246556 bytes
-SHA1 (patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Build.py) = 37e4dbfc3a5410de59b8dbd6e79c42fd4a193f37
-SHA1 (patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py) = 44bd5b6f82476df48bec7976da5e488063ff9f07
diff --git a/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Build.py b/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Build.py
deleted file mode 100644
index 2f27240a810..00000000000
--- a/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Build.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Build.py,v 1.1 2015/12/12 07:42:26 wiz Exp $
-
---- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py.orig	2011-03-29 14:52:54.000000000 +0000
-+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/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)
diff --git a/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py b/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py
deleted file mode 100644
index 9d35873308a..00000000000
--- a/graphics/py-cairo3/patches/patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6_waflib_Tools_python.py,v 1.1 2014/06/29 15:04:40 joerg Exp $
-
---- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig	2014-06-29 14:32:41.000000000 +0000
-+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py
-@@ -169,7 +169,7 @@ def check_python_headers(conf):
- 		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: