From e1f2ae5f3db28e1af278cc451b97462bc5f801ab Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 26 Mar 2018 13:05:43 +0000
Subject: Drop patches for Python 2.7, now that it is a separate package.

---
 converters/py-cairosvg/Makefile                             | 12 +++++++-----
 converters/py-cairosvg/distinfo                             |  4 +---
 .../py-cairosvg/patches/patch-cairosvg_____init____.py      | 11 -----------
 converters/py-cairosvg/patches/patch-setup.py               | 13 -------------
 4 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 converters/py-cairosvg/patches/patch-cairosvg_____init____.py
 delete mode 100644 converters/py-cairosvg/patches/patch-setup.py

(limited to 'converters')

diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile
index ca79cf9a41c..90df259f96e 100644
--- a/converters/py-cairosvg/Makefile
+++ b/converters/py-cairosvg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/12/10 15:58:36 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/26 13:05:43 joerg Exp $
 
 DISTNAME=	CairoSVG-2.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,10 +15,12 @@ DEPENDS+=	${PYPKGPREFIX}-cairocffi-[0-9]*:../../graphics/py-cairocffi
 DEPENDS+=	${PYPKGPREFIX}-cssselect2-[0-9]*:../../textproc/py-cssselect2
 DEPENDS+=	${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml
 DEPENDS+=	${PYPKGPREFIX}-tinycss2-[0-9]*:../../textproc/py-tinycss2
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-isort-[0-9]*:../../devel/py-test-isort
-BUILD_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-isort-[0-9]*:../../devel/py-test-isort
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 USE_LANGUAGES=	# none
 
diff --git a/converters/py-cairosvg/distinfo b/converters/py-cairosvg/distinfo
index 4cdbd63ee84..2cfd3f530d8 100644
--- a/converters/py-cairosvg/distinfo
+++ b/converters/py-cairosvg/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.11 2017/12/10 15:58:36 adam Exp $
+$NetBSD: distinfo,v 1.12 2018/03/26 13:05:43 joerg Exp $
 
 SHA1 (CairoSVG-2.1.2.tar.gz) = 7d96e04bf9e65e73f5d17ff64cb0514d42b04787
 RMD160 (CairoSVG-2.1.2.tar.gz) = c94e605a6061d767a97b32f3feae9fc98817f9d2
 SHA512 (CairoSVG-2.1.2.tar.gz) = 8a543c5043c8bf3ba73ec418def5a93e37314aed7ffbc9fc86d3cb89003f5e795f0607bdff5f0f77125ef8aee29fc4337bfb9b18265fe5cda16740391f100d49
 Size (CairoSVG-2.1.2.tar.gz) = 39814 bytes
-SHA1 (patch-cairosvg_____init____.py) = 1af4ecc99a2de15c582e35636add9e5707eacf5c
-SHA1 (patch-setup.py) = f47acf7b801518c9be2df2feaedb44554f264ad8
diff --git a/converters/py-cairosvg/patches/patch-cairosvg_____init____.py b/converters/py-cairosvg/patches/patch-cairosvg_____init____.py
deleted file mode 100644
index ebdba056d15..00000000000
--- a/converters/py-cairosvg/patches/patch-cairosvg_____init____.py
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-cairosvg_____init____.py,v 1.1 2017/09/04 15:56:33 joerg Exp $
-
---- cairosvg/__init__.py.orig	2017-08-27 00:23:26.754329800 +0000
-+++ cairosvg/__init__.py
-@@ -1,5 +1,5 @@
- # This file is part of CairoSVG
--# Copyright © 2010-2015 Kozea
-+# Copyright (C) 2010-2015 Kozea
- #
- # This library is free software: you can redistribute it and/or modify it under
- # the terms of the GNU Lesser General Public License as published by the Free
diff --git a/converters/py-cairosvg/patches/patch-setup.py b/converters/py-cairosvg/patches/patch-setup.py
deleted file mode 100644
index 487bacaf6d5..00000000000
--- a/converters/py-cairosvg/patches/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2017/08/25 20:01:34 joerg Exp $
-
---- setup.py.orig	2017-08-25 16:01:40.820727909 +0000
-+++ setup.py
-@@ -21,7 +21,7 @@ from os import path
- from setuptools import setup
- 
- init_path = path.join(path.dirname(__file__), 'cairosvg', '__init__.py')
--with open(init_path, 'r', encoding='utf-8') as fd:
-+with open(init_path, 'r') as fd:
-     version = re.search("__version__ = '([^']+)'", fd.read().strip()).group(1)
- 
- needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-- 
cgit v1.2.3