pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/py-coverage Do not insist on py-distribute on py...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e16c69b114b1
branches:  trunk
changeset: 629688:e16c69b114b1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 26 00:39:40 2014 +0000

description:
Do not insist on py-distribute on python-3.x.
Times have changed, and py-setuptools is now the cool kid again.

diffstat:

 devel/py-coverage/Makefile         |   3 +--
 devel/py-coverage/distinfo         |   4 ++--
 devel/py-coverage/patches/patch-aa |  27 +++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r 2c15c247aa4c -r e16c69b114b1 devel/py-coverage/Makefile
--- a/devel/py-coverage/Makefile        Sun Jan 26 00:30:02 2014 +0000
+++ b/devel/py-coverage/Makefile        Sun Jan 26 00:39:40 2014 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:19:29 asau Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/26 00:39:40 wiz Exp $
 
 DISTNAME=      coverage-3.5.1
 PKGNAME=       ${PYPKGPREFIX}-coverage-3.5.1
diff -r 2c15c247aa4c -r e16c69b114b1 devel/py-coverage/distinfo
--- a/devel/py-coverage/distinfo        Sun Jan 26 00:30:02 2014 +0000
+++ b/devel/py-coverage/distinfo        Sun Jan 26 00:39:40 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/02/17 18:19:30 drochner Exp $
+$NetBSD: distinfo,v 1.3 2014/01/26 00:39:40 wiz Exp $
 
 SHA1 (coverage-3.5.1.tar.gz) = 815061b1906bd83b7d8ba46db0986ce7c4e84951
 RMD160 (coverage-3.5.1.tar.gz) = 054797366f8bc1968fc75e0121aaba3d12576200
 Size (coverage-3.5.1.tar.gz) = 113277 bytes
-SHA1 (patch-aa) = 4096d982a73a56879a1e1eb41095bc6da869ab82
+SHA1 (patch-aa) = 9c09c6a3f19ebf1dde966c317511c0356936fa4f
diff -r 2c15c247aa4c -r e16c69b114b1 devel/py-coverage/patches/patch-aa
--- a/devel/py-coverage/patches/patch-aa        Sun Jan 26 00:30:02 2014 +0000
+++ b/devel/py-coverage/patches/patch-aa        Sun Jan 26 00:39:40 2014 +0000
@@ -1,8 +1,31 @@
-$NetBSD: patch-aa,v 1.2 2012/02/17 18:19:30 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2014/01/26 00:39:40 wiz Exp $
+
+Do not insist on distutils, by now an obsolete version of setuptools.
+Add python version to binary to allow paralle installation of the
+package for different python versions.
 
 --- setup.py.orig      2011-06-29 12:22:52.000000000 +0000
 +++ setup.py
-@@ -85,7 +85,7 @@ setup_args = dict(
+@@ -38,18 +38,8 @@ Topic :: Software Development :: Testing
+ # Pull in the tools we need.
+ import sys, traceback
+ 
+-# Distribute is a new fork of setuptools.  It's supported on Py3.x, so we use
+-# it there, but stick with classic setuptools on Py2.x until Distribute becomes
+-# more accepted.
+-if sys.version_info >= (3, 0):
+-    from distribute_setup import use_setuptools
+-else:
+-    from ez_setup import use_setuptools
+-
+-use_setuptools()
+-
+ from setuptools import setup
+ from distutils.core import Extension    # pylint: disable=E0611,F0401
+ 
+ # Get or massage our metadata.
+ 
+@@ -85,7 +74,7 @@ setup_args = dict(
  
      entry_points = {
          'console_scripts': [



Home | Main Index | Thread Index | Old Index