*: fix some packages for py-setuptools 50.0.1

7 files changed, 51 insertions, 10 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index f202160eb52..05f10308019 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.106 2020/08/17 20:18:28 leot Exp $
+# $NetBSD: Makefile,v 1.107 2020/09/02 21:42:48 wiz Exp $
 
 DISTNAME=		meld-3.21.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=		.tar.xz
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 8b73b5225e3..f26f753620f 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.36 2020/04/26 16:17:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.37 2020/09/02 21:42:48 wiz Exp $
 bin/meld
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/meld/__init__.py
 ${PYSITELIB}/meld/__init__.pyc
 ${PYSITELIB}/meld/__init__.pyo
@@ -195,8 +198,6 @@ ${PYSITELIB}/meld/vcview.pyo
 ${PYSITELIB}/meld/windowstate.py
 ${PYSITELIB}/meld/windowstate.pyc
 ${PYSITELIB}/meld/windowstate.pyo
-@pkgdir share/meld/icons
-@pkgdir share/meld/ui
 man/man1/meld.1
 share/applications/org.gnome.meld.desktop
 share/doc/${PKGNAME}/COPYING
diff --git a/devel/py-ruamel-yaml-clib/Makefile b/devel/py-ruamel-yaml-clib/Makefile
index 08cd9542706..bef7e395745 100644
--- a/devel/py-ruamel-yaml-clib/Makefile
+++ b/devel/py-ruamel-yaml-clib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/12/17 10:05:23 leot Exp $
+# $NetBSD: Makefile,v 1.2 2020/09/02 21:42:48 wiz Exp $
 
 DISTNAME=	ruamel.yaml.clib-0.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/./-/1:S/./-/1}
@@ -6,7 +6,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=r/ruamel.yaml.clib/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://bitbucket.org/ruamel/yaml
+HOMEPAGE=	https://yaml.readthedocs.io/en/latest/
 COMMENT=	C version of reader, parser and emitter for ruamel.yaml
 LICENSE=	mit
 
diff --git a/devel/py-ruamel-yaml-clib/distinfo b/devel/py-ruamel-yaml-clib/distinfo
index 2de3b6f32d9..e1f7736178f 100644
--- a/devel/py-ruamel-yaml-clib/distinfo
+++ b/devel/py-ruamel-yaml-clib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/12/17 10:05:23 leot Exp $
+$NetBSD: distinfo,v 1.2 2020/09/02 21:42:48 wiz Exp $
 
 SHA1 (ruamel.yaml.clib-0.2.0.tar.gz) = 489ab4a88d8dedbdb04b4b772bb478e51c88d851
 RMD160 (ruamel.yaml.clib-0.2.0.tar.gz) = acd23a8ef6f99c3c1d0ad76fe083c6fe98616e2b
 SHA512 (ruamel.yaml.clib-0.2.0.tar.gz) = 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
 Size (ruamel.yaml.clib-0.2.0.tar.gz) = 178084 bytes
+SHA1 (patch-setup.py) = cf0428b68f8555346e28ee6412d0b41b7bc4d6ea
diff --git a/devel/py-ruamel-yaml-clib/patches/patch-setup.py b/devel/py-ruamel-yaml-clib/patches/patch-setup.py
new file mode 100644
index 00000000000..a7a22d4db4f
--- /dev/null
+++ b/devel/py-ruamel-yaml-clib/patches/patch-setup.py
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.1 2020/09/02 21:42:48 wiz Exp $
+
+Compatibility with setuptools>=50.0.0
+https://github.com/pypa/setuptools/issues/2355#issuecomment-685159580
+
+--- setup.py.orig	2019-09-27 06:04:08.000000000 +0000
++++ setup.py
+@@ -447,10 +447,7 @@ class NameSpacePackager(object):
+             sys.exit(1)
+ 
+     def check(self):
+-        try:
+-            from pip.exceptions import InstallationError
+-        except ImportError:
+-            return
++        InstallationError = Exception
+         # arg is either develop (pip install -e) or install
+         if self.command not in ['install', 'develop']:
+             return
diff --git a/devel/py-ruamel-yaml/distinfo b/devel/py-ruamel-yaml/distinfo
index d1fa108dd83..e010ebac019 100644
--- a/devel/py-ruamel-yaml/distinfo
+++ b/devel/py-ruamel-yaml/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2020/02/19 09:41:50 adam Exp $
+$NetBSD: distinfo,v 1.13 2020/09/02 21:42:48 wiz Exp $
 
 SHA1 (ruamel.yaml-0.16.10.tar.gz) = 1aff3775a008c3bb13c6013c347a272300838c07
 RMD160 (ruamel.yaml-0.16.10.tar.gz) = b2a00deb09765db0874697b065cb899a748e86f6
 SHA512 (ruamel.yaml-0.16.10.tar.gz) = f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
 Size (ruamel.yaml-0.16.10.tar.gz) = 147033 bytes
+SHA1 (patch-setup.py) = e96bd7620bba77205595a5ef9676c22c62e3292b
diff --git a/devel/py-ruamel-yaml/patches/patch-setup.py b/devel/py-ruamel-yaml/patches/patch-setup.py
new file mode 100644
index 00000000000..e45376799f1
--- /dev/null
+++ b/devel/py-ruamel-yaml/patches/patch-setup.py
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.1 2020/09/02 21:42:48 wiz Exp $
+
+Compatibility with setuptools>=50.0.0
+https://github.com/pypa/setuptools/issues/2355#issuecomment-685159580
+
+--- setup.py.orig	2020-02-12 12:29:41.000000000 +0000
++++ setup.py
+@@ -446,10 +446,7 @@ class NameSpacePackager(object):
+             sys.exit(1)
+ 
+     def check(self):
+-        try:
+-            from pip.exceptions import InstallationError
+-        except ImportError:
+-            return
++        InstallationError = Exception
+         # arg is either develop (pip install -e) or install
+         if self.command not in ['install', 'develop']:
+             return