update to 1.1.2

changes:
-support for Python-2.7 and 3
-many bugfixes

pkgsrc note: not enabled for Python3 yet, needs a framework fix first

4 files changed, 24 insertions, 16 deletions

diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile
index 3fcfbcb9e2c..b19ef5a0924 100644
--- a/devel/py-nose/Makefile
+++ b/devel/py-nose/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2010/04/19 11:40:16 obache Exp $
+# $NetBSD: Makefile,v 1.4 2012/02/17 18:30:23 drochner Exp $
 #
 
-DISTNAME=	nose-0.11.3
+DISTNAME=	nose-1.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel python
 #MASTER_SITES=	http://python-nose.googlecode.com/files/
-MASTER_SITES=	http://somethingaboutorange.com/mrl/projects/nose/
+#MASTER_SITES=	http://somethingaboutorange.com/mrl/projects/nose/
+MASTER_SITES=	http://pypi.python.org/packages/source/n/nose/
+EXTRACT_USING=	gtar
 
 MAINTAINER=	kamel.derouiche@gmail.com
 HOMEPAGE=	http://code.google.com/p/python-nose/
@@ -20,6 +22,9 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=	# none
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
+# XXX not yet, python/egg.mk is not ready yet
+#PYTHON_VERSIONS_INCLUDE_3X= yes
+
 post-extract:
 	${MV} ${WRKSRC}/nosetests.1 ${WRKSRC}/nosetests${PYVERSSUFFIX}.1
 
diff --git a/devel/py-nose/PLIST b/devel/py-nose/PLIST
index c44f3de3624..db2f27c1768 100644
--- a/devel/py-nose/PLIST
+++ b/devel/py-nose/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/02/10 10:31:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/02/17 18:30:23 drochner Exp $
 bin/nosetests-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -111,6 +111,9 @@ ${PYSITELIB}/nose/plugins/xunit.pyo
 ${PYSITELIB}/nose/proxy.py
 ${PYSITELIB}/nose/proxy.pyc
 ${PYSITELIB}/nose/proxy.pyo
+${PYSITELIB}/nose/pyversion.py
+${PYSITELIB}/nose/pyversion.pyc
+${PYSITELIB}/nose/pyversion.pyo
 ${PYSITELIB}/nose/result.py
 ${PYSITELIB}/nose/result.pyc
 ${PYSITELIB}/nose/result.pyo
diff --git a/devel/py-nose/distinfo b/devel/py-nose/distinfo
index f5f30025e41..401f5fe420e 100644
--- a/devel/py-nose/distinfo
+++ b/devel/py-nose/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/04/19 11:40:16 obache Exp $
+$NetBSD: distinfo,v 1.4 2012/02/17 18:30:23 drochner Exp $
 
-SHA1 (nose-0.11.3.tar.gz) = 37c03a5b9738575e25ef99a5ca3b021f66c53421
-RMD160 (nose-0.11.3.tar.gz) = 9f5e93d9bcfa2f294f97f6a5c31e462eb13e43e2
-Size (nose-0.11.3.tar.gz) = 256723 bytes
-SHA1 (patch-aa) = 6a48d1e0661eeaf5aa6600f1c3fa9369b3ab1e91
+SHA1 (nose-1.1.2.tar.gz) = 7525f7ef056af66cdbada010d4a8b96e63a193e8
+RMD160 (nose-1.1.2.tar.gz) = 717c16abf3577387dbba406530693898b723f7ac
+Size (nose-1.1.2.tar.gz) = 729206 bytes
+SHA1 (patch-aa) = 13b33fbeda3f372ea1d7a068b3dda0c409adafa0
diff --git a/devel/py-nose/patches/patch-aa b/devel/py-nose/patches/patch-aa
index 7cdede6492e..e47159c5457 100644
--- a/devel/py-nose/patches/patch-aa
+++ b/devel/py-nose/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/04/19 11:40:16 obache Exp $
+$NetBSD: patch-aa,v 1.3 2012/02/17 18:30:23 drochner Exp $
 
---- setup.py.orig	2010-03-05 20:32:00.000000000 +0000
+--- setup.py.orig	2011-07-30 23:49:15.000000000 +0000
 +++ setup.py
-@@ -10,7 +10,7 @@ try:
+@@ -29,7 +29,7 @@ try:
          packages = find_packages(),
          entry_points = {
          'console_scripts': [
@@ -11,10 +11,10 @@ $NetBSD: patch-aa,v 1.2 2010/04/19 11:40:16 obache Exp $
              'nosetests%s = nose:run_exit' % py_vers_tag,
              ],
          'distutils.commands': [
-@@ -85,7 +85,7 @@ setup(
-     download_url = \
-     'http://somethingaboutorange.com/mrl/projects/nose/nose-%s.tar.gz' \
-     % VERSION,
+@@ -102,7 +102,7 @@ setup(
+     license = 'GNU LGPL',
+     keywords = 'test unittest doctest automatic discovery',
+     url = 'http://readthedocs.org/docs/nose/',
 -    data_files = [('man/man1', ['nosetests.1'])],
 +    data_files = [('man/man1', ['nosetests' + sys.version[0:3] + '.1'])],
      package_data = {'': ['*.txt',