Update to 1.1.5, changes not found.

4 files changed, 10 insertions, 26 deletions

diff --git a/converters/py-zbase32/Makefile b/converters/py-zbase32/Makefile
index a603c4a0cda..51f91666fcf 100644
--- a/converters/py-zbase32/Makefile
+++ b/converters/py-zbase32/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 00:20:16 asau Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/19 22:22:56 wiz Exp $
 
-DISTNAME=	zbase32-1.1.3
+DISTNAME=	zbase32-1.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	converters
 MASTER_SITES=	http://pypi.python.org/packages/source/z/zbase32/
@@ -16,5 +15,7 @@ REPLACE.python.old=	/usr/bin/env python
 REPLACE.python.new=	${PYTHONBIN}
 REPLACE_FILES.python=	zbase32/zbase32.py zbase32/test/test_zbase32.py
 
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.1.5
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/py-zbase32/PLIST b/converters/py-zbase32/PLIST
index 2bb77eb1dd6..b107fc1ccdf 100644
--- a/converters/py-zbase32/PLIST
+++ b/converters/py-zbase32/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/07/24 17:56:26 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/01/19 22:22:56 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/zbase32/__init__.py
 ${PYSITELIB}/zbase32/__init__.pyc
diff --git a/converters/py-zbase32/distinfo b/converters/py-zbase32/distinfo
index 9fa9b86e0b4..e43fc1bb723 100644
--- a/converters/py-zbase32/distinfo
+++ b/converters/py-zbase32/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/02/12 20:02:53 gls Exp $
+$NetBSD: distinfo,v 1.4 2014/01/19 22:22:56 wiz Exp $
 
-SHA1 (zbase32-1.1.3.tar.gz) = f670104ca3baec60530151951116eb9cd7ef3542
-RMD160 (zbase32-1.1.3.tar.gz) = 7e009b5a2c35d75eb21a2a78284e4e557e027c04
-Size (zbase32-1.1.3.tar.gz) = 21241 bytes
-SHA1 (patch-aa) = de191fe27ff8d6c8472bca38d5e368daa8cc3496
+SHA1 (zbase32-1.1.5.tar.gz) = 1cbf1144b953fb299e189ef9d06066456f30a1e3
+RMD160 (zbase32-1.1.5.tar.gz) = 78cfa5baf90699392653080380f5ab42f6e405c1
+Size (zbase32-1.1.5.tar.gz) = 21745 bytes
diff --git a/converters/py-zbase32/patches/patch-aa b/converters/py-zbase32/patches/patch-aa
deleted file mode 100644
index f029fb45abc..00000000000
--- a/converters/py-zbase32/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/02/12 20:02:53 gls Exp $
-
-http://tahoe-lafs.org/trac/zfec/ticket/11#comment:2
-
---- setup.py.orig	2010-12-21 23:28:56.000000000 +0000
-+++ setup.py
-@@ -68,8 +68,8 @@ if 'darcsver' in sys.argv[1:]:
- # Lucid, so for now you have to manually install it before building
- # sdists or eggs:
- # http://bitbucket.org/tarek/distribute/issue/55/revision-control-plugin-automatically-installed-as-a-build-dependency-is-not-present-when-another-build-dependency-is-being
--if False:
--    setup_requires.append('setuptools_darcs >= 1.1.0')
-+#if False:
-+#    setup_requires.append('setuptools_darcs >= 1.1.0')
- 
- 
- setup(name=PKG,