pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep  2 21:42:48 UTC 2020

Modified Files:
        pkgsrc/audio/playitslowly: Makefile PLIST
        pkgsrc/devel/meld: Makefile PLIST
        pkgsrc/devel/py-ruamel-yaml: distinfo
        pkgsrc/devel/py-ruamel-yaml-clib: Makefile distinfo
        pkgsrc/misc/gaupol: Makefile PLIST
Added Files:
        pkgsrc/devel/py-ruamel-yaml-clib/patches: patch-setup.py
        pkgsrc/devel/py-ruamel-yaml/patches: patch-setup.py

Log Message:
*: fix some packages for py-setuptools 50.0.1


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/playitslowly/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/playitslowly/PLIST
cvs rdiff -u -r1.106 -r1.107 pkgsrc/devel/meld/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/devel/meld/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-ruamel-yaml/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-ruamel-yaml-clib/Makefile \
    pkgsrc/devel/py-ruamel-yaml-clib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-ruamel-yaml-clib/patches/patch-setup.py
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-ruamel-yaml/patches/patch-setup.py
cvs rdiff -u -r1.43 -r1.44 pkgsrc/misc/gaupol/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/misc/gaupol/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/playitslowly/Makefile
diff -u pkgsrc/audio/playitslowly/Makefile:1.9 pkgsrc/audio/playitslowly/Makefile:1.10
--- pkgsrc/audio/playitslowly/Makefile:1.9      Thu Apr 25 07:32:36 2019
+++ pkgsrc/audio/playitslowly/Makefile  Wed Sep  2 21:42:47 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2019/04/25 07:32:36 maya Exp $
+# $NetBSD: Makefile,v 1.10 2020/09/02 21:42:47 wiz Exp $
 
 DISTNAME=      playitslowly-1.5.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  https://29a.ch/playitslowly/
 

Index: pkgsrc/audio/playitslowly/PLIST
diff -u pkgsrc/audio/playitslowly/PLIST:1.2 pkgsrc/audio/playitslowly/PLIST:1.3
--- pkgsrc/audio/playitslowly/PLIST:1.2 Sun Dec 27 22:54:21 2015
+++ pkgsrc/audio/playitslowly/PLIST     Wed Sep  2 21:42:47 2020
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2015/12/27 22:54:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/09/02 21:42:47 wiz Exp $
 bin/playitslowly
-${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}/playitslowly-py${PYVERSSUFFIX}.install-info
 ${PYSITELIB}/playitslowly/__init__.py
 ${PYSITELIB}/playitslowly/__init__.pyc

Index: pkgsrc/devel/meld/Makefile
diff -u pkgsrc/devel/meld/Makefile:1.106 pkgsrc/devel/meld/Makefile:1.107
--- pkgsrc/devel/meld/Makefile:1.106    Mon Aug 17 20:18:28 2020
+++ pkgsrc/devel/meld/Makefile  Wed Sep  2 21:42:48 2020
@@ -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

Index: pkgsrc/devel/meld/PLIST
diff -u pkgsrc/devel/meld/PLIST:1.36 pkgsrc/devel/meld/PLIST:1.37
--- pkgsrc/devel/meld/PLIST:1.36        Sun Apr 26 16:17:47 2020
+++ pkgsrc/devel/meld/PLIST     Wed Sep  2 21:42:48 2020
@@ -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

Index: pkgsrc/devel/py-ruamel-yaml/distinfo
diff -u pkgsrc/devel/py-ruamel-yaml/distinfo:1.12 pkgsrc/devel/py-ruamel-yaml/distinfo:1.13
--- pkgsrc/devel/py-ruamel-yaml/distinfo:1.12   Wed Feb 19 09:41:50 2020
+++ pkgsrc/devel/py-ruamel-yaml/distinfo        Wed Sep  2 21:42:48 2020
@@ -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

Index: pkgsrc/devel/py-ruamel-yaml-clib/Makefile
diff -u pkgsrc/devel/py-ruamel-yaml-clib/Makefile:1.1 pkgsrc/devel/py-ruamel-yaml-clib/Makefile:1.2
--- pkgsrc/devel/py-ruamel-yaml-clib/Makefile:1.1       Tue Dec 17 10:05:23 2019
+++ pkgsrc/devel/py-ruamel-yaml-clib/Makefile   Wed Sep  2 21:42:48 2020
@@ -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@localhost
-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
 
Index: pkgsrc/devel/py-ruamel-yaml-clib/distinfo
diff -u pkgsrc/devel/py-ruamel-yaml-clib/distinfo:1.1 pkgsrc/devel/py-ruamel-yaml-clib/distinfo:1.2
--- pkgsrc/devel/py-ruamel-yaml-clib/distinfo:1.1       Tue Dec 17 10:05:23 2019
+++ pkgsrc/devel/py-ruamel-yaml-clib/distinfo   Wed Sep  2 21:42:48 2020
@@ -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

Index: pkgsrc/misc/gaupol/Makefile
diff -u pkgsrc/misc/gaupol/Makefile:1.43 pkgsrc/misc/gaupol/Makefile:1.44
--- pkgsrc/misc/gaupol/Makefile:1.43    Mon Aug 17 20:19:29 2020
+++ pkgsrc/misc/gaupol/Makefile Wed Sep  2 21:42:48 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2020/08/17 20:19:29 leot Exp $
+# $NetBSD: Makefile,v 1.44 2020/09/02 21:42:48 wiz Exp $
 
 DISTNAME=      gaupol-0.28.2
-PKGREVISION=   15
+PKGREVISION=   16
 CATEGORIES=    misc
 #MASTER_SITES= http://download.gna.org/gaupol/0.28/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/misc/gaupol/PLIST
diff -u pkgsrc/misc/gaupol/PLIST:1.12 pkgsrc/misc/gaupol/PLIST:1.13
--- pkgsrc/misc/gaupol/PLIST:1.12       Sat Feb  6 16:30:02 2016
+++ pkgsrc/misc/gaupol/PLIST    Wed Sep  2 21:42:48 2020
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2016/02/06 16:30:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/09/02 21:42:48 wiz Exp $
 bin/gaupol
-${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/aeidon/__init__.py
 ${PYSITELIB}/aeidon/__init__.pyc
 ${PYSITELIB}/aeidon/__init__.pyo
@@ -217,6 +216,10 @@ ${PYSITELIB}/aeidon/unittest.pyo
 ${PYSITELIB}/aeidon/util.py
 ${PYSITELIB}/aeidon/util.pyc
 ${PYSITELIB}/aeidon/util.pyo
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/gaupol/__init__.py
 ${PYSITELIB}/gaupol/__init__.pyc
 ${PYSITELIB}/gaupol/__init__.pyo

Added files:

Index: pkgsrc/devel/py-ruamel-yaml-clib/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-ruamel-yaml-clib/patches/patch-setup.py:1.1
--- /dev/null   Wed Sep  2 21:42:48 2020
+++ pkgsrc/devel/py-ruamel-yaml-clib/patches/patch-setup.py     Wed Sep  2 21:42:48 2020
@@ -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

Index: pkgsrc/devel/py-ruamel-yaml/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-ruamel-yaml/patches/patch-setup.py:1.1
--- /dev/null   Wed Sep  2 21:42:48 2020
+++ pkgsrc/devel/py-ruamel-yaml/patches/patch-setup.py  Wed Sep  2 21:42:48 2020
@@ -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



Home | Main Index | Thread Index | Old Index